From 783e3c17a9ed32d6a5aff39a83bdfa38aa152bf1 Mon Sep 17 00:00:00 2001
From: Tim Schnell <timductive@gmail.com>
Date: Thu, 9 Apr 2020 14:32:24 -0500
Subject: [PATCH 01/36] ignore some things for code coverage (#62701)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/legacy/plugins/canvas/scripts/jest.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/canvas/scripts/jest.js b/x-pack/legacy/plugins/canvas/scripts/jest.js
index cce1b8d355846..133f775c7192f 100644
--- a/x-pack/legacy/plugins/canvas/scripts/jest.js
+++ b/x-pack/legacy/plugins/canvas/scripts/jest.js
@@ -36,6 +36,14 @@ run(
         `!${path}/**/__tests__/**/*`,
         '--collectCoverageFrom', // Ignore coverage on example files
         `!${path}/**/__examples__/**/*`,
+        '--collectCoverageFrom', // Ignore flot files
+        `!${path}/**/flot-charts/**`,
+        '--collectCoverageFrom', // Ignore coverage files
+        `!${path}/**/coverage/**`,
+        '--collectCoverageFrom', // Ignore scripts
+        `!${path}/**/scripts/**`,
+        '--collectCoverageFrom', // Ignore mock files
+        `!${path}/**/mocks/**`,
         '--collectCoverageFrom', // Include JS files
         `${path}/**/*.js`,
         '--collectCoverageFrom', // Include TS/X files
@@ -76,7 +84,7 @@ run(
         --all              Runs all tests and snapshots.  Slower.
         --storybook        Runs Storybook Snapshot tests only.
         --update           Updates Storybook Snapshot tests.
-        --path <string>    Runs any tests at a given path. 
+        --path <string>    Runs any tests at a given path.
         --coverage         Collect coverage statistics.
       `,
     },

From 834306458ac5178cbe26a0f962c764a0451568e2 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Thu, 9 Apr 2020 13:52:02 -0600
Subject: [PATCH 02/36] Fixes a needed import that was coming from APM but now
 isolates things better for optimization import builds

## Summary

Adds a single line to work with ts config optimizers. What is happening is that this is relying on an import from here:

```
x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
```

when really it should be isolated and imported within this file.

Testing is just to go to siem and run these commands:

```ts
cd /projects/kibana
node x-pack/legacy/plugins/siem/scripts/optimize_tsconfig.js
node scripts/type_check.js --project x-pack/tsconfig.json
```

Ensure you don't see any errors.
---
 .../public/application/components/health_check.test.tsx          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx
index 5156a6146f3a1..9c51139993b3f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx
@@ -10,6 +10,7 @@ import { HealthCheck } from './health_check';
 
 import { act } from 'react-dom/test-utils';
 import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import '@testing-library/jest-dom/extend-expect';
 
 const docLinks = { ELASTIC_WEBSITE_URL: 'elastic.co/', DOC_LINK_VERSION: 'current' };
 

From bc8c4a754db653762fe50a7bfc9bee7f9006e20c Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Thu, 9 Apr 2020 15:43:07 -0600
Subject: [PATCH 03/36] [File upload] Change 'file_upload' id and refs to
 'fileUpload' (#63000)

---
 x-pack/plugins/file_upload/kibana.json | 3 +--
 x-pack/plugins/maps/public/plugin.ts   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/file_upload/kibana.json b/x-pack/plugins/file_upload/kibana.json
index 3fda32fb6ebe5..7676a01d0b0f9 100644
--- a/x-pack/plugins/file_upload/kibana.json
+++ b/x-pack/plugins/file_upload/kibana.json
@@ -1,8 +1,7 @@
 {
-  "id": "file_upload",
+  "id": "fileUpload",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "configPath": ["xpack", "file_upload"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["data", "usageCollection"]
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index 9437c2512ded4..14487b615e759 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -43,9 +43,9 @@ export const bindSetupCoreAndPlugins = (core: CoreSetup, plugins: any) => {
 };
 
 export const bindStartCoreAndPlugins = (core: CoreStart, plugins: any) => {
-  const { file_upload, data, inspector } = plugins;
+  const { fileUpload, data, inspector } = plugins;
   setInspector(inspector);
-  setFileUpload(file_upload);
+  setFileUpload(fileUpload);
   setIndexPatternSelect(data.ui.IndexPatternSelect);
   setTimeFilter(data.query.timefilter.timefilter);
   setIndexPatternService(data.indexPatterns);

From 93b34632c08884e7850114f1fe21adfb47471c22 Mon Sep 17 00:00:00 2001
From: Marco Vettorello <vettorello.marco@gmail.com>
Date: Thu, 9 Apr 2020 23:53:47 +0200
Subject: [PATCH 04/36] [TSVB] Fix wrongly display stacked as percentage charts
 (#62654)

Update to  elastic-charts 18.2.2 with the valid 0% rendering
---
 package.json                             | 2 +-
 packages/kbn-ui-shared-deps/package.json | 2 +-
 yarn.lock                                | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index bd0fec3a5c116..ea930d07e7b43 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "@babel/core": "^7.9.0",
     "@babel/register": "^7.9.0",
     "@elastic/apm-rum": "^4.6.0",
-    "@elastic/charts": "^18.1.1",
+    "@elastic/charts": "18.2.2",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.8.0",
     "@elastic/eui": "21.0.1",
diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
index e2823f23d0431..7c5d6a62a11ca 100644
--- a/packages/kbn-ui-shared-deps/package.json
+++ b/packages/kbn-ui-shared-deps/package.json
@@ -9,7 +9,7 @@
     "kbn:watch": "node scripts/build --watch"
   },
   "dependencies": {
-    "@elastic/charts": "^18.1.1",
+    "@elastic/charts": "18.2.2",
     "@elastic/eui": "21.0.1",
     "@kbn/i18n": "1.0.0",
     "abortcontroller-polyfill": "^1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 3f04b2d26a013..20e33fdefc996 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1197,10 +1197,10 @@
   dependencies:
     "@elastic/apm-rum-core" "^4.7.0"
 
-"@elastic/charts@^18.1.1":
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-18.2.0.tgz#e141151b4d7ecc71c9f6f235f8ce141665c67195"
-  integrity sha512-OWsARaHI/4Ict/GkeKIO3a+e2c86esGw3FtSGRLPFVgzpwBXdjvjYyraGntKOIVs/NAGNVWYj5XoRRb5C6cMlQ==
+"@elastic/charts@18.2.2":
+  version "18.2.2"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-18.2.2.tgz#f59d6ee597d553d193314d8598561c65da787e8d"
+  integrity sha512-ss8AqLj9wHa2C+9ULUKbXw8ZCQmEjLuaVU5AkqE2j3hOVtAN75HO2p7nMIsxcSldfmqy+4jSptybJLNAfizegQ==
   dependencies:
     classnames "^2.2.6"
     d3-array "^1.2.4"

From 982c0da78e67694e0c2e05e8e2e7431ab9bda880 Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Thu, 9 Apr 2020 16:51:22 -0700
Subject: [PATCH 05/36] Move ILM out of legacy (#61915)

* Rename IndexMgmtSetup to IndexManagementPluginSetup.
* Remove unused fetch index template route and related tests.
* Remove unnecessary custom styles.
---
 .github/CODEOWNERS                            |   2 +-
 x-pack/.i18nrc.json                           |   2 +-
 x-pack/index.js                               |   2 -
 .../np_ready/extend_index_management.ts       |   4 +-
 .../public/np_ready/plugin.ts                 |   4 +-
 .../server/np_ready/plugin.ts                 |   4 +-
 .../index_lifecycle_management/index.ts       |  62 --------
 .../index_lifecycle_management/plugin.ts      |  54 -------
 .../public/legacy.ts                          | 109 -------------
 .../_index_lifecycle_management.scss          |  17 --
 .../public/np_ready/application/index.scss    |   3 -
 .../public/np_ready/application/index.tsx     |  63 --------
 .../np_ready/application/services/api.js      |  81 ----------
 .../public/np_ready/plugin.tsx                |  58 -------
 .../call_with_request_factory.ts              |  19 ---
 .../lib/call_with_request_factory/index.ts    |   7 -
 .../check_license/__tests__/check_license.js  | 145 ------------------
 .../server/lib/check_license/check_license.ts |  66 --------
 .../__tests__/wrap_custom_error.js            |  21 ---
 .../error_wrappers/__tests__/wrap_es_error.js |  38 -----
 .../__tests__/wrap_unknown_error.js           |  19 ---
 .../server/lib/error_wrappers/index.ts        |   9 --
 .../lib/error_wrappers/wrap_custom_error.ts   |  18 ---
 .../lib/error_wrappers/wrap_es_error.ts       |  29 ----
 .../lib/error_wrappers/wrap_unknown_error.ts  |  17 --
 .../server/lib/is_es_error/index.ts           |   7 -
 .../__tests__/license_pre_routing_factory.js  |  69 ---------
 .../license_pre_routing_factory.ts            |  29 ----
 .../lib/register_license_checker/index.ts     |   7 -
 .../register_license_checker.ts               |  23 ---
 .../server/routes/api/index/index.ts          |   7 -
 .../api/index/register_add_policy_route.ts    |  58 -------
 .../routes/api/index/register_remove_route.ts |  51 ------
 .../routes/api/index/register_retry_route.ts  |  51 ------
 .../server/routes/api/nodes/constants.ts      |  15 --
 .../server/routes/api/nodes/index.ts          |   7 -
 .../api/nodes/register_details_route.ts       |  61 --------
 .../routes/api/nodes/register_list_route.ts   |  63 --------
 .../server/routes/api/policies/index.ts       |   7 -
 .../api/policies/register_create_route.ts     |  52 -------
 .../api/policies/register_delete_route.ts     |  46 ------
 .../api/policies/register_fetch_route.ts      |  84 ----------
 .../server/routes/api/templates/index.ts      |   7 -
 .../templates/register_add_policy_route.ts    |  67 --------
 .../api/templates/register_get_route.ts       |  48 ------
 .../index_lifecycle_management/shim.ts        |  17 --
 .../legacy/plugins/index_management/index.ts  |   1 +
 x-pack/legacy/plugins/rollup/public/plugin.ts |   4 +-
 x-pack/legacy/plugins/rollup/server/plugin.ts |   4 +-
 .../extend_index_management.test.js.snap      |   0
 .../__snapshots__/policy_table.test.js.snap   |   0
 .../__jest__/components/edit_policy.test.js   |  20 ++-
 .../__jest__/components/policy_table.test.js  |  16 +-
 .../__jest__/extend_index_management.test.js  |  17 +-
 .../common/constants/index.ts                 |   6 +
 .../index_lifecycle_management/kibana.json    |  16 ++
 .../public}/application/app.tsx               |   2 +-
 .../public}/application/constants/index.ts    |   0
 .../application/constants/ui_metric.ts        |   0
 .../public/application/index.tsx              |  27 ++++
 .../sections/components/active_badge.js       |   0
 .../application/sections/components/index.js  |   0
 .../sections/components/learn_more_link.js    |   0
 .../sections/components/optional_label.js     |   0
 .../components/phase_error_message.js         |   0
 .../cold_phase/cold_phase.container.js        |   0
 .../components/cold_phase/cold_phase.js       |   0
 .../components/cold_phase/index.js            |   0
 .../delete_phase/delete_phase.container.js    |   0
 .../components/delete_phase/delete_phase.js   |   0
 .../components/delete_phase/index.js          |   0
 .../hot_phase/hot_phase.container.js          |   0
 .../components/hot_phase/hot_phase.js         |   0
 .../edit_policy/components/hot_phase/index.js |   0
 .../edit_policy/components/min_age_input.js   |   0
 .../components/node_allocation/index.js       |   0
 .../node_allocation.container.js              |   0
 .../node_allocation/node_allocation.js        |   0
 .../components/node_attrs_details/index.js    |   0
 .../node_attrs_details.container.js           |   0
 .../node_attrs_details/node_attrs_details.js  |   0
 .../components/policy_json_flyout.js          |   0
 .../components/set_priority_input.js          |   0
 .../components/warm_phase/index.js            |   0
 .../warm_phase/warm_phase.container.js        |   0
 .../components/warm_phase/warm_phase.js       |   0
 .../edit_policy/edit_policy.container.js      |   0
 .../sections/edit_policy/edit_policy.js       |   0
 .../sections/edit_policy/form_errors.js       |   0
 .../sections/edit_policy/index.d.ts           |   0
 .../application/sections/edit_policy/index.js |   0
 .../no_match/components/no_match/index.js     |   0
 .../no_match/components/no_match/no_match.js  |   0
 .../policy_table/components/no_match/index.js |   0
 .../add_policy_to_template_confirm_modal.js   |   0
 .../components/policy_table/confirm_delete.js |   0
 .../components/policy_table/index.js          |   0
 .../policy_table/policy_table.container.js    |   0
 .../components/policy_table/policy_table.js   |   8 +-
 .../sections/policy_table/index.d.ts          |   0
 .../sections/policy_table/index.js            |   0
 .../public/application/services/api.js        |  72 +++++++++
 .../application/services/api_errors.js        |   0
 .../application/services/documentation.ts     |   0
 .../application/services/filter_items.js      |   0
 .../application/services/find_errors.js       |   0
 .../services/flatten_panel_tree.js            |   0
 .../public}/application/services/http.ts      |  14 +-
 .../public}/application/services/index.js     |   0
 .../application/services/navigation.ts        |  12 +-
 .../application/services/notification.ts      |   0
 .../application/services/sort_table.js        |   0
 .../application/services/ui_metric.test.js    |   0
 .../public}/application/services/ui_metric.ts |  11 +-
 .../application/store/actions/general.js      |   0
 .../application/store/actions/index.js        |   0
 .../application/store/actions/lifecycle.js    |   0
 .../application/store/actions/nodes.js        |   0
 .../application/store/actions/policies.js     |   0
 .../application/store/defaults/cold_phase.js  |   0
 .../store/defaults/delete_phase.js            |   0
 .../application/store/defaults/hot_phase.js   |   0
 .../application/store/defaults/index.d.ts     |   0
 .../application/store/defaults/index.js       |   0
 .../application/store/defaults/warm_phase.js  |   0
 .../public}/application/store/index.d.ts      |   0
 .../public}/application/store/index.js        |   0
 .../application/store/reducers/general.js     |   0
 .../application/store/reducers/index.js       |   0
 .../application/store/reducers/nodes.js       |   0
 .../application/store/reducers/policies.js    |   0
 .../application/store/selectors/general.js    |   0
 .../application/store/selectors/index.js      |   0
 .../application/store/selectors/lifecycle.js  |   0
 .../application/store/selectors/nodes.js      |   0
 .../application/store/selectors/policies.js   |   0
 .../public}/application/store/store.js        |   0
 .../components/add_lifecycle_confirm_modal.js |   6 +-
 .../components/index_lifecycle_summary.js     |   0
 .../remove_lifecycle_confirm_modal.js         |   4 +-
 .../extend_index_management/index.d.ts        |   0
 .../public}/extend_index_management/index.js  |  50 +-----
 .../public}/index.ts                          |   8 +-
 .../public/plugin.tsx                         |  69 +++++++++
 .../public/types.ts                           |  21 +++
 .../server/config.ts                          |  18 +++
 .../server/index.ts                           |  19 +++
 .../server/lib}/is_es_error.ts                |   0
 .../server/plugin.ts                          |  86 +++++++++++
 .../server/routes/api/index/index.ts}         |   9 +-
 .../api/index/register_add_policy_route.ts    |  66 ++++++++
 .../routes/api/index/register_remove_route.ts |  54 +++++++
 .../routes/api/index/register_retry_route.ts  |  54 +++++++
 .../server/routes/api/nodes/index.ts}         |   7 +-
 .../api/nodes/register_details_route.ts       |  64 ++++++++
 .../routes/api/nodes/register_list_route.ts   |  69 +++++++++
 .../server/routes/api/policies/index.ts}      |   9 +-
 .../api/policies/register_create_route.ts     | 145 ++++++++++++++++++
 .../api/policies/register_delete_route.ts     |  50 ++++++
 .../api/policies/register_fetch_route.ts      |  90 +++++++++++
 .../server/routes/api/templates/index.ts}     |   9 +-
 .../templates/register_add_policy_route.ts    |  81 ++++++++++
 .../api/templates/register_fetch_route.ts     |  51 +++---
 .../server/routes/index.ts                    |  19 +++
 .../server/services/add_base_path.ts}         |   4 +-
 .../server/services}/index.ts                 |   3 +-
 .../server/services/license.ts                |  82 ++++++++++
 .../server/types.ts                           |  27 ++++
 .../index_actions_context_menu.js             |  15 +-
 .../plugins/index_management/public/index.ts  |   4 +-
 .../plugins/index_management/public/plugin.ts |   4 +-
 .../plugins/index_management/server/index.ts  |   2 +-
 .../plugins/index_management/server/plugin.ts |   6 +-
 .../translations/translations/ja-JP.json      |   3 -
 .../translations/translations/zh-CN.json      |   3 -
 .../templates.helpers.js                      |   3 -
 .../index_lifecycle_management/templates.js   |  19 +--
 177 files changed, 1264 insertions(+), 1828 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/plugin.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/public/legacy.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/_index_lifecycle_management.scss
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/index.scss
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/index.tsx
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/api.js
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/plugin.tsx
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/call_with_request_factory/call_with_request_factory.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/call_with_request_factory/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/__tests__/check_license.js
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/check_license.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_custom_error.js
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_es_error.js
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_unknown_error.js
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_custom_error.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_es_error.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_unknown_error.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/is_es_error/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/register_license_checker/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/lib/register_license_checker/register_license_checker.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/constants.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/index.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_get_route.ts
 delete mode 100644 x-pack/legacy/plugins/index_lifecycle_management/shim.ts
 rename x-pack/{legacy => }/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js (96%)
 rename x-pack/{legacy => }/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js (91%)
 rename x-pack/{legacy => }/plugins/index_lifecycle_management/__jest__/extend_index_management.test.js (93%)
 rename x-pack/{legacy => }/plugins/index_lifecycle_management/common/constants/index.ts (72%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/kibana.json
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/app.tsx (94%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/constants/index.ts (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/constants/ui_metric.ts (100%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/index.tsx
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/components/active_badge.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/components/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/components/learn_more_link.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/components/optional_label.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/components/phase_error_message.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/cold_phase/cold_phase.container.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/cold_phase/cold_phase.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/cold_phase/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/delete_phase/delete_phase.container.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/delete_phase/delete_phase.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/delete_phase/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/hot_phase/hot_phase.container.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/hot_phase/hot_phase.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/hot_phase/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/min_age_input.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/node_allocation/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/node_allocation/node_allocation.container.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/node_allocation/node_allocation.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/node_attrs_details/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.container.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/policy_json_flyout.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/set_priority_input.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/warm_phase/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/warm_phase/warm_phase.container.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/components/warm_phase/warm_phase.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/edit_policy.container.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/edit_policy.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/form_errors.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/index.d.ts (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/edit_policy/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/components/no_match/components/no_match/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/components/no_match/components/no_match/no_match.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/components/no_match/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/components/policy_table/add_policy_to_template_confirm_modal.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/components/policy_table/confirm_delete.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/components/policy_table/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/components/policy_table/policy_table.container.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/components/policy_table/policy_table.js (98%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/index.d.ts (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/sections/policy_table/index.js (100%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/api.js
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/api_errors.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/documentation.ts (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/filter_items.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/find_errors.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/flatten_panel_tree.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/http.ts (50%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/navigation.ts (59%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/notification.ts (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/sort_table.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/ui_metric.test.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/services/ui_metric.ts (85%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/actions/general.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/actions/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/actions/lifecycle.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/actions/nodes.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/actions/policies.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/defaults/cold_phase.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/defaults/delete_phase.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/defaults/hot_phase.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/defaults/index.d.ts (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/defaults/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/defaults/warm_phase.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/index.d.ts (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/reducers/general.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/reducers/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/reducers/nodes.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/reducers/policies.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/selectors/general.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/selectors/index.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/selectors/lifecycle.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/selectors/nodes.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/selectors/policies.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/application/store/store.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/extend_index_management/components/add_lifecycle_confirm_modal.js (97%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/extend_index_management/components/index_lifecycle_summary.js (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/extend_index_management/components/remove_lifecycle_confirm_modal.js (96%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/extend_index_management/index.d.ts (100%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/extend_index_management/index.js (80%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/public/np_ready => plugins/index_lifecycle_management/public}/index.ts (58%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/plugin.tsx
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/types.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/config.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/index.ts
 rename x-pack/{legacy/plugins/index_lifecycle_management/server/lib/is_es_error => plugins/index_lifecycle_management/server/lib}/is_es_error.ts (100%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/plugin.ts
 rename x-pack/{legacy/plugins/index_lifecycle_management/server/routes/api/index/register_index_routes.ts => plugins/index_lifecycle_management/server/routes/api/index/index.ts} (65%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
 rename x-pack/{legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_nodes_routes.ts => plugins/index_lifecycle_management/server/routes/api/nodes/index.ts} (65%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
 rename x-pack/{legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_policies_routes.ts => plugins/index_lifecycle_management/server/routes/api/policies/index.ts} (64%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
 rename x-pack/{legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_templates_routes.ts => plugins/index_lifecycle_management/server/routes/api/templates/index.ts} (64%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
 rename x-pack/{legacy => }/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts (63%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/routes/index.ts
 rename x-pack/{legacy/plugins/index_lifecycle_management/server/lib/check_license/index.ts => plugins/index_lifecycle_management/server/services/add_base_path.ts} (64%)
 rename x-pack/{legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory => plugins/index_lifecycle_management/server/services}/index.ts (74%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/services/license.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/server/types.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e707250ff3261..267f3dde0b66f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -180,7 +180,7 @@
 /src/plugins/console/  @elastic/es-ui
 /src/plugins/es_ui_shared/  @elastic/es-ui
 /x-pack/legacy/plugins/cross_cluster_replication/  @elastic/es-ui
-/x-pack/legacy/plugins/index_lifecycle_management/  @elastic/es-ui
+/x-pack/plugins/index_lifecycle_management/  @elastic/es-ui
 /x-pack/legacy/plugins/index_management/  @elastic/es-ui
 /x-pack/legacy/plugins/license_management/  @elastic/es-ui
 /x-pack/legacy/plugins/rollup/  @elastic/es-ui
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index ae8d61769b14c..bbbcc062786b0 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -18,7 +18,7 @@
     "xpack.graph": ["legacy/plugins/graph", "plugins/graph"],
     "xpack.grokDebugger": "plugins/grokdebugger",
     "xpack.idxMgmt": "plugins/index_management",
-    "xpack.indexLifecycleMgmt": "legacy/plugins/index_lifecycle_management",
+    "xpack.indexLifecycleMgmt": "plugins/index_lifecycle_management",
     "xpack.infra": "plugins/infra",
     "xpack.ingestManager": "plugins/ingest_manager",
     "xpack.lens": "legacy/plugins/lens",
diff --git a/x-pack/index.js b/x-pack/index.js
index 6fab13d726fa6..3126dc17a7107 100644
--- a/x-pack/index.js
+++ b/x-pack/index.js
@@ -16,7 +16,6 @@ import { beats } from './legacy/plugins/beats_management';
 import { apm } from './legacy/plugins/apm';
 import { maps } from './legacy/plugins/maps';
 import { indexManagement } from './legacy/plugins/index_management';
-import { indexLifecycleManagement } from './legacy/plugins/index_lifecycle_management';
 import { spaces } from './legacy/plugins/spaces';
 import { canvas } from './legacy/plugins/canvas';
 import { infra } from './legacy/plugins/infra';
@@ -50,7 +49,6 @@ module.exports = function(kibana) {
     maps(kibana),
     canvas(kibana),
     indexManagement(kibana),
-    indexLifecycleManagement(kibana),
     infra(kibana),
     taskManager(kibana),
     rollup(kibana),
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/extend_index_management.ts b/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/extend_index_management.ts
index 01c6250383fb8..4ffe0db4e3c4e 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/extend_index_management.ts
+++ b/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/extend_index_management.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { IndexMgmtSetup } from '../../../../../plugins/index_management/public';
+import { IndexManagementPluginSetup } from '../../../../../plugins/index_management/public';
 
 const propertyPath = 'isFollowerIndex';
 
@@ -21,7 +21,7 @@ const followerBadgeExtension = {
   filterExpression: 'isFollowerIndex:true',
 };
 
-export const extendIndexManagement = (indexManagement?: IndexMgmtSetup) => {
+export const extendIndexManagement = (indexManagement?: IndexManagementPluginSetup) => {
   if (indexManagement) {
     indexManagement.extensionsService.addBadge(followerBadgeExtension);
   }
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/plugin.ts b/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/plugin.ts
index f7651cbb210a7..46259c698b282 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/plugin.ts
+++ b/x-pack/legacy/plugins/cross_cluster_replication/public/np_ready/plugin.ts
@@ -11,7 +11,7 @@ import {
   DocLinksStart,
 } from 'src/core/public';
 
-import { IndexMgmtSetup } from '../../../../../plugins/index_management/public';
+import { IndexManagementPluginSetup } from '../../../../../plugins/index_management/public';
 
 // @ts-ignore;
 import { setHttpClient } from './app/services/api';
@@ -21,7 +21,7 @@ import { setNotifications } from './app/services/notifications';
 import { extendIndexManagement } from './extend_index_management';
 
 interface PluginDependencies {
-  indexManagement: IndexMgmtSetup;
+  indexManagement: IndexManagementPluginSetup;
   __LEGACY: {
     chrome: any;
     MANAGEMENT_BREADCRUMB: ChromeBreadcrumb;
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/server/np_ready/plugin.ts b/x-pack/legacy/plugins/cross_cluster_replication/server/np_ready/plugin.ts
index 1012c07af3d2a..829de10ad0177 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/server/np_ready/plugin.ts
+++ b/x-pack/legacy/plugins/cross_cluster_replication/server/np_ready/plugin.ts
@@ -6,7 +6,7 @@
 
 import { Plugin, PluginInitializerContext, CoreSetup } from 'src/core/server';
 
-import { IndexMgmtSetup } from '../../../../../plugins/index_management/server';
+import { IndexManagementPluginSetup } from '../../../../../plugins/index_management/server';
 
 // @ts-ignore
 import { registerLicenseChecker } from './lib/register_license_checker';
@@ -15,7 +15,7 @@ import { registerRoutes } from './routes/register_routes';
 import { ccrDataEnricher } from './cross_cluster_replication_data';
 
 interface PluginDependencies {
-  indexManagement: IndexMgmtSetup;
+  indexManagement: IndexManagementPluginSetup;
   __LEGACY: {
     server: any;
     ccrUIEnabled: boolean;
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/index.ts
deleted file mode 100644
index 9b14b7143bf44..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/index.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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 { Legacy } from 'kibana';
-import { resolve } from 'path';
-import { PLUGIN } from './common/constants';
-import { Plugin as IndexLifecycleManagementPlugin } from './plugin';
-import { createShim } from './shim';
-
-export function indexLifecycleManagement(kibana: any) {
-  return new kibana.Plugin({
-    id: PLUGIN.ID,
-    configPrefix: 'xpack.ilm',
-    publicDir: resolve(__dirname, 'public'),
-    require: ['kibana', 'elasticsearch', 'xpack_main', 'index_management'],
-    uiExports: {
-      styleSheetPaths: resolve(__dirname, 'public/np_ready/application/index.scss'),
-      managementSections: ['plugins/index_lifecycle_management/legacy'],
-      injectDefaultVars(server: Legacy.Server) {
-        const config = server.config();
-        return {
-          ilmUiEnabled: config.get('xpack.ilm.ui.enabled'),
-        };
-      },
-    },
-    config: (Joi: any) => {
-      return Joi.object({
-        // display menu item
-        ui: Joi.object({
-          enabled: Joi.boolean().default(true),
-        }).default(),
-
-        // enable plugin
-        enabled: Joi.boolean().default(true),
-
-        filteredNodeAttributes: Joi.array()
-          .items(Joi.string())
-          .default([]),
-      }).default();
-    },
-    isEnabled(config: any) {
-      return (
-        config.get('xpack.ilm.enabled') &&
-        config.has('xpack.index_management.enabled') &&
-        config.get('xpack.index_management.enabled')
-      );
-    },
-    init(server: Legacy.Server) {
-      const core = server.newPlatform.setup.core;
-      const plugins = {};
-      const __LEGACY = createShim(server);
-
-      const indexLifecycleManagementPlugin = new IndexLifecycleManagementPlugin();
-
-      // Set up plugin.
-      indexLifecycleManagementPlugin.setup(core, plugins, __LEGACY);
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/plugin.ts b/x-pack/legacy/plugins/index_lifecycle_management/plugin.ts
deleted file mode 100644
index 38d1bea45ce07..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/plugin.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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 { CoreSetup } from 'kibana/server';
-import { LegacySetup } from './shim';
-import { registerLicenseChecker } from './server/lib/register_license_checker';
-import { registerIndexRoutes } from './server/routes/api/index';
-import { registerNodesRoutes } from './server/routes/api/nodes';
-import { registerPoliciesRoutes } from './server/routes/api/policies';
-import { registerTemplatesRoutes } from './server/routes/api/templates';
-
-const indexLifecycleDataEnricher = async (indicesList: any, callWithRequest: any) => {
-  if (!indicesList || !indicesList.length) {
-    return;
-  }
-  const params = {
-    path: '/*/_ilm/explain',
-    method: 'GET',
-  };
-  const { indices: ilmIndicesData } = await callWithRequest('transport.request', params);
-  return indicesList.map((index: any): any => {
-    return {
-      ...index,
-      ilm: { ...(ilmIndicesData[index.name] || {}) },
-    };
-  });
-};
-
-export class Plugin {
-  public setup(core: CoreSetup, plugins: any, __LEGACY: LegacySetup): void {
-    const { server } = __LEGACY;
-
-    registerLicenseChecker(server);
-
-    // Register routes.
-    registerIndexRoutes(server);
-    registerNodesRoutes(server);
-    registerPoliciesRoutes(server);
-    registerTemplatesRoutes(server);
-
-    const serverPlugins = server.newPlatform.setup.plugins as any;
-
-    if (
-      server.config().get('xpack.ilm.ui.enabled') &&
-      serverPlugins.indexManagement &&
-      serverPlugins.indexManagement.indexDataEnricher
-    ) {
-      serverPlugins.indexManagement.indexDataEnricher.add(indexLifecycleDataEnricher);
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/legacy.ts b/x-pack/legacy/plugins/index_lifecycle_management/public/legacy.ts
deleted file mode 100644
index 006e5f6098f2b..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/legacy.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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 { App } from 'src/core/public';
-
-/* Legacy Imports */
-import { npSetup, npStart } from 'ui/new_platform';
-import chrome from 'ui/chrome';
-import routes from 'ui/routes';
-import { management } from 'ui/management';
-import { createUiStatsReporter } from '../../../../../src/legacy/core_plugins/ui_metric/public';
-
-import { PLUGIN, BASE_PATH } from '../common/constants';
-import { createPlugin } from './np_ready';
-import { addAllExtensions } from './np_ready/extend_index_management';
-
-if (chrome.getInjected('ilmUiEnabled')) {
-  // We have to initialize this outside of the NP lifecycle, otherwise these extensions won't
-  // be available in Index Management unless the user visits ILM first.
-  if ((npSetup.plugins as any).indexManagement) {
-    addAllExtensions((npSetup.plugins as any).indexManagement.extensionsService);
-  }
-
-  // This method handles the cleanup needed when route is scope is destroyed.  It also prevents Angular
-  // from destroying scope when route changes and both old route and new route are this same route.
-  const manageAngularLifecycle = ($scope: any, $route: any, unmount: () => void) => {
-    const lastRoute = $route.current;
-    const deregister = $scope.$on('$locationChangeSuccess', () => {
-      const currentRoute = $route.current;
-      // if templates are the same we are on the same route
-      if (lastRoute.$$route.template === currentRoute.$$route.template) {
-        // this prevents angular from destroying scope
-        $route.current = lastRoute;
-      }
-    });
-    $scope.$on('$destroy', () => {
-      if (deregister) {
-        deregister();
-      }
-      unmount();
-    });
-  };
-
-  // Once this app no longer depends upon Angular's routing (e.g. for the "redirect" service), we can
-  // use the Management plugin's API to register this app within the Elasticsearch section.
-  const esSection = management.getSection('elasticsearch');
-  esSection.register('index_lifecycle_policies', {
-    visible: true,
-    display: PLUGIN.TITLE,
-    order: 2,
-    url: `#${BASE_PATH}policies`,
-  });
-
-  const REACT_ROOT_ID = 'indexLifecycleManagementReactRoot';
-
-  const template = `<kbn-management-app section="elasticsearch/index_lifecycle_policies">
-    <div id="${REACT_ROOT_ID}" class="policyTable__horizontalScrollContainer"/>
-  </kbn-management-app>
-  `;
-
-  routes.when(`${BASE_PATH}:view?/:action?/:id?`, {
-    template,
-    controllerAs: 'indexLifecycleManagement',
-    controller: class IndexLifecycleManagementController {
-      constructor($scope: any, $route: any, kbnUrl: any, $rootScope: any) {
-        $scope.$$postDigest(() => {
-          const element = document.getElementById(REACT_ROOT_ID)!;
-          const { core } = npSetup;
-
-          const coreDependencies = {
-            ...core,
-            application: {
-              ...core.application,
-              async register(app: App<any>) {
-                const unmountApp = await app.mount({ ...npStart } as any, {
-                  element,
-                  appBasePath: '',
-                  onAppLeave: () => undefined,
-                  // TODO: adapt to use Core's ScopedHistory
-                  history: {} as any,
-                });
-                manageAngularLifecycle($scope, $route, unmountApp as any);
-              },
-            },
-          };
-
-          // The Plugin interface won't allow us to pass __LEGACY as a third argument, so we'll just
-          // sneak it inside of the plugins argument for now.
-          const pluginDependencies = {
-            __LEGACY: {
-              redirect: (path: string) => {
-                $scope.$evalAsync(() => {
-                  kbnUrl.redirect(path);
-                });
-              },
-              createUiStatsReporter,
-            },
-          };
-
-          const plugin = createPlugin({} as any);
-          plugin.setup(coreDependencies, pluginDependencies);
-        });
-      }
-    } as any,
-  } as any);
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/_index_lifecycle_management.scss b/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/_index_lifecycle_management.scss
deleted file mode 100644
index 96c6d1a938c61..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/_index_lifecycle_management.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.policyTable__horizontalScrollContainer {
-  overflow-x: auto;
-  max-width: 100%;
-}
-
-.policyTable__horizontalScroll {
-  min-width: 800px;
-  width: 100%;
-}
-
-.policyTable__link {
-  font-weight: 400;
-}
-
-.ilmEditPolicyPageContent {
-  max-width: 1200px !important;
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/index.scss b/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/index.scss
deleted file mode 100644
index 53e90e2aae35b..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Import the EUI global scope so we can use EUI constants
-@import 'src/legacy/ui/public/styles/_styling_constants';
-@import 'index_lifecycle_management';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/index.tsx b/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/index.tsx
deleted file mode 100644
index b87a633d65c9c..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/index.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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 { render, unmountComponentAtNode } from 'react-dom';
-import { Provider } from 'react-redux';
-import { DocLinksStart, ToastsSetup, HttpSetup, FatalErrorsSetup } from 'src/core/public';
-
-import { App } from './app';
-import { indexLifecycleManagementStore } from './store';
-import { init as initHttp } from './services/http';
-import { init as initNavigation } from './services/navigation';
-import { init as initDocumentation } from './services/documentation';
-import { init as initUiMetric } from './services/ui_metric';
-import { init as initNotification } from './services/notification';
-
-export interface LegacySetup {
-  redirect: any;
-  createUiStatsReporter: any;
-}
-
-interface AppDependencies {
-  legacy: LegacySetup;
-  I18nContext: any;
-  http: HttpSetup;
-  toasts: ToastsSetup;
-  fatalErrors: FatalErrorsSetup;
-  docLinks: DocLinksStart;
-  element: HTMLElement;
-}
-
-export const renderApp = (appDependencies: AppDependencies) => {
-  const {
-    legacy: { redirect, createUiStatsReporter },
-    I18nContext,
-    http,
-    toasts,
-    fatalErrors,
-    docLinks: { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION },
-    element,
-  } = appDependencies;
-
-  // Initialize services
-  initHttp(http);
-  initNavigation(redirect);
-  initDocumentation(`${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/`);
-  initUiMetric(createUiStatsReporter);
-  initNotification(toasts, fatalErrors);
-
-  render(
-    <I18nContext>
-      <Provider store={indexLifecycleManagementStore()}>
-        <App />
-      </Provider>
-    </I18nContext>,
-    element
-  );
-
-  return () => unmountComponentAtNode(element);
-};
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/api.js b/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/api.js
deleted file mode 100644
index f13bbcb6162b8..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/api.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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 {
-  UIM_POLICY_DELETE,
-  UIM_POLICY_ATTACH_INDEX,
-  UIM_POLICY_ATTACH_INDEX_TEMPLATE,
-  UIM_POLICY_DETACH_INDEX,
-  UIM_INDEX_RETRY_STEP,
-} from '../constants';
-
-import { trackUiMetric } from './ui_metric';
-import { sendGet, sendPost, sendDelete } from './http';
-
-// The extend_index_management module that we support an injected httpClient here.
-
-export async function loadNodes(httpClient) {
-  return await sendGet(`nodes/list`, httpClient);
-}
-
-export async function loadNodeDetails(selectedNodeAttrs, httpClient) {
-  return await sendGet(`nodes/${selectedNodeAttrs}/details`, httpClient);
-}
-
-export async function loadIndexTemplates(httpClient) {
-  return await sendGet(`templates`, httpClient);
-}
-
-export async function loadIndexTemplate(templateName, httpClient) {
-  if (!templateName) {
-    return {};
-  }
-  return await sendGet(`templates/${templateName}`, httpClient);
-}
-
-export async function loadPolicies(withIndices, httpClient) {
-  const query = withIndices ? '?withIndices=true' : '';
-  return await sendGet('policies', query, httpClient);
-}
-
-export async function savePolicy(policy, httpClient) {
-  return await sendPost(`policies`, policy, httpClient);
-}
-
-export async function deletePolicy(policyName, httpClient) {
-  const response = await sendDelete(`policies/${encodeURIComponent(policyName)}`, httpClient);
-  // Only track successful actions.
-  trackUiMetric('count', UIM_POLICY_DELETE);
-  return response;
-}
-
-export const retryLifecycleForIndex = async (indexNames, httpClient) => {
-  const response = await sendPost(`index/retry`, { indexNames }, httpClient);
-  // Only track successful actions.
-  trackUiMetric('count', UIM_INDEX_RETRY_STEP);
-  return response;
-};
-
-export const removeLifecycleForIndex = async (indexNames, httpClient) => {
-  const response = await sendPost(`index/remove`, { indexNames }, httpClient);
-  // Only track successful actions.
-  trackUiMetric('count', UIM_POLICY_DETACH_INDEX);
-  return response;
-};
-
-export const addLifecyclePolicyToIndex = async (body, httpClient) => {
-  const response = await sendPost(`index/add`, body, httpClient);
-  // Only track successful actions.
-  trackUiMetric('count', UIM_POLICY_ATTACH_INDEX);
-  return response;
-};
-
-export const addLifecyclePolicyToTemplate = async (body, httpClient) => {
-  const response = await sendPost(`template`, body, httpClient);
-  // Only track successful actions.
-  trackUiMetric('count', UIM_POLICY_ATTACH_INDEX_TEMPLATE);
-  return response;
-};
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/plugin.tsx b/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/plugin.tsx
deleted file mode 100644
index e2897f09fa892..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/plugin.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import { PLUGIN } from '../../common/constants';
-import { LegacySetup } from './application';
-
-interface PluginsSetup {
-  __LEGACY: LegacySetup;
-}
-
-export class IndexLifecycleManagementPlugin implements Plugin<void, void, any, any> {
-  setup(core: CoreSetup, plugins: PluginsSetup) {
-    // Extract individual core dependencies.
-    const {
-      application,
-      notifications: { toasts },
-      fatalErrors,
-      http,
-    } = core;
-
-    // The Plugin interface won't allow us to pass __LEGACY as a third argument, so we'll just
-    // sneak it inside of the plugins parameter for now.
-    const { __LEGACY } = plugins;
-
-    application.register({
-      id: PLUGIN.ID,
-      title: PLUGIN.TITLE,
-      async mount(config, mountPoint) {
-        const {
-          core: {
-            docLinks,
-            i18n: { Context: I18nContext },
-          },
-        } = config;
-
-        const { element } = mountPoint;
-        const { renderApp } = await import('./application');
-
-        // Inject all dependencies into our app.
-        return renderApp({
-          legacy: { ...__LEGACY },
-          I18nContext,
-          http,
-          toasts,
-          fatalErrors,
-          docLinks,
-          element,
-        });
-      },
-    });
-  }
-  start(core: CoreStart, plugins: any) {}
-  stop() {}
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/call_with_request_factory/call_with_request_factory.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/call_with_request_factory/call_with_request_factory.ts
deleted file mode 100644
index 1b28dc4fde4f7..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/call_with_request_factory/call_with_request_factory.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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 { once } from 'lodash';
-import { Legacy } from 'kibana';
-
-const callWithRequest = once((server: Legacy.Server): any => {
-  const cluster = server.plugins.elasticsearch.getCluster('data');
-  return cluster.callWithRequest;
-});
-
-export const callWithRequestFactory = (server: Legacy.Server, request: any) => {
-  return (...args: any[]) => {
-    return callWithRequest(server)(request, ...args);
-  };
-};
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/call_with_request_factory/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/call_with_request_factory/index.ts
deleted file mode 100644
index 787814d87dff9..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/call_with_request_factory/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from './call_with_request_factory';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/__tests__/check_license.js b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/__tests__/check_license.js
deleted file mode 100644
index 933fda01c055d..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/__tests__/check_license.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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 expect from '@kbn/expect';
-import { set } from 'lodash';
-import { checkLicense } from '../check_license';
-
-describe('check_license', function() {
-  let mockLicenseInfo;
-  beforeEach(() => (mockLicenseInfo = {}));
-
-  describe('license information is undefined', () => {
-    beforeEach(() => (mockLicenseInfo = undefined));
-
-    it('should set isAvailable to false', () => {
-      expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
-    });
-
-    it('should set showLinks to true', () => {
-      expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-    });
-
-    it('should set enableLinks to false', () => {
-      expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false);
-    });
-
-    it('should set a message', () => {
-      expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
-    });
-  });
-
-  describe('license information is not available', () => {
-    beforeEach(() => (mockLicenseInfo.isAvailable = () => false));
-
-    it('should set isAvailable to false', () => {
-      expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
-    });
-
-    it('should set showLinks to true', () => {
-      expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-    });
-
-    it('should set enableLinks to false', () => {
-      expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false);
-    });
-
-    it('should set a message', () => {
-      expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
-    });
-  });
-
-  describe('license information is available', () => {
-    beforeEach(() => {
-      mockLicenseInfo.isAvailable = () => true;
-      set(mockLicenseInfo, 'license.getType', () => 'basic');
-    });
-
-    describe('& license is > basic', () => {
-      beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
-
-      describe('& license is active', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
-
-        it('should set isAvailable to true', () => {
-          expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true);
-        });
-
-        it('should set showLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-        });
-
-        it('should set enableLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).enableLinks).to.be(true);
-        });
-
-        it('should not set a message', () => {
-          expect(checkLicense(mockLicenseInfo).message).to.be(undefined);
-        });
-      });
-
-      describe('& license is expired', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false));
-
-        it('should set isAvailable to false', () => {
-          expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
-        });
-
-        it('should set showLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-        });
-
-        it('should set enableLinks to false', () => {
-          expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false);
-        });
-
-        it('should set a message', () => {
-          expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
-        });
-      });
-    });
-
-    describe('& license is basic', () => {
-      beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
-
-      describe('& license is active', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
-
-        it('should set isAvailable to true', () => {
-          expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true);
-        });
-
-        it('should set showLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-        });
-
-        it('should set enableLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).enableLinks).to.be(true);
-        });
-
-        it('should not set a message', () => {
-          expect(checkLicense(mockLicenseInfo).message).to.be(undefined);
-        });
-      });
-
-      describe('& license is expired', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false));
-
-        it('should set isAvailable to false', () => {
-          expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
-        });
-
-        it('should set showLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-        });
-
-        it('should set a message', () => {
-          expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
-        });
-      });
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/check_license.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/check_license.ts
deleted file mode 100644
index b35ab14964d55..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/check_license.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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 { i18n } from '@kbn/i18n';
-
-export function checkLicense(xpackLicenseInfo: any): any {
-  const pluginName = 'Index Lifecycle Policies';
-
-  // If, for some reason, we cannot get the license information
-  // from Elasticsearch, assume worst case and disable
-  if (!xpackLicenseInfo || !xpackLicenseInfo.isAvailable()) {
-    return {
-      isAvailable: false,
-      showLinks: true,
-      enableLinks: false,
-      message: i18n.translate('xpack.indexLifecycleMgmt.checkLicense.errorUnavailableMessage', {
-        defaultMessage:
-          'You cannot use {pluginName} because license information is not available at this time.',
-        values: { pluginName },
-      }),
-    };
-  }
-
-  const VALID_LICENSE_MODES = ['basic', 'standard', 'gold', 'platinum', 'enterprise', 'trial'];
-
-  const isLicenseModeValid = xpackLicenseInfo.license.isOneOf(VALID_LICENSE_MODES);
-  const isLicenseActive = xpackLicenseInfo.license.isActive();
-  const licenseType = xpackLicenseInfo.license.getType();
-
-  // License is not valid
-  if (!isLicenseModeValid) {
-    return {
-      isAvailable: false,
-      showLinks: false,
-      message: i18n.translate('xpack.indexLifecycleMgmt.checkLicense.errorUnsupportedMessage', {
-        defaultMessage:
-          'Your {licenseType} license does not support {pluginName}. Please upgrade your license.',
-        values: { licenseType, pluginName },
-      }),
-    };
-  }
-
-  // License is valid but not active
-  if (!isLicenseActive) {
-    return {
-      isAvailable: false,
-      showLinks: true,
-      enableLinks: false,
-      message: i18n.translate('xpack.indexLifecycleMgmt.checkLicense.errorExpiredMessage', {
-        defaultMessage:
-          'You cannot use {pluginName} because your {licenseType} license has expired.',
-        values: { pluginName, licenseType },
-      }),
-    };
-  }
-
-  // License is valid and active
-  return {
-    isAvailable: true,
-    showLinks: true,
-    enableLinks: true,
-  };
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_custom_error.js b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_custom_error.js
deleted file mode 100644
index f9c102be7a1ff..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_custom_error.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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 expect from '@kbn/expect';
-import { wrapCustomError } from '../wrap_custom_error';
-
-describe('wrap_custom_error', () => {
-  describe('#wrapCustomError', () => {
-    it('should return a Boom object', () => {
-      const originalError = new Error('I am an error');
-      const statusCode = 404;
-      const wrappedError = wrapCustomError(originalError, statusCode);
-
-      expect(wrappedError.isBoom).to.be(true);
-      expect(wrappedError.output.statusCode).to.equal(statusCode);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_es_error.js b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_es_error.js
deleted file mode 100644
index fe2b6cce652f1..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_es_error.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 expect from '@kbn/expect';
-import { wrapEsError } from '../wrap_es_error';
-
-describe('wrap_es_error', () => {
-  describe('#wrapEsError', () => {
-    let originalError;
-    beforeEach(() => {
-      originalError = new Error('I am an error');
-      originalError.statusCode = 404;
-    });
-
-    it('should return a Boom object', () => {
-      const wrappedError = wrapEsError(originalError);
-
-      expect(wrappedError.isBoom).to.be(true);
-    });
-
-    it('should return the correct Boom object', () => {
-      const wrappedError = wrapEsError(originalError);
-
-      expect(wrappedError.output.statusCode).to.be(originalError.statusCode);
-      expect(wrappedError.output.payload.message).to.be(originalError.message);
-    });
-
-    it('should return the correct Boom object with custom message', () => {
-      const wrappedError = wrapEsError(originalError, { 404: 'No encontrado!' });
-
-      expect(wrappedError.output.statusCode).to.be(originalError.statusCode);
-      expect(wrappedError.output.payload.message).to.be('No encontrado!');
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_unknown_error.js b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_unknown_error.js
deleted file mode 100644
index 85e0b2b3033ad..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/__tests__/wrap_unknown_error.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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 expect from '@kbn/expect';
-import { wrapUnknownError } from '../wrap_unknown_error';
-
-describe('wrap_unknown_error', () => {
-  describe('#wrapUnknownError', () => {
-    it('should return a Boom object', () => {
-      const originalError = new Error('I am an error');
-      const wrappedError = wrapUnknownError(originalError);
-
-      expect(wrappedError.isBoom).to.be(true);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/index.ts
deleted file mode 100644
index f275f15637091..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * 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 { wrapCustomError } from './wrap_custom_error';
-export { wrapEsError } from './wrap_es_error';
-export { wrapUnknownError } from './wrap_unknown_error';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_custom_error.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_custom_error.ts
deleted file mode 100644
index c5780e7c83fb5..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_custom_error.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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 Boom from 'boom';
-
-/**
- * Wraps a custom error into a Boom error response and returns it
- *
- * @param err Object error
- * @param statusCode Error status code
- * @return Object Boom error response
- */
-export function wrapCustomError(err: any, statusCode: any): any {
-  return Boom.boomify(err, { statusCode });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_es_error.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_es_error.ts
deleted file mode 100644
index 6980a5afa5eac..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_es_error.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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 Boom from 'boom';
-
-/**
- * Wraps an error thrown by the ES JS client into a Boom error response and returns it
- *
- * @param err Object Error thrown by ES JS client
- * @param statusCodeToMessageMap Object Optional map of HTTP status codes => error messages
- * @return Object Boom error response
- */
-export function wrapEsError(err: any, statusCodeToMessageMap: any = {}): any {
-  const statusCode = err.statusCode;
-
-  // If no custom message if specified for the error's status code, just
-  // wrap the error as a Boom error response and return it
-  if (!statusCodeToMessageMap[statusCode]) {
-    return Boom.boomify(err, { statusCode });
-  }
-
-  // Otherwise, use the custom message to create a Boom error response and
-  // return it
-  const message = statusCodeToMessageMap[statusCode];
-  return new Boom(message, { statusCode });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_unknown_error.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_unknown_error.ts
deleted file mode 100644
index ede1baec286f3..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_unknown_error.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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 Boom from 'boom';
-
-/**
- * Wraps an unknown error into a Boom error response and returns it
- *
- * @param err Object Unknown error
- * @return Object Boom error response
- */
-export function wrapUnknownError(err: any): any {
-  return Boom.boomify(err);
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/is_es_error/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/is_es_error/index.ts
deleted file mode 100644
index a9a3c61472d8c..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/is_es_error/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { isEsError } from './is_es_error';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js
deleted file mode 100644
index 4d3b33f8b3af3..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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 expect from '@kbn/expect';
-import { licensePreRoutingFactory } from '../license_pre_routing_factory';
-
-describe('license_pre_routing_factory', () => {
-  describe('#reportingFeaturePreRoutingFactory', () => {
-    let mockServer;
-    let mockLicenseCheckResults;
-
-    beforeEach(() => {
-      mockServer = {
-        plugins: {
-          xpack_main: {
-            info: {
-              feature: () => ({
-                getLicenseCheckResults: () => mockLicenseCheckResults,
-              }),
-            },
-          },
-        },
-      };
-    });
-
-    it('only instantiates one instance per server', () => {
-      const firstInstance = licensePreRoutingFactory(mockServer);
-      const secondInstance = licensePreRoutingFactory(mockServer);
-
-      expect(firstInstance).to.be(secondInstance);
-    });
-
-    describe('isAvailable is false', () => {
-      beforeEach(() => {
-        mockLicenseCheckResults = {
-          isAvailable: false,
-        };
-      });
-
-      it('replies with 403', () => {
-        const licensePreRouting = licensePreRoutingFactory(mockServer);
-        const stubRequest = {};
-        expect(() => licensePreRouting(stubRequest)).to.throwException(response => {
-          expect(response).to.be.an(Error);
-          expect(response.isBoom).to.be(true);
-          expect(response.output.statusCode).to.be(403);
-        });
-      });
-    });
-
-    describe('isAvailable is true', () => {
-      beforeEach(() => {
-        mockLicenseCheckResults = {
-          isAvailable: true,
-        };
-      });
-
-      it('replies with nothing', () => {
-        const licensePreRouting = licensePreRoutingFactory(mockServer);
-        const stubRequest = {};
-        const response = licensePreRouting(stubRequest);
-        expect(response).to.be(null);
-      });
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
deleted file mode 100644
index e348125967c14..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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 { once } from 'lodash';
-import { Legacy } from 'kibana';
-
-import { PLUGIN } from '../../../common/constants';
-import { wrapCustomError } from '../error_wrappers';
-
-export const licensePreRoutingFactory = once((server: Legacy.Server) => {
-  const xpackMainPlugin = server.plugins.xpack_main;
-
-  // License checking and enable/disable logic
-  function licensePreRouting() {
-    const licenseCheckResults = xpackMainPlugin.info.feature(PLUGIN.ID).getLicenseCheckResults();
-    if (!licenseCheckResults.isAvailable) {
-      const error = new Error(licenseCheckResults.message);
-      const statusCode = 403;
-      throw wrapCustomError(error, statusCode);
-    }
-
-    return null;
-  }
-
-  return licensePreRouting;
-});
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/register_license_checker/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/register_license_checker/index.ts
deleted file mode 100644
index 7b0f97c38d129..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/register_license_checker/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { registerLicenseChecker } from './register_license_checker';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/register_license_checker/register_license_checker.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/register_license_checker/register_license_checker.ts
deleted file mode 100644
index 8e3b89fa20e33..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/register_license_checker/register_license_checker.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 { Legacy } from 'kibana';
-// @ts-ignore
-import { mirrorPluginStatus } from '../../../../../server/lib/mirror_plugin_status';
-import { PLUGIN } from '../../../common/constants';
-import { checkLicense } from '../check_license';
-
-export function registerLicenseChecker(server: Legacy.Server) {
-  const xpackMainPlugin = server.plugins.xpack_main as any;
-  const ilmPlugin = (server.plugins as any).index_lifecycle_management;
-
-  mirrorPluginStatus(xpackMainPlugin, ilmPlugin);
-  xpackMainPlugin.status.once('green', () => {
-    // Register a function that is called whenever the xpack info changes,
-    // to re-compute the license check results for this plugin
-    xpackMainPlugin.info.feature(PLUGIN.ID).registerLicenseCheckResultsGenerator(checkLicense);
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/index.ts
deleted file mode 100644
index 82fb2e3b2a372..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { registerIndexRoutes } from './register_index_routes';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
deleted file mode 100644
index c3e235220931c..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-async function addLifecyclePolicy(
-  callWithRequest: any,
-  indexName: string,
-  policyName: string,
-  alias: string
-) {
-  const body = {
-    lifecycle: {
-      name: policyName,
-      rollover_alias: alias,
-    },
-  };
-
-  const params = {
-    method: 'PUT',
-    path: `/${encodeURIComponent(indexName)}/_settings`,
-    body,
-  };
-
-  return callWithRequest('transport.request', params);
-}
-
-export function registerAddPolicyRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/index/add',
-    method: 'POST',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-      const { indexName, policyName, alias } = request.payload as any;
-      try {
-        const response = await addLifecyclePolicy(callWithRequest, indexName, policyName, alias);
-        return response;
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
deleted file mode 100644
index ed3b5a97a3b42..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-async function removeLifecycle(callWithRequest: any, indexNames: string[]) {
-  const responses = [];
-  for (let i = 0; i < indexNames.length; i++) {
-    const indexName = indexNames[i];
-    const params = {
-      method: 'POST',
-      path: `/${encodeURIComponent(indexName)}/_ilm/remove`,
-      ignore: [404],
-    };
-
-    responses.push(callWithRequest('transport.request', params));
-  }
-  return Promise.all(responses);
-}
-
-export function registerRemoveRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/index/remove',
-    method: 'POST',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-
-      try {
-        const response = await removeLifecycle(callWithRequest, request.payload.indexNames);
-        return response;
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
deleted file mode 100644
index 89278edbecea2..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-async function retryLifecycle(callWithRequest: any, indexNames: string[]) {
-  const responses = [];
-  for (let i = 0; i < indexNames.length; i++) {
-    const indexName = indexNames[i];
-    const params = {
-      method: 'POST',
-      path: `/${encodeURIComponent(indexName)}/_ilm/retry`,
-      ignore: [404],
-    };
-
-    responses.push(callWithRequest('transport.request', params));
-  }
-  return Promise.all(responses);
-}
-
-export function registerRetryRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/index/retry',
-    method: 'POST',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-
-      try {
-        const response = await retryLifecycle(callWithRequest, request.payload.indexNames);
-        return response;
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/constants.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/constants.ts
deleted file mode 100644
index 4392dacac8fa4..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/constants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * 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 const NODE_ATTRS_KEYS_TO_IGNORE: string[] = [
-  'ml.enabled',
-  'ml.machine_memory',
-  'ml.max_open_jobs',
-  // Used by ML to identify nodes that have transform enabled:
-  // https://github.com/elastic/elasticsearch/pull/52712/files#diff-225cc2c1291b4c60a8c3412a619094e1R147
-  'transform.node',
-  'xpack.installed',
-];
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/index.ts
deleted file mode 100644
index ef0ac271ae60e..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { registerNodesRoutes } from './register_nodes_routes';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
deleted file mode 100644
index c2c3f8bf07028..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-function findMatchingNodes(stats: any, nodeAttrs: string): any {
-  return Object.entries(stats.nodes).reduce((accum: any[], [nodeId, nodeStats]: [any, any]) => {
-    const attributes = nodeStats.attributes || {};
-    for (const [key, value] of Object.entries(attributes)) {
-      if (`${key}:${value}` === nodeAttrs) {
-        accum.push({
-          nodeId,
-          stats: nodeStats,
-        });
-        break;
-      }
-    }
-    return accum;
-  }, []);
-}
-
-async function fetchNodeStats(callWithRequest: any): Promise<any> {
-  const params = {
-    format: 'json',
-  };
-
-  return await callWithRequest('nodes.stats', params);
-}
-
-export function registerDetailsRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/nodes/{nodeAttrs}/details',
-    method: 'GET',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-
-      try {
-        const stats = await fetchNodeStats(callWithRequest);
-        const response = findMatchingNodes(stats, request.params.nodeAttrs);
-        return response;
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
deleted file mode 100644
index edbe4289ed83c..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-import { NODE_ATTRS_KEYS_TO_IGNORE } from './constants';
-
-function convertStatsIntoList(stats: any, attributesToBeFiltered: string[]): any {
-  return Object.entries(stats.nodes).reduce((accum: any, [nodeId, nodeStats]: [any, any]) => {
-    const attributes = nodeStats.attributes || {};
-    for (const [key, value] of Object.entries(attributes)) {
-      if (!attributesToBeFiltered.includes(key)) {
-        const attributeString = `${key}:${value}`;
-        accum[attributeString] = accum[attributeString] || [];
-        accum[attributeString].push(nodeId);
-      }
-    }
-    return accum;
-  }, {});
-}
-
-async function fetchNodeStats(callWithRequest: any): Promise<any> {
-  const params = {
-    format: 'json',
-  };
-
-  return await callWithRequest('nodes.stats', params);
-}
-
-export function registerListRoute(server: any) {
-  const config = server.config();
-  const filteredNodeAttributes = config.get('xpack.ilm.filteredNodeAttributes');
-  const attributesToBeFiltered = [...NODE_ATTRS_KEYS_TO_IGNORE, ...filteredNodeAttributes];
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/nodes/list',
-    method: 'GET',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-
-      try {
-        const stats = await fetchNodeStats(callWithRequest);
-        const response = convertStatsIntoList(stats, attributesToBeFiltered);
-        return response;
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/index.ts
deleted file mode 100644
index 7c6103a3389ab..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { registerPoliciesRoutes } from './register_policies_routes';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
deleted file mode 100644
index f6bc96dd498a4..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-async function createPolicy(callWithRequest: any, policy: any): Promise<any> {
-  const body = {
-    policy: {
-      phases: policy.phases,
-    },
-  };
-  const params = {
-    method: 'PUT',
-    path: `/_ilm/policy/${encodeURIComponent(policy.name)}`,
-    ignore: [404],
-    body,
-  };
-
-  return await callWithRequest('transport.request', params);
-}
-
-export function registerCreateRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/policies',
-    method: 'POST',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-
-      try {
-        const response = await createPolicy(callWithRequest, request.payload);
-        return response;
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
deleted file mode 100644
index c84f2efd92d8f..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-async function deletePolicies(policyNames: string, callWithRequest: any): Promise<any> {
-  const params = {
-    method: 'DELETE',
-    path: `/_ilm/policy/${encodeURIComponent(policyNames)}`,
-    // we allow 404 since they may have no policies
-    ignore: [404],
-  };
-
-  return await callWithRequest('transport.request', params);
-}
-
-export function registerDeleteRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/policies/{policyNames}',
-    method: 'DELETE',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-      const { policyNames } = request.params;
-      try {
-        await deletePolicies(policyNames, callWithRequest);
-        return {};
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
deleted file mode 100644
index c65f849a47d87..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-function formatPolicies(policiesMap: any): any {
-  if (policiesMap.status === 404) {
-    return [];
-  }
-
-  return Object.keys(policiesMap).reduce((accum: any[], lifecycleName: string) => {
-    const policyEntry = policiesMap[lifecycleName];
-    accum.push({
-      ...policyEntry,
-      name: lifecycleName,
-    });
-    return accum;
-  }, []);
-}
-
-async function fetchPolicies(callWithRequest: any): Promise<any> {
-  const params = {
-    method: 'GET',
-    path: '/_ilm/policy',
-    // we allow 404 since they may have no policies
-    ignore: [404],
-  };
-
-  return await callWithRequest('transport.request', params);
-}
-async function addLinkedIndices(policiesMap: any, callWithRequest: any) {
-  if (policiesMap.status === 404) {
-    return policiesMap;
-  }
-  const params = {
-    method: 'GET',
-    path: '/*/_ilm/explain',
-    // we allow 404 since they may have no policies
-    ignore: [404],
-  };
-
-  const policyExplanation: any = await callWithRequest('transport.request', params);
-  Object.entries(policyExplanation.indices).forEach(([indexName, { policy }]: [string, any]) => {
-    if (policy && policiesMap[policy]) {
-      policiesMap[policy].linkedIndices = policiesMap[policy].linkedIndices || [];
-      policiesMap[policy].linkedIndices.push(indexName);
-    }
-  });
-}
-
-export function registerFetchRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/policies',
-    method: 'GET',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-      const { withIndices } = request.query;
-      try {
-        const policiesMap = await fetchPolicies(callWithRequest);
-        if (withIndices) {
-          await addLinkedIndices(policiesMap, callWithRequest);
-        }
-        return formatPolicies(policiesMap);
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/index.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/index.ts
deleted file mode 100644
index dc9a0acaaf09b..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { registerTemplatesRoutes } from './register_templates_routes';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
deleted file mode 100644
index 57e5a91f60f5b..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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 { merge } from 'lodash';
-
-import { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-async function getIndexTemplate(callWithRequest: any, templateName: string): Promise<any> {
-  const response = await callWithRequest('indices.getTemplate', { name: templateName });
-  return response[templateName];
-}
-
-async function updateIndexTemplate(callWithRequest: any, indexTemplatePatch: any): Promise<any> {
-  // Fetch existing template
-  const template = await getIndexTemplate(callWithRequest, indexTemplatePatch.templateName);
-  merge(template, {
-    settings: {
-      index: {
-        lifecycle: {
-          name: indexTemplatePatch.policyName,
-          rollover_alias: indexTemplatePatch.aliasName,
-        },
-      },
-    },
-  });
-
-  const params = {
-    method: 'PUT',
-    path: `/_template/${encodeURIComponent(indexTemplatePatch.templateName)}`,
-    ignore: [404],
-    body: template,
-  };
-
-  return await callWithRequest('transport.request', params);
-}
-
-export function registerAddPolicyRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/template',
-    method: 'POST',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-
-      try {
-        const response = await updateIndexTemplate(callWithRequest, request.payload);
-        return response;
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_get_route.ts b/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_get_route.ts
deleted file mode 100644
index 3edaea6e15818..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_get_route.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
-
-async function fetchTemplate(callWithRequest: any, templateName: string): Promise<any> {
-  const params = {
-    method: 'GET',
-    path: `/_template/${encodeURIComponent(templateName)}`,
-    // we allow 404 incase the user shutdown security in-between the check and now
-    ignore: [404],
-  };
-
-  return await callWithRequest('transport.request', params);
-}
-
-export function registerGetRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/templates/{templateName}',
-    method: 'GET',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
-      const templateName = request.params.templateName;
-
-      try {
-        const template = await fetchTemplate(callWithRequest, templateName);
-        return template[templateName];
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
-        }
-
-        return wrapUnknownError(err);
-      }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/shim.ts b/x-pack/legacy/plugins/index_lifecycle_management/shim.ts
deleted file mode 100644
index 18b3d9ef28b6a..0000000000000
--- a/x-pack/legacy/plugins/index_lifecycle_management/shim.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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 { Legacy } from 'kibana';
-
-export interface LegacySetup {
-  server: Legacy.Server;
-}
-
-export function createShim(server: Legacy.Server): LegacySetup {
-  return {
-    server,
-  };
-}
diff --git a/x-pack/legacy/plugins/index_management/index.ts b/x-pack/legacy/plugins/index_management/index.ts
index 9eba98a526d2b..afca15203b970 100644
--- a/x-pack/legacy/plugins/index_management/index.ts
+++ b/x-pack/legacy/plugins/index_management/index.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// TODO: Remove this once CCR is migrated to the plugins directory.
 export function indexManagement(kibana: any) {
   return new kibana.Plugin({
     id: 'index_management',
diff --git a/x-pack/legacy/plugins/rollup/public/plugin.ts b/x-pack/legacy/plugins/rollup/public/plugin.ts
index 5782e88c3448b..17ec8a5a4aedf 100644
--- a/x-pack/legacy/plugins/rollup/public/plugin.ts
+++ b/x-pack/legacy/plugins/rollup/public/plugin.ts
@@ -24,7 +24,7 @@ import {
 // @ts-ignore
 import { CRUD_APP_BASE_PATH } from './crud_app/constants';
 import { ManagementSetup } from '../../../../../src/plugins/management/public';
-import { IndexMgmtSetup } from '../../../../plugins/index_management/public';
+import { IndexManagementPluginSetup } from '../../../../plugins/index_management/public';
 import { IndexPatternManagementSetup } from '../../../../../src/plugins/index_pattern_management/public';
 import { search } from '../../../../../src/plugins/data/public';
 // @ts-ignore
@@ -35,7 +35,7 @@ import { renderApp } from './application';
 export interface RollupPluginSetupDependencies {
   home?: HomePublicPluginSetup;
   management: ManagementSetup;
-  indexManagement?: IndexMgmtSetup;
+  indexManagement?: IndexManagementPluginSetup;
   indexPatternManagement: IndexPatternManagementSetup;
 }
 
diff --git a/x-pack/legacy/plugins/rollup/server/plugin.ts b/x-pack/legacy/plugins/rollup/server/plugin.ts
index 090cb8a47377a..5f29ad160e052 100644
--- a/x-pack/legacy/plugins/rollup/server/plugin.ts
+++ b/x-pack/legacy/plugins/rollup/server/plugin.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { VisTypeTimeseriesSetup } from 'src/plugins/vis_type_timeseries/server';
-import { IndexMgmtSetup } from '../../../../plugins/index_management/server';
+import { IndexManagementPluginSetup } from '../../../../plugins/index_management/server';
 import { registerLicenseChecker } from '../../../server/lib/register_license_checker';
 import { PLUGIN } from '../common';
 import { ServerShim, RouteDependencies } from './types';
@@ -44,7 +44,7 @@ export class RollupsServerPlugin implements Plugin<void, void, any, any> {
       __LEGACY: ServerShim;
       usageCollection?: UsageCollectionSetup;
       metrics?: VisTypeTimeseriesSetup;
-      indexManagement?: IndexMgmtSetup;
+      indexManagement?: IndexManagementPluginSetup;
     }
   ) {
     const elasticsearch = await elasticsearchService.adminClient;
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
rename to x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap b/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap
rename to x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
similarity index 96%
rename from x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
rename to x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
index 9d143c4d3fc8e..bf4de823f1833 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
@@ -13,13 +13,13 @@ import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 import sinon from 'sinon';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
-import { mountWithIntl } from '../../../../../test_utils/enzyme_helpers';
-import { fetchedPolicies, fetchedNodes } from '../../public/np_ready/application/store/actions';
-import { indexLifecycleManagementStore } from '../../public/np_ready/application/store';
-import { EditPolicy } from '../../public/np_ready/application/sections/edit_policy';
-import { init as initHttp } from '../../public/np_ready/application/services/http';
-import { init as initUiMetric } from '../../public/np_ready/application/services/ui_metric';
-import { init as initNotification } from '../../public/np_ready/application/services/notification';
+import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
+import { fetchedPolicies, fetchedNodes } from '../../public/application/store/actions';
+import { indexLifecycleManagementStore } from '../../public/application/store';
+import { EditPolicy } from '../../public/application/sections/edit_policy';
+import { init as initHttp } from '../../public/application/services/http';
+import { init as initUiMetric } from '../../public/application/services/ui_metric';
+import { init as initNotification } from '../../public/application/services/notification';
 import {
   positiveNumbersAboveZeroErrorMessage,
   positiveNumberRequiredMessage,
@@ -33,16 +33,14 @@ import {
   policyNameMustBeDifferentErrorMessage,
   policyNameAlreadyUsedErrorMessage,
   maximumDocumentsRequiredMessage,
-} from '../../public/np_ready/application/store/selectors/lifecycle';
+} from '../../public/application/store/selectors/lifecycle';
 
 initHttp(axios.create({ adapter: axiosXhrAdapter }), path => path);
-initUiMetric(() => () => {});
+initUiMetric({ reportUiStats: () => {} });
 initNotification({
   addDanger: () => {},
 });
 
-jest.mock('ui/new_platform');
-
 let server;
 let store;
 const policy = {
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js b/x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
similarity index 91%
rename from x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
rename to x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
index a3a9c5e59bfa4..78c5c181eea62 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
@@ -12,17 +12,15 @@ import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 import sinon from 'sinon';
 import { findTestSubject, takeMountedSnapshot } from '@elastic/eui/lib/test';
 
-import { mountWithIntl } from '../../../../../test_utils/enzyme_helpers';
-import { fetchedPolicies } from '../../public/np_ready/application/store/actions';
-import { indexLifecycleManagementStore } from '../../public/np_ready/application/store';
-import { PolicyTable } from '../../public/np_ready/application/sections/policy_table';
-import { init as initHttp } from '../../public/np_ready/application/services/http';
-import { init as initUiMetric } from '../../public/np_ready/application/services/ui_metric';
+import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
+import { fetchedPolicies } from '../../public/application/store/actions';
+import { indexLifecycleManagementStore } from '../../public/application/store';
+import { PolicyTable } from '../../public/application/sections/policy_table';
+import { init as initHttp } from '../../public/application/services/http';
+import { init as initUiMetric } from '../../public/application/services/ui_metric';
 
 initHttp(axios.create({ adapter: axiosXhrAdapter }), path => path);
-initUiMetric(() => () => {});
-
-jest.mock('ui/new_platform');
+initUiMetric({ reportUiStats: () => {} });
 
 let server = null;
 
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/extend_index_management.test.js b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.js
similarity index 93%
rename from x-pack/legacy/plugins/index_lifecycle_management/__jest__/extend_index_management.test.js
rename to x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.js
index d2619778617c3..900de27ca36ab 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/extend_index_management.test.js
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.js
@@ -8,7 +8,7 @@ import moment from 'moment-timezone';
 import axios from 'axios';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
-import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
+import { mountWithIntl } from '../../../test_utils/enzyme_helpers';
 import {
   retryLifecycleActionExtension,
   removeLifecyclePolicyActionExtension,
@@ -16,21 +16,18 @@ import {
   ilmBannerExtension,
   ilmFilterExtension,
   ilmSummaryExtension,
-} from '../public/np_ready/extend_index_management';
-import { init as initHttp } from '../public/np_ready/application/services/http';
-import { init as initUiMetric } from '../public/np_ready/application/services/ui_metric';
+} from '../public/extend_index_management';
+import { init as initHttp } from '../public/application/services/http';
+import { init as initUiMetric } from '../public/application/services/ui_metric';
 
 // We need to init the http with a mock for any tests that depend upon the http service.
 // For example, add_lifecycle_confirm_modal makes an API request in its componentDidMount
 // lifecycle method. If we don't mock this, CI will fail with "Call retries were exceeded".
 initHttp(axios.create({ adapter: axiosXhrAdapter }), path => path);
-initUiMetric(() => () => {});
+initUiMetric({ reportUiStats: () => {} });
 
-jest.mock('ui/new_platform');
-jest.mock('../../../../plugins/index_management/public', async () => {
-  const { indexManagementMock } = await import(
-    '../../../../plugins/index_management/public/mocks.ts'
-  );
+jest.mock('../../../plugins/index_management/public', async () => {
+  const { indexManagementMock } = await import('../../../plugins/index_management/public/mocks.ts');
   return indexManagementMock.createSetup();
 });
 
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/common/constants/index.ts b/x-pack/plugins/index_lifecycle_management/common/constants/index.ts
similarity index 72%
rename from x-pack/legacy/plugins/index_lifecycle_management/common/constants/index.ts
rename to x-pack/plugins/index_lifecycle_management/common/constants/index.ts
index 9193efb561a0f..700039985eaf5 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/common/constants/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/common/constants/index.ts
@@ -5,12 +5,18 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { LicenseType } from '../../../licensing/common/types';
+
+const basicLicense: LicenseType = 'basic';
 
 export const PLUGIN = {
   ID: 'index_lifecycle_management',
+  minimumLicenseType: basicLicense,
   TITLE: i18n.translate('xpack.indexLifecycleMgmt.appTitle', {
     defaultMessage: 'Index Lifecycle Policies',
   }),
 };
 
 export const BASE_PATH = '/management/elasticsearch/index_lifecycle_management/';
+
+export const API_BASE_PATH = '/api/index_lifecycle_management';
diff --git a/x-pack/plugins/index_lifecycle_management/kibana.json b/x-pack/plugins/index_lifecycle_management/kibana.json
new file mode 100644
index 0000000000000..6385646b95789
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/kibana.json
@@ -0,0 +1,16 @@
+{
+  "id": "indexLifecycleManagement",
+  "version": "kibana",
+  "server": true,
+  "ui": true,
+  "requiredPlugins": [
+    "home",
+    "licensing",
+    "management"
+  ],
+  "optionalPlugins": [
+    "usageCollection",
+    "indexManagement"
+  ],
+  "configPath": ["xpack", "ilm"]
+}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/app.tsx b/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
similarity index 94%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/app.tsx
rename to x-pack/plugins/index_lifecycle_management/public/application/app.tsx
index 6738d7caa4444..993dced20bbe6 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/app.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
@@ -8,7 +8,7 @@ import React, { useEffect } from 'react';
 import { HashRouter, Switch, Route, Redirect } from 'react-router-dom';
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import { BASE_PATH } from '../../../common/constants';
+import { BASE_PATH } from '../../common/constants';
 import { UIM_APP_LOAD } from './constants';
 import { EditPolicy } from './sections/edit_policy';
 import { PolicyTable } from './sections/policy_table';
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/constants/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/constants/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/constants/index.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/constants/index.ts
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/constants/ui_metric.ts b/x-pack/plugins/index_lifecycle_management/public/application/constants/ui_metric.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/constants/ui_metric.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/constants/ui_metric.ts
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/index.tsx b/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
new file mode 100644
index 0000000000000..a7d88d31e58fc
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
@@ -0,0 +1,27 @@
+/*
+ * 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 { render, unmountComponentAtNode } from 'react-dom';
+import { Provider } from 'react-redux';
+import { I18nStart } from 'kibana/public';
+import { UnmountCallback } from 'src/core/public';
+
+import { App } from './app';
+import { indexLifecycleManagementStore } from './store';
+
+export const renderApp = (element: Element, I18nContext: I18nStart['Context']): UnmountCallback => {
+  render(
+    <I18nContext>
+      <Provider store={indexLifecycleManagementStore()}>
+        <App />
+      </Provider>
+    </I18nContext>,
+    element
+  );
+
+  return () => unmountComponentAtNode(element);
+};
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/active_badge.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/components/active_badge.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/active_badge.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/components/active_badge.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/components/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/components/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/learn_more_link.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/components/learn_more_link.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/learn_more_link.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/components/learn_more_link.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/optional_label.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/components/optional_label.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/optional_label.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/components/optional_label.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/phase_error_message.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/components/phase_error_message.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/components/phase_error_message.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/components/phase_error_message.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/cold_phase/cold_phase.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/cold_phase/cold_phase.container.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/cold_phase/cold_phase.container.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/cold_phase/cold_phase.container.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/cold_phase/cold_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/cold_phase/cold_phase.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/cold_phase/cold_phase.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/cold_phase/cold_phase.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/cold_phase/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/cold_phase/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/cold_phase/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/cold_phase/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/delete_phase/delete_phase.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/delete_phase/delete_phase.container.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/delete_phase/delete_phase.container.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/delete_phase/delete_phase.container.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/delete_phase/delete_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/delete_phase/delete_phase.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/delete_phase/delete_phase.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/delete_phase/delete_phase.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/delete_phase/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/delete_phase/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/delete_phase/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/delete_phase/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/hot_phase/hot_phase.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/hot_phase/hot_phase.container.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/hot_phase/hot_phase.container.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/hot_phase/hot_phase.container.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/hot_phase/hot_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/hot_phase/hot_phase.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/hot_phase/hot_phase.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/hot_phase/hot_phase.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/hot_phase/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/hot_phase/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/hot_phase/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/hot_phase/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/min_age_input.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/min_age_input.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_allocation/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_allocation/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_allocation/node_allocation.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.container.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_allocation/node_allocation.container.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.container.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_allocation/node_allocation.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_allocation/node_allocation.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_attrs_details/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_attrs_details/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_attrs_details/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_attrs_details/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.container.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.container.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.container.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_attrs_details/node_attrs_details.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/policy_json_flyout.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/policy_json_flyout.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/set_priority_input.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/set_priority_input.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/warm_phase/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/warm_phase/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/warm_phase/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/warm_phase/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/warm_phase/warm_phase.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/warm_phase/warm_phase.container.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/warm_phase/warm_phase.container.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/warm_phase/warm_phase.container.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/warm_phase/warm_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/warm_phase/warm_phase.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/components/warm_phase/warm_phase.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/warm_phase/warm_phase.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/edit_policy.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/edit_policy.container.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/edit_policy.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/edit_policy.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/form_errors.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form_errors.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/form_errors.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form_errors.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/index.d.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.d.ts
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/edit_policy/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/no_match/components/no_match/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/no_match/components/no_match/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/no_match/components/no_match/no_match.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/no_match.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/no_match/components/no_match/no_match.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/no_match.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/no_match/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/no_match/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/add_policy_to_template_confirm_modal.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/add_policy_to_template_confirm_modal.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/add_policy_to_template_confirm_modal.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/add_policy_to_template_confirm_modal.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/confirm_delete.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/confirm_delete.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/confirm_delete.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/confirm_delete.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/policy_table.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.container.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/policy_table.container.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.container.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/policy_table.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js
similarity index 98%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/policy_table.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js
index 903161fe094fc..d406d86bc6ce7 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/components/policy_table/policy_table.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js
@@ -37,8 +37,8 @@ import {
 
 import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services';
 
-import { getIndexListUri } from '../../../../../../../../../../plugins/index_management/public';
-import { BASE_PATH } from '../../../../../../../common/constants';
+import { getIndexListUri } from '../../../../../../../index_management/public';
+import { BASE_PATH } from '../../../../../../common/constants';
 import { UIM_EDIT_CLICK } from '../../../../constants';
 import { getPolicyPath } from '../../../../services/navigation';
 import { flattenPanelTree } from '../../../../services/flatten_panel_tree';
@@ -52,6 +52,7 @@ const COLUMNS = {
     label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.nameHeader', {
       defaultMessage: 'Name',
     }),
+    width: 200,
   },
   linkedIndices: {
     label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.linkedIndicesHeader', {
@@ -179,7 +180,6 @@ export class PolicyTable extends Component {
       return (
         /* eslint-disable-next-line @elastic/eui/href-or-on-click */
         <EuiLink
-          className="policyTable__link"
           data-test-subj="policyTablePolicyNameLink"
           href={getPolicyPath(value)}
           onClick={() => trackUiMetric('click', UIM_EDIT_CLICK)}
@@ -415,7 +415,7 @@ export class PolicyTable extends Component {
         tableContent = <EuiLoadingSpinner size="m" />;
       } else if (totalNumberOfPolicies > 0) {
         tableContent = (
-          <EuiTable className="policyTable__horizontalScroll">
+          <EuiTable>
             <EuiScreenReaderOnly>
               <caption role="status" aria-relevant="text" aria-live="polite">
                 <FormattedMessage
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/index.d.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.d.ts
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/sections/policy_table/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.js
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/api.js b/x-pack/plugins/index_lifecycle_management/public/application/services/api.js
new file mode 100644
index 0000000000000..1cb2089ab66db
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/api.js
@@ -0,0 +1,72 @@
+/*
+ * 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 {
+  UIM_POLICY_DELETE,
+  UIM_POLICY_ATTACH_INDEX,
+  UIM_POLICY_ATTACH_INDEX_TEMPLATE,
+  UIM_POLICY_DETACH_INDEX,
+  UIM_INDEX_RETRY_STEP,
+} from '../constants';
+
+import { trackUiMetric } from './ui_metric';
+import { sendGet, sendPost, sendDelete } from './http';
+
+export async function loadNodes() {
+  return await sendGet(`nodes/list`);
+}
+
+export async function loadNodeDetails(selectedNodeAttrs) {
+  return await sendGet(`nodes/${selectedNodeAttrs}/details`);
+}
+
+export async function loadIndexTemplates() {
+  return await sendGet(`templates`);
+}
+
+export async function loadPolicies(withIndices) {
+  const query = withIndices ? '?withIndices=true' : '';
+  return await sendGet('policies', query);
+}
+
+export async function savePolicy(policy) {
+  return await sendPost(`policies`, policy);
+}
+
+export async function deletePolicy(policyName) {
+  const response = await sendDelete(`policies/${encodeURIComponent(policyName)}`);
+  // Only track successful actions.
+  trackUiMetric('count', UIM_POLICY_DELETE);
+  return response;
+}
+
+export const retryLifecycleForIndex = async indexNames => {
+  const response = await sendPost(`index/retry`, { indexNames });
+  // Only track successful actions.
+  trackUiMetric('count', UIM_INDEX_RETRY_STEP);
+  return response;
+};
+
+export const removeLifecycleForIndex = async indexNames => {
+  const response = await sendPost(`index/remove`, { indexNames });
+  // Only track successful actions.
+  trackUiMetric('count', UIM_POLICY_DETACH_INDEX);
+  return response;
+};
+
+export const addLifecyclePolicyToIndex = async body => {
+  const response = await sendPost(`index/add`, body);
+  // Only track successful actions.
+  trackUiMetric('count', UIM_POLICY_ATTACH_INDEX);
+  return response;
+};
+
+export const addLifecyclePolicyToTemplate = async body => {
+  const response = await sendPost(`template`, body);
+  // Only track successful actions.
+  trackUiMetric('count', UIM_POLICY_ATTACH_INDEX_TEMPLATE);
+  return response;
+};
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/api_errors.js b/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/api_errors.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/documentation.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/documentation.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/documentation.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/services/documentation.ts
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/filter_items.js b/x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/filter_items.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/find_errors.js b/x-pack/plugins/index_lifecycle_management/public/application/services/find_errors.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/find_errors.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/find_errors.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/flatten_panel_tree.js b/x-pack/plugins/index_lifecycle_management/public/application/services/flatten_panel_tree.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/flatten_panel_tree.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/flatten_panel_tree.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/http.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
similarity index 50%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/http.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
index bbda1ebd2e0e5..47e96ea28bb8c 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/http.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
@@ -20,16 +20,14 @@ function getFullPath(path: string): string {
   return apiPrefix;
 }
 
-// The extend_index_management module requires that we support an injected httpClient here.
-
-export function sendPost(path: string, payload: any, httpClient = _httpClient): any {
-  return httpClient.post(getFullPath(path), { body: JSON.stringify(payload) });
+export function sendPost(path: string, payload: any): any {
+  return _httpClient.post(getFullPath(path), { body: JSON.stringify(payload) });
 }
 
-export function sendGet(path: string, query: any, httpClient = _httpClient): any {
-  return httpClient.get(getFullPath(path), { query });
+export function sendGet(path: string, query: any): any {
+  return _httpClient.get(getFullPath(path), { query });
 }
 
-export function sendDelete(path: string, httpClient = _httpClient): any {
-  return httpClient.delete(getFullPath(path));
+export function sendDelete(path: string): any {
+  return _httpClient.delete(getFullPath(path));
 }
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/index.js b/x-pack/plugins/index_lifecycle_management/public/application/services/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/navigation.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
similarity index 59%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/navigation.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
index 943f9a49d0ab6..2d518ebb3015e 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/navigation.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
@@ -4,18 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { BASE_PATH } from '../../../../common/constants';
-
-// This depends upon Angular, which is why we use this provider pattern to access it within
-// our React app.
-let _redirect: any;
-
-export function init(redirect: any) {
-  _redirect = redirect;
-}
+import { BASE_PATH } from '../../../common/constants';
 
 export const goToPolicyList = () => {
-  _redirect(`${BASE_PATH}policies`);
+  window.location.hash = `${BASE_PATH}policies`;
 };
 
 export const getPolicyPath = (policyName: string): string => {
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/notification.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/notification.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/sort_table.js b/x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/sort_table.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/ui_metric.test.js b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/ui_metric.test.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/ui_metric.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
similarity index 85%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/ui_metric.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
index d9f2c26048317..ca6c0b44d5804 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/services/ui_metric.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
@@ -6,7 +6,8 @@
 
 import { get } from 'lodash';
 
-import { createUiStatsReporter } from '../../../../../../../../src/legacy/core_plugins/ui_metric/public';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UiStatsMetricType } from '@kbn/analytics';
 
 import {
   UIM_APP_NAME,
@@ -22,12 +23,10 @@ import {
 
 import { defaultColdPhase, defaultWarmPhase, defaultHotPhase } from '../store/defaults';
 
-export let trackUiMetric: ReturnType<typeof createUiStatsReporter>;
+export let trackUiMetric: (metricType: UiStatsMetricType, eventName: string) => void;
 
-export function init(getReporter: typeof createUiStatsReporter): void {
-  if (getReporter) {
-    trackUiMetric = getReporter(UIM_APP_NAME);
-  }
+export function init(usageCollection: UsageCollectionSetup): void {
+  trackUiMetric = usageCollection.reportUiStats.bind(usageCollection, UIM_APP_NAME);
 }
 
 export function getUiMetricsForPhases(phases: any): any {
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/general.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/general.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/general.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/actions/general.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/actions/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/lifecycle.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/lifecycle.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/lifecycle.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/actions/lifecycle.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/nodes.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/policies.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/policies.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/actions/policies.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/actions/policies.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/cold_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/cold_phase.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/cold_phase.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/defaults/cold_phase.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/delete_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/delete_phase.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/delete_phase.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/defaults/delete_phase.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/hot_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/hot_phase.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/hot_phase.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/defaults/hot_phase.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/index.d.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.d.ts
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/warm_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/warm_phase.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/defaults/warm_phase.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/defaults/warm_phase.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/application/store/index.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/index.d.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/store/index.d.ts
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/reducers/general.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/general.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/reducers/general.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/reducers/general.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/reducers/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/reducers/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/reducers/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/reducers/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/reducers/nodes.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/reducers/policies.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/policies.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/reducers/policies.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/reducers/policies.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/general.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/general.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/general.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/selectors/general.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/index.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/selectors/index.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/lifecycle.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/lifecycle.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/lifecycle.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/selectors/lifecycle.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/nodes.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/policies.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/policies.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/selectors/policies.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/selectors/policies.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/store.js b/x-pack/plugins/index_lifecycle_management/public/application/store/store.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/application/store/store.js
rename to x-pack/plugins/index_lifecycle_management/public/application/store/store.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/components/add_lifecycle_confirm_modal.js b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.js
similarity index 97%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/components/add_lifecycle_confirm_modal.js
rename to x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.js
index 5b8f2d197daf4..143895150172d 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/components/add_lifecycle_confirm_modal.js
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.js
@@ -23,7 +23,7 @@ import {
   EuiModalHeaderTitle,
 } from '@elastic/eui';
 
-import { BASE_PATH } from '../../../../common/constants';
+import { BASE_PATH } from '../../../common/constants';
 import { loadPolicies, addLifecyclePolicyToIndex } from '../../application/services/api';
 import { showApiError } from '../../application/services/api_errors';
 import { toasts } from '../../application/services/notification';
@@ -38,7 +38,7 @@ export class AddLifecyclePolicyConfirmModal extends Component {
     };
   }
   addPolicy = async () => {
-    const { indexName, httpClient, closeModal, reloadIndices } = this.props;
+    const { indexName, closeModal, reloadIndices } = this.props;
     const { selectedPolicyName, selectedAlias } = this.state;
     if (!selectedPolicyName) {
       this.setState({
@@ -55,7 +55,7 @@ export class AddLifecyclePolicyConfirmModal extends Component {
         policyName: selectedPolicyName,
         alias: selectedAlias,
       };
-      await addLifecyclePolicyToIndex(body, httpClient);
+      await addLifecyclePolicyToIndex(body);
       closeModal();
       toasts.addSuccess(
         i18n.translate(
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/components/index_lifecycle_summary.js b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.js
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/components/index_lifecycle_summary.js
rename to x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.js
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/components/remove_lifecycle_confirm_modal.js b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/remove_lifecycle_confirm_modal.js
similarity index 96%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/components/remove_lifecycle_confirm_modal.js
rename to x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/remove_lifecycle_confirm_modal.js
index 0ba5ed1720084..4e0d2383c7d79 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/components/remove_lifecycle_confirm_modal.js
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/remove_lifecycle_confirm_modal.js
@@ -24,10 +24,10 @@ export class RemoveLifecyclePolicyConfirmModal extends Component {
   }
 
   removePolicy = async () => {
-    const { indexNames, httpClient, closeModal, reloadIndices } = this.props;
+    const { indexNames, closeModal, reloadIndices } = this.props;
 
     try {
-      await removeLifecycleForIndex(indexNames, httpClient);
+      await removeLifecycleForIndex(indexNames);
       closeModal();
       toasts.addSuccess(
         i18n.translate(
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/index.d.ts
rename to x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.d.ts
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/index.js b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.js
similarity index 80%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/index.js
rename to x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.js
index 69658d31695bc..40ff04408002f 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/extend_index_management/index.js
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.js
@@ -9,8 +9,6 @@ import { get, every, any } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiSearchBar } from '@elastic/eui';
 
-import { init as initUiMetric } from '../application/services/ui_metric';
-import { init as initNotification } from '../application/services/notification';
 import { retryLifecycleForIndex } from '../application/services/api';
 import { IndexLifecycleSummary } from './components/index_lifecycle_summary';
 import { AddLifecyclePolicyConfirmModal } from './components/add_lifecycle_confirm_modal';
@@ -18,21 +16,7 @@ import { RemoveLifecyclePolicyConfirmModal } from './components/remove_lifecycle
 
 const stepPath = 'ilm.step';
 
-export const retryLifecycleActionExtension = ({
-  indices,
-  usageCollection,
-  toasts,
-  fatalErrors,
-}) => {
-  // These are hacks that we can remove once the New Platform migration is done. They're needed here
-  // because API requests and API errors require them.
-  const getLegacyReporter = appName => (type, name) => {
-    usageCollection.reportUiStats(appName, type, name);
-  };
-
-  initUiMetric(getLegacyReporter);
-  initNotification(toasts, fatalErrors);
-
+export const retryLifecycleActionExtension = ({ indices }) => {
   const allHaveErrors = every(indices, index => {
     return index.ilm && index.ilm.failed_step;
   });
@@ -57,19 +41,7 @@ export const retryLifecycleActionExtension = ({
   };
 };
 
-export const removeLifecyclePolicyActionExtension = ({
-  indices,
-  reloadIndices,
-  createUiStatsReporter,
-  toasts,
-  fatalErrors,
-  httpClient,
-}) => {
-  // These are hacks that we can remove once the New Platform migration is done. They're needed here
-  // because API requests and API errors require them.
-  initUiMetric(createUiStatsReporter);
-  initNotification(toasts, fatalErrors);
-
+export const removeLifecyclePolicyActionExtension = ({ indices, reloadIndices }) => {
   const allHaveIlm = every(indices, index => {
     return index.ilm && index.ilm.managed;
   });
@@ -83,8 +55,6 @@ export const removeLifecyclePolicyActionExtension = ({
         <RemoveLifecyclePolicyConfirmModal
           indexNames={indexNames}
           closeModal={closeModal}
-          httpClient={httpClient}
-          toasts={toasts}
           reloadIndices={reloadIndices}
         />
       );
@@ -97,19 +67,7 @@ export const removeLifecyclePolicyActionExtension = ({
   };
 };
 
-export const addLifecyclePolicyActionExtension = ({
-  indices,
-  reloadIndices,
-  createUiStatsReporter,
-  toasts,
-  fatalErrors,
-  httpClient,
-}) => {
-  // These are hacks that we can remove once the New Platform migration is done. They're needed here
-  // because API requests and API errors require them.
-  initUiMetric(createUiStatsReporter);
-  initNotification(toasts, fatalErrors);
-
+export const addLifecyclePolicyActionExtension = ({ indices, reloadIndices }) => {
   if (indices.length !== 1) {
     return null;
   }
@@ -126,8 +84,6 @@ export const addLifecyclePolicyActionExtension = ({
         <AddLifecyclePolicyConfirmModal
           indexName={indexName}
           closeModal={closeModal}
-          httpClient={httpClient}
-          toasts={toasts}
           index={index}
           reloadIndices={reloadIndices}
         />
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/index.ts b/x-pack/plugins/index_lifecycle_management/public/index.ts
similarity index 58%
rename from x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/index.ts
rename to x-pack/plugins/index_lifecycle_management/public/index.ts
index 1af0b697a9283..586763188a54b 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/np_ready/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/index.ts
@@ -4,7 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from 'kibana/public';
+
 import { IndexLifecycleManagementPlugin } from './plugin';
 
-export const createPlugin = (ctx: PluginInitializerContext) => new IndexLifecycleManagementPlugin();
+/** @public */
+export const plugin = (initializerContext: PluginInitializerContext) => {
+  return new IndexLifecycleManagementPlugin(initializerContext);
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
new file mode 100644
index 0000000000000..ca93646e20fcf
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
@@ -0,0 +1,69 @@
+/*
+ * 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 { CoreSetup, PluginInitializerContext } from 'src/core/public';
+
+import { PLUGIN } from '../common/constants';
+import { init as initHttp } from './application/services/http';
+import { init as initDocumentation } from './application/services/documentation';
+import { init as initUiMetric } from './application/services/ui_metric';
+import { init as initNotification } from './application/services/notification';
+import { addAllExtensions } from './extend_index_management';
+import { PluginsDependencies, ClientConfigType } from './types';
+
+export class IndexLifecycleManagementPlugin {
+  constructor(private readonly initializerContext: PluginInitializerContext) {}
+
+  public setup(coreSetup: CoreSetup, plugins: PluginsDependencies) {
+    const {
+      ui: { enabled: isIndexLifecycleManagementUiEnabled },
+    } = this.initializerContext.config.get<ClientConfigType>();
+
+    if (isIndexLifecycleManagementUiEnabled) {
+      const {
+        http,
+        notifications: { toasts },
+        fatalErrors,
+        getStartServices,
+      } = coreSetup;
+
+      const { usageCollection, management, indexManagement } = plugins;
+
+      // Initialize services even if the app isn't mounted, because they're used by index management extensions.
+      initHttp(http);
+      initUiMetric(usageCollection);
+      initNotification(toasts, fatalErrors);
+
+      management.sections.getSection('elasticsearch')!.registerApp({
+        id: PLUGIN.ID,
+        title: PLUGIN.TITLE,
+        order: 2,
+        mount: async ({ element }) => {
+          const [coreStart] = await getStartServices();
+          const {
+            i18n: { Context: I18nContext },
+            docLinks: { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION },
+          } = coreStart;
+
+          // Initialize additional services.
+          initDocumentation(
+            `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/`
+          );
+
+          const { renderApp } = await import('./application');
+          return renderApp(element, I18nContext);
+        },
+      });
+
+      if (indexManagement) {
+        addAllExtensions(indexManagement.extensionsService);
+      }
+    }
+  }
+
+  public start() {}
+  public stop() {}
+}
diff --git a/x-pack/plugins/index_lifecycle_management/public/types.ts b/x-pack/plugins/index_lifecycle_management/public/types.ts
new file mode 100644
index 0000000000000..f9e0abae56cb4
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/types.ts
@@ -0,0 +1,21 @@
+/*
+ * 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 { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
+import { ManagementSetup } from '../../../../src/plugins/management/public';
+import { IndexManagementPluginSetup } from '../../index_management/public';
+
+export interface PluginsDependencies {
+  usageCollection: UsageCollectionSetup;
+  management: ManagementSetup;
+  indexManagement?: IndexManagementPluginSetup;
+}
+
+export interface ClientConfigType {
+  ui: {
+    enabled: boolean;
+  };
+}
diff --git a/x-pack/plugins/index_lifecycle_management/server/config.ts b/x-pack/plugins/index_lifecycle_management/server/config.ts
new file mode 100644
index 0000000000000..9728e31a8a148
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/config.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
+  ui: schema.object({
+    enabled: schema.boolean({ defaultValue: true }),
+  }),
+  // Cloud requires the ability to hide internal node attributes from users.
+  filteredNodeAttributes: schema.arrayOf(schema.string(), { defaultValue: [] }),
+});
+
+export type IndexLifecycleManagementConfig = TypeOf<typeof configSchema>;
diff --git a/x-pack/plugins/index_lifecycle_management/server/index.ts b/x-pack/plugins/index_lifecycle_management/server/index.ts
new file mode 100644
index 0000000000000..8a5f0fe19f9b0
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/index.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 { PluginInitializerContext, PluginConfigDescriptor } from 'kibana/server';
+import { IndexLifecycleManagementServerPlugin } from './plugin';
+import { configSchema, IndexLifecycleManagementConfig } from './config';
+
+export const plugin = (ctx: PluginInitializerContext) =>
+  new IndexLifecycleManagementServerPlugin(ctx);
+
+export const config: PluginConfigDescriptor<IndexLifecycleManagementConfig> = {
+  schema: configSchema,
+  exposeToBrowser: {
+    ui: true,
+  },
+};
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/is_es_error/is_es_error.ts b/x-pack/plugins/index_lifecycle_management/server/lib/is_es_error.ts
similarity index 100%
rename from x-pack/legacy/plugins/index_lifecycle_management/server/lib/is_es_error/is_es_error.ts
rename to x-pack/plugins/index_lifecycle_management/server/lib/is_es_error.ts
diff --git a/x-pack/plugins/index_lifecycle_management/server/plugin.ts b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
new file mode 100644
index 0000000000000..48c50f9a48ee5
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
@@ -0,0 +1,86 @@
+/*
+ * 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 { Observable } from 'rxjs';
+import { first } from 'rxjs/operators';
+import { i18n } from '@kbn/i18n';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext, APICaller } from 'src/core/server';
+
+import { PLUGIN } from '../common/constants';
+import { Dependencies } from './types';
+import { registerApiRoutes } from './routes';
+import { License } from './services';
+import { IndexLifecycleManagementConfig } from './config';
+import { isEsError } from './lib/is_es_error';
+
+const indexLifecycleDataEnricher = async (indicesList: any, callAsCurrentUser: APICaller) => {
+  if (!indicesList || !indicesList.length) {
+    return;
+  }
+
+  const params = {
+    path: '/*/_ilm/explain',
+    method: 'GET',
+  };
+
+  const { indices: ilmIndicesData } = await callAsCurrentUser('transport.request', params);
+
+  return indicesList.map((index: any): any => {
+    return {
+      ...index,
+      ilm: { ...(ilmIndicesData[index.name] || {}) },
+    };
+  });
+};
+
+export class IndexLifecycleManagementServerPlugin implements Plugin<void, void, any, any> {
+  private readonly config$: Observable<IndexLifecycleManagementConfig>;
+  private readonly license: License;
+  private readonly logger: Logger;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.logger = initializerContext.logger.get();
+    this.config$ = initializerContext.config.create();
+    this.license = new License();
+  }
+
+  async setup({ http }: CoreSetup, { licensing, indexManagement }: Dependencies): Promise<void> {
+    const router = http.createRouter();
+    const config = await this.config$.pipe(first()).toPromise();
+
+    this.license.setup(
+      {
+        pluginId: PLUGIN.ID,
+        minimumLicenseType: PLUGIN.minimumLicenseType,
+        defaultErrorMessage: i18n.translate('xpack.indexLifecycleMgmt.licenseCheckErrorMessage', {
+          defaultMessage: 'License check failed',
+        }),
+      },
+      {
+        licensing,
+        logger: this.logger,
+      }
+    );
+
+    registerApiRoutes({
+      router,
+      config,
+      license: this.license,
+      lib: {
+        isEsError,
+      },
+    });
+
+    if (config.ui.enabled) {
+      if (indexManagement.indexDataEnricher) {
+        indexManagement.indexDataEnricher.add(indexLifecycleDataEnricher);
+      }
+    }
+  }
+
+  start() {}
+  stop() {}
+}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_index_routes.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/index.ts
similarity index 65%
rename from x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_index_routes.ts
rename to x-pack/plugins/index_lifecycle_management/server/routes/api/index/index.ts
index 74eb1a86a93ba..abe00af74b63a 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/index/register_index_routes.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/index.ts
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { RouteDependencies } from '../../../types';
 import { registerRetryRoute } from './register_retry_route';
 import { registerRemoveRoute } from './register_remove_route';
 import { registerAddPolicyRoute } from './register_add_policy_route';
 
-export function registerIndexRoutes(server: any) {
-  registerRetryRoute(server);
-  registerRemoveRoute(server);
-  registerAddPolicyRoute(server);
+export function registerIndexRoutes(dependencies: RouteDependencies) {
+  registerRetryRoute(dependencies);
+  registerRemoveRoute(dependencies);
+  registerAddPolicyRoute(dependencies);
 }
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
new file mode 100644
index 0000000000000..9627f6399eaaf
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
@@ -0,0 +1,66 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+async function addLifecyclePolicy(
+  callAsCurrentUser: APICaller,
+  indexName: string,
+  policyName: string,
+  alias: string
+) {
+  const params = {
+    method: 'PUT',
+    path: `/${encodeURIComponent(indexName)}/_settings`,
+    body: {
+      lifecycle: {
+        name: policyName,
+        rollover_alias: alias,
+      },
+    },
+  };
+
+  return callAsCurrentUser('transport.request', params);
+}
+
+const bodySchema = schema.object({
+  indexName: schema.string(),
+  policyName: schema.string(),
+  alias: schema.maybe(schema.string()),
+});
+
+export function registerAddPolicyRoute({ router, license, lib }: RouteDependencies) {
+  router.post(
+    { path: addBasePath('/index/add'), validate: { body: bodySchema } },
+    license.guardApiRoute(async (context, request, response) => {
+      const body = request.body as typeof bodySchema.type;
+      const { indexName, policyName, alias = '' } = body;
+
+      try {
+        await addLifecyclePolicy(
+          context.core.elasticsearch.dataClient.callAsCurrentUser,
+          indexName,
+          policyName,
+          alias
+        );
+        return response.ok();
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
new file mode 100644
index 0000000000000..8ec94a8591785
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
@@ -0,0 +1,54 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+async function removeLifecycle(callAsCurrentUser: APICaller, indexNames: string[]) {
+  const responses = [];
+  for (let i = 0; i < indexNames.length; i++) {
+    const indexName = indexNames[i];
+    const params = {
+      method: 'POST',
+      path: `/${encodeURIComponent(indexName)}/_ilm/remove`,
+      ignore: [404],
+    };
+
+    responses.push(callAsCurrentUser('transport.request', params));
+  }
+  return Promise.all(responses);
+}
+
+const bodySchema = schema.object({
+  indexNames: schema.arrayOf(schema.string()),
+});
+
+export function registerRemoveRoute({ router, license, lib }: RouteDependencies) {
+  router.post(
+    { path: addBasePath('/index/remove'), validate: { body: bodySchema } },
+    license.guardApiRoute(async (context, request, response) => {
+      const body = request.body as typeof bodySchema.type;
+      const { indexNames } = body;
+
+      try {
+        await removeLifecycle(context.core.elasticsearch.dataClient.callAsCurrentUser, indexNames);
+        return response.ok();
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
new file mode 100644
index 0000000000000..1e2d621cab173
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
@@ -0,0 +1,54 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+async function retryLifecycle(callAsCurrentUser: APICaller, indexNames: string[]) {
+  const responses = [];
+  for (let i = 0; i < indexNames.length; i++) {
+    const indexName = indexNames[i];
+    const params = {
+      method: 'POST',
+      path: `/${encodeURIComponent(indexName)}/_ilm/retry`,
+      ignore: [404],
+    };
+
+    responses.push(callAsCurrentUser('transport.request', params));
+  }
+  return Promise.all(responses);
+}
+
+const bodySchema = schema.object({
+  indexNames: schema.arrayOf(schema.string()),
+});
+
+export function registerRetryRoute({ router, license, lib }: RouteDependencies) {
+  router.post(
+    { path: addBasePath('/index/retry'), validate: { body: bodySchema } },
+    license.guardApiRoute(async (context, request, response) => {
+      const body = request.body as typeof bodySchema.type;
+      const { indexNames } = body;
+
+      try {
+        await retryLifecycle(context.core.elasticsearch.dataClient.callAsCurrentUser, indexNames);
+        return response.ok();
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_nodes_routes.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/index.ts
similarity index 65%
rename from x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_nodes_routes.ts
rename to x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/index.ts
index 4486d97038657..bde56f0318bbd 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/nodes/register_nodes_routes.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/index.ts
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { RouteDependencies } from '../../../types';
 import { registerListRoute } from './register_list_route';
 import { registerDetailsRoute } from './register_details_route';
 
-export function registerNodesRoutes(server: any) {
-  registerListRoute(server);
-  registerDetailsRoute(server);
+export function registerNodesRoutes(dependencies: RouteDependencies) {
+  registerListRoute(dependencies);
+  registerDetailsRoute(dependencies);
 }
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
new file mode 100644
index 0000000000000..6ff1f147e7ea7
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
@@ -0,0 +1,64 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+function findMatchingNodes(stats: any, nodeAttrs: string): any {
+  return Object.entries(stats.nodes).reduce((accum: any[], [nodeId, nodeStats]: [any, any]) => {
+    const attributes = nodeStats.attributes || {};
+    for (const [key, value] of Object.entries(attributes)) {
+      if (`${key}:${value}` === nodeAttrs) {
+        accum.push({
+          nodeId,
+          stats: nodeStats,
+        });
+        break;
+      }
+    }
+    return accum;
+  }, []);
+}
+
+async function fetchNodeStats(callAsCurrentUser: APICaller): Promise<any> {
+  const params = {
+    format: 'json',
+  };
+
+  return await callAsCurrentUser('nodes.stats', params);
+}
+
+const paramsSchema = schema.object({
+  nodeAttrs: schema.string(),
+});
+
+export function registerDetailsRoute({ router, license, lib }: RouteDependencies) {
+  router.get(
+    { path: addBasePath('/nodes/{nodeAttrs}/details'), validate: { params: paramsSchema } },
+    license.guardApiRoute(async (context, request, response) => {
+      const params = request.params as typeof paramsSchema.type;
+      const { nodeAttrs } = params;
+
+      try {
+        const stats = await fetchNodeStats(context.core.elasticsearch.dataClient.callAsCurrentUser);
+        const okResponse = { body: findMatchingNodes(stats, nodeAttrs) };
+        return response.ok(okResponse);
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
new file mode 100644
index 0000000000000..73d85c78d3b11
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
@@ -0,0 +1,69 @@
+/*
+ * 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 { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+function convertStatsIntoList(stats: any, disallowedNodeAttributes: string[]): any {
+  return Object.entries(stats.nodes).reduce((accum: any, [nodeId, nodeStats]: [any, any]) => {
+    const attributes = nodeStats.attributes || {};
+    for (const [key, value] of Object.entries(attributes)) {
+      const isNodeAttributeAllowed = !disallowedNodeAttributes.includes(key);
+      if (isNodeAttributeAllowed) {
+        const attributeString = `${key}:${value}`;
+        accum[attributeString] = accum[attributeString] || [];
+        accum[attributeString].push(nodeId);
+      }
+    }
+    return accum;
+  }, {});
+}
+
+async function fetchNodeStats(callAsCurrentUser: APICaller): Promise<any> {
+  const params = {
+    format: 'json',
+  };
+
+  return await callAsCurrentUser('nodes.stats', params);
+}
+
+export function registerListRoute({ router, config, license, lib }: RouteDependencies) {
+  const { filteredNodeAttributes } = config;
+
+  const NODE_ATTRS_KEYS_TO_IGNORE: string[] = [
+    'ml.enabled',
+    'ml.machine_memory',
+    'ml.max_open_jobs',
+    // Used by ML to identify nodes that have transform enabled:
+    // https://github.com/elastic/elasticsearch/pull/52712/files#diff-225cc2c1291b4c60a8c3412a619094e1R147
+    'transform.node',
+    'xpack.installed',
+  ];
+
+  const disallowedNodeAttributes = [...NODE_ATTRS_KEYS_TO_IGNORE, ...filteredNodeAttributes];
+
+  router.get(
+    { path: addBasePath('/nodes/list'), validate: false },
+    license.guardApiRoute(async (context, request, response) => {
+      try {
+        const stats = await fetchNodeStats(context.core.elasticsearch.dataClient.callAsCurrentUser);
+        const okResponse = { body: convertStatsIntoList(stats, disallowedNodeAttributes) };
+        return response.ok(okResponse);
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_policies_routes.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/index.ts
similarity index 64%
rename from x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_policies_routes.ts
rename to x-pack/plugins/index_lifecycle_management/server/routes/api/policies/index.ts
index 279b016da178f..c30dc04c61169 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/policies/register_policies_routes.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/index.ts
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { RouteDependencies } from '../../../types';
 import { registerFetchRoute } from './register_fetch_route';
 import { registerCreateRoute } from './register_create_route';
 import { registerDeleteRoute } from './register_delete_route';
 
-export function registerPoliciesRoutes(server: any) {
-  registerFetchRoute(server);
-  registerCreateRoute(server);
-  registerDeleteRoute(server);
+export function registerPoliciesRoutes(dependencies: RouteDependencies) {
+  registerFetchRoute(dependencies);
+  registerCreateRoute(dependencies);
+  registerDeleteRoute(dependencies);
 }
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
new file mode 100644
index 0000000000000..a9c6bab58fdd9
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
@@ -0,0 +1,145 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+async function createPolicy(callAsCurrentUser: APICaller, name: string, phases: any): Promise<any> {
+  const body = {
+    policy: {
+      phases,
+    },
+  };
+  const params = {
+    method: 'PUT',
+    path: `/_ilm/policy/${encodeURIComponent(name)}`,
+    ignore: [404],
+    body,
+  };
+
+  return await callAsCurrentUser('transport.request', params);
+}
+
+const minAgeSchema = schema.maybe(schema.string());
+
+const setPrioritySchema = schema.maybe(
+  schema.object({
+    priority: schema.number(),
+  })
+);
+
+const unfollowSchema = schema.maybe(schema.object({})); // Unfollow has no options
+
+const allocateNodeSchema = schema.maybe(schema.recordOf(schema.string(), schema.string()));
+const allocateSchema = schema.maybe(
+  schema.object({
+    number_of_replicas: schema.maybe(schema.number()),
+    include: allocateNodeSchema,
+    exclude: allocateNodeSchema,
+    require: allocateNodeSchema,
+  })
+);
+
+const hotPhaseSchema = schema.object({
+  min_age: minAgeSchema,
+  actions: schema.object({
+    set_priority: setPrioritySchema,
+    unfollow: unfollowSchema,
+    rollover: schema.maybe(
+      schema.object({
+        max_age: schema.maybe(schema.string()),
+        max_size: schema.maybe(schema.string()),
+        max_docs: schema.maybe(schema.number()),
+      })
+    ),
+  }),
+});
+
+const warmPhaseSchema = schema.maybe(
+  schema.object({
+    min_age: minAgeSchema,
+    actions: schema.object({
+      set_priority: setPrioritySchema,
+      unfollow: unfollowSchema,
+      read_only: schema.maybe(schema.object({})), // Readonly has no options
+      allocate: allocateSchema,
+      shrink: schema.maybe(
+        schema.object({
+          number_of_shards: schema.number(),
+        })
+      ),
+      forcemerge: schema.maybe(
+        schema.object({
+          max_num_segments: schema.number(),
+        })
+      ),
+    }),
+  })
+);
+
+const coldPhaseSchema = schema.maybe(
+  schema.object({
+    min_age: minAgeSchema,
+    actions: schema.object({
+      set_priority: setPrioritySchema,
+      unfollow: unfollowSchema,
+      allocate: allocateSchema,
+      freeze: schema.maybe(schema.object({})), // Freeze has no options
+    }),
+  })
+);
+
+const deletePhaseSchema = schema.maybe(
+  schema.object({
+    min_age: minAgeSchema,
+    actions: schema.object({
+      wait_for_snapshot: schema.maybe(
+        schema.object({
+          policy: schema.string(),
+        })
+      ),
+      delete: schema.maybe(schema.object({})), // Delete has no options
+    }),
+  })
+);
+
+// Per https://www.elastic.co/guide/en/elasticsearch/reference/current/_actions.html
+const bodySchema = schema.object({
+  name: schema.string(),
+  phases: schema.object({
+    hot: hotPhaseSchema,
+    warm: warmPhaseSchema,
+    cold: coldPhaseSchema,
+    delete: deletePhaseSchema,
+  }),
+});
+
+export function registerCreateRoute({ router, license, lib }: RouteDependencies) {
+  router.post(
+    { path: addBasePath('/policies'), validate: { body: bodySchema } },
+    license.guardApiRoute(async (context, request, response) => {
+      const body = request.body as typeof bodySchema.type;
+      const { name, phases } = body;
+
+      try {
+        await createPolicy(context.core.elasticsearch.dataClient.callAsCurrentUser, name, phases);
+        return response.ok();
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
new file mode 100644
index 0000000000000..e08297f4d7bc4
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
@@ -0,0 +1,50 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+async function deletePolicies(callAsCurrentUser: APICaller, policyNames: string): Promise<any> {
+  const params = {
+    method: 'DELETE',
+    path: `/_ilm/policy/${encodeURIComponent(policyNames)}`,
+    // we allow 404 since they may have no policies
+    ignore: [404],
+  };
+
+  return await callAsCurrentUser('transport.request', params);
+}
+
+const paramsSchema = schema.object({
+  policyNames: schema.string(),
+});
+
+export function registerDeleteRoute({ router, license, lib }: RouteDependencies) {
+  router.delete(
+    { path: addBasePath('/policies/{policyNames}'), validate: { params: paramsSchema } },
+    license.guardApiRoute(async (context, request, response) => {
+      const params = request.params as typeof paramsSchema.type;
+      const { policyNames } = params;
+
+      try {
+        await deletePolicies(context.core.elasticsearch.dataClient.callAsCurrentUser, policyNames);
+        return response.ok();
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
new file mode 100644
index 0000000000000..294b7c4c65cba
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
@@ -0,0 +1,90 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+function formatPolicies(policiesMap: any): any {
+  if (policiesMap.status === 404) {
+    return [];
+  }
+
+  return Object.keys(policiesMap).reduce((accum: any[], lifecycleName: string) => {
+    const policyEntry = policiesMap[lifecycleName];
+    accum.push({
+      ...policyEntry,
+      name: lifecycleName,
+    });
+    return accum;
+  }, []);
+}
+
+async function fetchPolicies(callAsCurrentUser: APICaller): Promise<any> {
+  const params = {
+    method: 'GET',
+    path: '/_ilm/policy',
+    // we allow 404 since they may have no policies
+    ignore: [404],
+  };
+
+  return await callAsCurrentUser('transport.request', params);
+}
+
+async function addLinkedIndices(callAsCurrentUser: APICaller, policiesMap: any) {
+  if (policiesMap.status === 404) {
+    return policiesMap;
+  }
+  const params = {
+    method: 'GET',
+    path: '/*/_ilm/explain',
+    // we allow 404 since they may have no policies
+    ignore: [404],
+  };
+
+  const policyExplanation: any = await callAsCurrentUser('transport.request', params);
+  Object.entries(policyExplanation.indices).forEach(([indexName, { policy }]: [string, any]) => {
+    if (policy && policiesMap[policy]) {
+      policiesMap[policy].linkedIndices = policiesMap[policy].linkedIndices || [];
+      policiesMap[policy].linkedIndices.push(indexName);
+    }
+  });
+}
+
+const querySchema = schema.object({
+  withIndices: schema.boolean({ defaultValue: false }),
+});
+
+export function registerFetchRoute({ router, license, lib }: RouteDependencies) {
+  router.get(
+    { path: addBasePath('/policies'), validate: { query: querySchema } },
+    license.guardApiRoute(async (context, request, response) => {
+      const query = request.query as typeof querySchema.type;
+      const { withIndices } = query;
+      const { callAsCurrentUser } = context.core.elasticsearch.dataClient;
+
+      try {
+        const policiesMap = await fetchPolicies(callAsCurrentUser);
+        if (withIndices) {
+          await addLinkedIndices(callAsCurrentUser, policiesMap);
+        }
+        const okResponse = { body: formatPolicies(policiesMap) };
+        return response.ok(okResponse);
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_templates_routes.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/index.ts
similarity index 64%
rename from x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_templates_routes.ts
rename to x-pack/plugins/index_lifecycle_management/server/routes/api/templates/index.ts
index 424b2d36b1ba2..a2d885c3170b9 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_templates_routes.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/index.ts
@@ -4,12 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { RouteDependencies } from '../../../types';
 import { registerFetchRoute } from './register_fetch_route';
-import { registerGetRoute } from './register_get_route';
 import { registerAddPolicyRoute } from './register_add_policy_route';
 
-export function registerTemplatesRoutes(server: any) {
-  registerFetchRoute(server);
-  registerGetRoute(server);
-  registerAddPolicyRoute(server);
+export function registerTemplatesRoutes(dependencies: RouteDependencies) {
+  registerFetchRoute(dependencies);
+  registerAddPolicyRoute(dependencies);
 }
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
new file mode 100644
index 0000000000000..0da8535f8d4ec
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
@@ -0,0 +1,81 @@
+/*
+ * 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 { merge } from 'lodash';
+import { schema } from '@kbn/config-schema';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
+
+async function getIndexTemplate(callAsCurrentUser: APICaller, templateName: string): Promise<any> {
+  const response = await callAsCurrentUser('indices.getTemplate', { name: templateName });
+  return response[templateName];
+}
+
+async function updateIndexTemplate(
+  callAsCurrentUser: APICaller,
+  templateName: string,
+  policyName: string,
+  aliasName?: string
+): Promise<any> {
+  // Fetch existing template
+  const template = await getIndexTemplate(callAsCurrentUser, templateName);
+  merge(template, {
+    settings: {
+      index: {
+        lifecycle: {
+          name: policyName,
+          rollover_alias: aliasName,
+        },
+      },
+    },
+  });
+
+  const params = {
+    method: 'PUT',
+    path: `/_template/${encodeURIComponent(templateName)}`,
+    ignore: [404],
+    body: template,
+  };
+
+  return await callAsCurrentUser('transport.request', params);
+}
+
+const bodySchema = schema.object({
+  templateName: schema.string(),
+  policyName: schema.string(),
+  aliasName: schema.maybe(schema.string()),
+});
+
+export function registerAddPolicyRoute({ router, license, lib }: RouteDependencies) {
+  router.post(
+    { path: addBasePath('/template'), validate: { body: bodySchema } },
+    license.guardApiRoute(async (context, request, response) => {
+      const body = request.body as typeof bodySchema.type;
+      const { templateName, policyName, aliasName } = body;
+
+      try {
+        await updateIndexTemplate(
+          context.core.elasticsearch.dataClient.callAsCurrentUser,
+          templateName,
+          policyName,
+          aliasName
+        );
+        return response.ok();
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
+        }
+        // Case: default
+        return response.internalError({ body: e });
+      }
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
similarity index 63%
rename from x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
rename to x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
index fd58f471d69bb..a2dc67cb77afe 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { callWithRequestFactory } from '../../../lib/call_with_request_factory';
-import { isEsError } from '../../../lib/is_es_error';
-import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers';
-import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
+import { APICaller } from 'src/core/server';
+
+import { RouteDependencies } from '../../../types';
+import { addBasePath } from '../../../services';
 
 /**
  * We don't want to output system template (whose name starts with a ".") which don't
@@ -49,7 +49,7 @@ function filterAndFormatTemplates(templates: any): any {
   return formattedTemplates;
 }
 
-async function fetchTemplates(callWithRequest: any): Promise<any> {
+async function fetchTemplates(callAsCurrentUser: APICaller): Promise<any> {
   const params = {
     method: 'GET',
     path: '/_template',
@@ -57,30 +57,29 @@ async function fetchTemplates(callWithRequest: any): Promise<any> {
     ignore: [404],
   };
 
-  return await callWithRequest('transport.request', params);
+  return await callAsCurrentUser('transport.request', params);
 }
-export function registerFetchRoute(server: any) {
-  const licensePreRouting = licensePreRoutingFactory(server);
-
-  server.route({
-    path: '/api/index_lifecycle_management/templates',
-    method: 'GET',
-    handler: async (request: any) => {
-      const callWithRequest = callWithRequestFactory(server, request);
 
+export function registerFetchRoute({ router, license, lib }: RouteDependencies) {
+  router.get(
+    { path: addBasePath('/templates'), validate: false },
+    license.guardApiRoute(async (context, request, response) => {
       try {
-        const templates = await fetchTemplates(callWithRequest);
-        return filterAndFormatTemplates(templates);
-      } catch (err) {
-        if (isEsError(err)) {
-          return wrapEsError(err);
+        const templates = await fetchTemplates(
+          context.core.elasticsearch.dataClient.callAsCurrentUser
+        );
+        const okResponse = { body: filterAndFormatTemplates(templates) };
+        return response.ok(okResponse);
+      } catch (e) {
+        if (lib.isEsError(e)) {
+          return response.customError({
+            statusCode: e.statusCode,
+            body: e,
+          });
         }
-
-        return wrapUnknownError(err);
+        // Case: default
+        return response.internalError({ body: e });
       }
-    },
-    config: {
-      pre: [licensePreRouting],
-    },
-  });
+    })
+  );
 }
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/index.ts b/x-pack/plugins/index_lifecycle_management/server/routes/index.ts
new file mode 100644
index 0000000000000..35996721854c6
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/index.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 { RouteDependencies } from '../types';
+
+import { registerIndexRoutes } from './api/index';
+import { registerNodesRoutes } from './api/nodes';
+import { registerPoliciesRoutes } from './api/policies';
+import { registerTemplatesRoutes } from './api/templates';
+
+export function registerApiRoutes(dependencies: RouteDependencies) {
+  registerIndexRoutes(dependencies);
+  registerNodesRoutes(dependencies);
+  registerPoliciesRoutes(dependencies);
+  registerTemplatesRoutes(dependencies);
+}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/index.ts b/x-pack/plugins/index_lifecycle_management/server/services/add_base_path.ts
similarity index 64%
rename from x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/index.ts
rename to x-pack/plugins/index_lifecycle_management/server/services/add_base_path.ts
index f2c070fd44b6e..3f3dd131df7c7 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/services/add_base_path.ts
@@ -4,4 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { checkLicense } from './check_license';
+import { API_BASE_PATH } from '../../common/constants';
+
+export const addBasePath = (uri: string): string => `${API_BASE_PATH}${uri}`;
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/index.ts b/x-pack/plugins/index_lifecycle_management/server/services/index.ts
similarity index 74%
rename from x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/index.ts
rename to x-pack/plugins/index_lifecycle_management/server/services/index.ts
index 0743e443955f4..d7b544b290c39 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/license_pre_routing_factory/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/services/index.ts
@@ -4,4 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { licensePreRoutingFactory } from './license_pre_routing_factory';
+export { License } from './license';
+export { addBasePath } from './add_base_path';
diff --git a/x-pack/plugins/index_lifecycle_management/server/services/license.ts b/x-pack/plugins/index_lifecycle_management/server/services/license.ts
new file mode 100644
index 0000000000000..31d3654c51e3e
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/services/license.ts
@@ -0,0 +1,82 @@
+/*
+ * 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 { Logger } from 'src/core/server';
+import {
+  KibanaRequest,
+  KibanaResponseFactory,
+  RequestHandler,
+  RequestHandlerContext,
+} from 'kibana/server';
+
+import { LicensingPluginSetup } from '../../../licensing/server';
+import { LicenseType } from '../../../licensing/common/types';
+
+export interface LicenseStatus {
+  isValid: boolean;
+  message?: string;
+}
+
+interface SetupSettings {
+  pluginId: string;
+  minimumLicenseType: LicenseType;
+  defaultErrorMessage: string;
+}
+
+export class License {
+  private licenseStatus: LicenseStatus = {
+    isValid: false,
+    message: 'Invalid License',
+  };
+
+  setup(
+    { pluginId, minimumLicenseType, defaultErrorMessage }: SetupSettings,
+    { licensing, logger }: { licensing: LicensingPluginSetup; logger: Logger }
+  ) {
+    licensing.license$.subscribe(license => {
+      const { state, message } = license.check(pluginId, minimumLicenseType);
+      const hasRequiredLicense = state === 'valid';
+
+      if (hasRequiredLicense) {
+        this.licenseStatus = { isValid: true };
+      } else {
+        this.licenseStatus = {
+          isValid: false,
+          message: message || defaultErrorMessage,
+        };
+        if (message) {
+          logger.info(message);
+        }
+      }
+    });
+  }
+
+  guardApiRoute(handler: RequestHandler) {
+    const license = this;
+
+    return function licenseCheck(
+      ctx: RequestHandlerContext,
+      request: KibanaRequest,
+      response: KibanaResponseFactory
+    ) {
+      const licenseStatus = license.getStatus();
+
+      if (!licenseStatus.isValid) {
+        return response.customError({
+          body: {
+            message: licenseStatus.message || '',
+          },
+          statusCode: 403,
+        });
+      }
+
+      return handler(ctx, request, response);
+    };
+  }
+
+  getStatus() {
+    return this.licenseStatus;
+  }
+}
diff --git a/x-pack/plugins/index_lifecycle_management/server/types.ts b/x-pack/plugins/index_lifecycle_management/server/types.ts
new file mode 100644
index 0000000000000..7f64c1a47197a
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/server/types.ts
@@ -0,0 +1,27 @@
+/*
+ * 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 { IRouter } from 'src/core/server';
+
+import { LicensingPluginSetup } from '../../licensing/server';
+import { IndexManagementPluginSetup } from '../../index_management/server';
+import { License } from './services';
+import { IndexLifecycleManagementConfig } from './config';
+import { isEsError } from './lib/is_es_error';
+
+export interface Dependencies {
+  licensing: LicensingPluginSetup;
+  indexManagement: IndexManagementPluginSetup;
+}
+
+export interface RouteDependencies {
+  router: IRouter;
+  config: IndexLifecycleManagementConfig;
+  license: License;
+  lib: {
+    isEsError: typeof isEsError;
+  };
+}
diff --git a/x-pack/plugins/index_management/public/application/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js b/x-pack/plugins/index_management/public/application/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js
index 8f794ce1ed612..a351d39b123a8 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js
+++ b/x-pack/plugins/index_management/public/application/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js
@@ -46,11 +46,7 @@ export class IndexActionsContextMenu extends Component {
   confirmAction = isActionConfirmed => {
     this.setState({ isActionConfirmed });
   };
-  panels({
-    core: { fatalErrors },
-    services: { extensionsService, httpService, notificationService },
-    plugins: { usageCollection },
-  }) {
+  panels({ services: { extensionsService } }) {
     const {
       closeIndices,
       openIndices,
@@ -218,15 +214,6 @@ export class IndexActionsContextMenu extends Component {
       const actionExtensionDefinition = actionExtension({
         indices,
         reloadIndices,
-        // These config options can be removed once the NP migration out of legacy is complete.
-        // They're needed for now because ILM's extensions make API calls which require these
-        // dependencies, but they're not available unless the app's "setup" lifecycle stage occurs.
-        // Within the old platform, "setup" only occurs once the user actually visits the app.
-        // Once ILM and IM have been moved out of legacy this hack won't be necessary.
-        usageCollection,
-        toasts: notificationService.toasts,
-        fatalErrors,
-        httpClient: httpService.httpClient,
       });
       if (actionExtensionDefinition) {
         const {
diff --git a/x-pack/plugins/index_management/public/index.ts b/x-pack/plugins/index_management/public/index.ts
index 6bb921ef648f3..7a76fff7f3ec6 100644
--- a/x-pack/plugins/index_management/public/index.ts
+++ b/x-pack/plugins/index_management/public/index.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import './index.scss';
-import { IndexMgmtUIPlugin, IndexMgmtSetup } from './plugin';
+import { IndexMgmtUIPlugin, IndexManagementPluginSetup } from './plugin';
 
 /** @public */
 export const plugin = () => {
   return new IndexMgmtUIPlugin();
 };
 
-export { IndexMgmtSetup };
+export { IndexManagementPluginSetup };
 
 export { getIndexListUri } from './application/services/navigation';
diff --git a/x-pack/plugins/index_management/public/plugin.ts b/x-pack/plugins/index_management/public/plugin.ts
index 4aa06d286e3c4..f9e2a47170b3d 100644
--- a/x-pack/plugins/index_management/public/plugin.ts
+++ b/x-pack/plugins/index_management/public/plugin.ts
@@ -20,7 +20,7 @@ import { setUiMetricService } from './application/services/api';
 import { IndexMgmtMetricsType } from './types';
 import { ExtensionsService, ExtensionsSetup } from './services';
 
-export interface IndexMgmtSetup {
+export interface IndexManagementPluginSetup {
   extensionsService: ExtensionsSetup;
 }
 
@@ -40,7 +40,7 @@ export class IndexMgmtUIPlugin {
     setUiMetricService(this.uiMetricService);
   }
 
-  public setup(coreSetup: CoreSetup, plugins: PluginsDependencies): IndexMgmtSetup {
+  public setup(coreSetup: CoreSetup, plugins: PluginsDependencies): IndexManagementPluginSetup {
     const { http, notifications } = coreSetup;
     const { usageCollection, management } = plugins;
 
diff --git a/x-pack/plugins/index_management/server/index.ts b/x-pack/plugins/index_management/server/index.ts
index e4102711708cb..4d9409e4a516c 100644
--- a/x-pack/plugins/index_management/server/index.ts
+++ b/x-pack/plugins/index_management/server/index.ts
@@ -17,6 +17,6 @@ export const config = {
 
 /** @public */
 export { Dependencies } from './types';
-export { IndexMgmtSetup } from './plugin';
+export { IndexManagementPluginSetup } from './plugin';
 export { Index } from './types';
 export { IndexManagementConfig } from './config';
diff --git a/x-pack/plugins/index_management/server/plugin.ts b/x-pack/plugins/index_management/server/plugin.ts
index a0a9151cdb71f..e5bd7451b028f 100644
--- a/x-pack/plugins/index_management/server/plugin.ts
+++ b/x-pack/plugins/index_management/server/plugin.ts
@@ -12,13 +12,13 @@ import { ApiRoutes } from './routes';
 import { License, IndexDataEnricher } from './services';
 import { isEsError } from './lib/is_es_error';
 
-export interface IndexMgmtSetup {
+export interface IndexManagementPluginSetup {
   indexDataEnricher: {
     add: IndexDataEnricher['add'];
   };
 }
 
-export class IndexMgmtServerPlugin implements Plugin<IndexMgmtSetup, void, any, any> {
+export class IndexMgmtServerPlugin implements Plugin<IndexManagementPluginSetup, void, any, any> {
   private readonly apiRoutes: ApiRoutes;
   private readonly license: License;
   private readonly logger: Logger;
@@ -31,7 +31,7 @@ export class IndexMgmtServerPlugin implements Plugin<IndexMgmtSetup, void, any,
     this.indexDataEnricher = new IndexDataEnricher();
   }
 
-  setup({ http }: CoreSetup, { licensing }: Dependencies): IndexMgmtSetup {
+  setup({ http }: CoreSetup, { licensing }: Dependencies): IndexManagementPluginSetup {
     const router = http.createRouter();
 
     this.license.setup(
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 687834a683c4d..c07ec68e99b4f 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7459,9 +7459,6 @@
     "xpack.indexLifecycleMgmt.activePhaseMessage": "アクティブ",
     "xpack.indexLifecycleMgmt.addLifecyclePolicyActionButtonLabel": "ライフサイクルポリシーを追加",
     "xpack.indexLifecycleMgmt.appTitle": "インデックスライフサイクルポリシー",
-    "xpack.indexLifecycleMgmt.checkLicense.errorExpiredMessage": "{licenseType} ライセンスが期限切れのため {pluginName} を使用できません。",
-    "xpack.indexLifecycleMgmt.checkLicense.errorUnavailableMessage": "現在ライセンス情報が利用できないため {pluginName} を使用できません。",
-    "xpack.indexLifecycleMgmt.checkLicense.errorUnsupportedMessage": "ご使用の {licenseType} ライセンスは {pluginName} をサポートしていません。ライセンスをアップグレードしてください。",
     "xpack.indexLifecycleMgmt.coldPhase.freezeIndexLabel": "インデックスを凍結",
     "xpack.indexLifecycleMgmt.coldPhase.numberOfReplicasLabel": "複製の数",
     "xpack.indexLifecycleMgmt.coldPhase.replicaCountHelpText": "デフォルトで、複製の数は同じままになります。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 58905787da8d5..de8aaa75632ee 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7462,9 +7462,6 @@
     "xpack.indexLifecycleMgmt.activePhaseMessage": "有效",
     "xpack.indexLifecycleMgmt.addLifecyclePolicyActionButtonLabel": "添加生命周期策略",
     "xpack.indexLifecycleMgmt.appTitle": "索引生命周期策略",
-    "xpack.indexLifecycleMgmt.checkLicense.errorExpiredMessage": "您不能使用 {pluginName}，因为您的 {licenseType} 许可已过期。",
-    "xpack.indexLifecycleMgmt.checkLicense.errorUnavailableMessage": "您不能使用 {pluginName}，因为许可证信息当前不可用。",
-    "xpack.indexLifecycleMgmt.checkLicense.errorUnsupportedMessage": "您的 {licenseType} 许可证不支持 {pluginName}。请升级您的许可。",
     "xpack.indexLifecycleMgmt.coldPhase.freezeIndexLabel": "冻结索引",
     "xpack.indexLifecycleMgmt.coldPhase.numberOfReplicasLabel": "副本分片数目",
     "xpack.indexLifecycleMgmt.coldPhase.replicaCountHelpText": "默认情况下，副本分片数目仍一样。",
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.helpers.js b/x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.helpers.js
index 8778ab5c807f5..257cca36b2ecf 100644
--- a/x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.helpers.js
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.helpers.js
@@ -9,8 +9,6 @@ import { API_BASE_PATH } from './constants';
 export const registerHelpers = ({ supertest }) => {
   const loadTemplates = () => supertest.get(`${API_BASE_PATH}/templates`);
 
-  const getTemplate = name => supertest.get(`${API_BASE_PATH}/templates/${name}`);
-
   const addPolicyToTemplate = (templateName, policyName, aliasName) =>
     supertest
       .post(`${API_BASE_PATH}/template`)
@@ -23,7 +21,6 @@ export const registerHelpers = ({ supertest }) => {
 
   return {
     loadTemplates,
-    getTemplate,
     addPolicyToTemplate,
   };
 };
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.js b/x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.js
index 374577825cd94..d30c20527471b 100644
--- a/x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.js
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.js
@@ -16,7 +16,7 @@ export default function({ getService }) {
 
   const { createIndexTemplate, cleanUp: cleanUpEsResources } = initElasticsearchHelpers(es);
 
-  const { loadTemplates, getTemplate, addPolicyToTemplate } = registerTemplatesHelpers({
+  const { loadTemplates, addPolicyToTemplate } = registerTemplatesHelpers({
     supertest,
   });
 
@@ -48,18 +48,6 @@ export default function({ getService }) {
       });
     });
 
-    describe('get', () => {
-      it('should fetch a single template', async () => {
-        // Create a template with the ES client
-        const templateName = getRandomString();
-        const template = getTemplatePayload();
-        await createIndexTemplate(templateName, template);
-
-        const { body } = await getTemplate(templateName).expect(200);
-        expect(body.index_patterns).to.eql(template.index_patterns);
-      });
-    });
-
     describe('update', () => {
       it('should add a policy to a template', async () => {
         // Create policy
@@ -78,12 +66,13 @@ export default function({ getService }) {
         await addPolicyToTemplate(templateName, policyName, rolloverAlias).expect(200);
 
         // Fetch the template and verify that the policy has been attached
-        const { body } = await getTemplate(templateName);
+        const { body } = await loadTemplates();
+        const fetchedTemplate = body.find(({ name }) => templateName === name);
         const {
           settings: {
             index: { lifecycle },
           },
-        } = body;
+        } = fetchedTemplate;
         expect(lifecycle.name).to.equal(policyName);
         expect(lifecycle.rollover_alias).to.equal(rolloverAlias);
       });

From 330956ec1a7ea94cc6665147b870075f683d05b3 Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko <dzmitry.lemechko@elastic.co>
Date: Fri, 10 Apr 2020 02:55:28 +0300
Subject: [PATCH 06/36] Code coverage: fix missing coverage after merging oss &
 x-pack data (#63178)

* update nyc & istanbul-babel deps

* update index.js in kbn-pm

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 package.json                  |    4 +-
 packages/kbn-pm/dist/index.js | 1919 ++++++++++++++++-----------------
 yarn.lock                     |  410 ++++---
 3 files changed, 1190 insertions(+), 1143 deletions(-)

diff --git a/package.json b/package.json
index ea930d07e7b43..ec72d5b660345 100644
--- a/package.json
+++ b/package.json
@@ -396,7 +396,7 @@
     "axe-core": "^3.4.1",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
-    "babel-plugin-istanbul": "^5.2.0",
+    "babel-plugin-istanbul": "^6.0.0",
     "backport": "5.1.3",
     "chai": "3.5.0",
     "chance": "1.0.18",
@@ -469,7 +469,7 @@
     "nock": "12.0.3",
     "node-sass": "^4.13.1",
     "normalize-path": "^3.0.0",
-    "nyc": "^14.1.1",
+    "nyc": "^15.0.1",
     "pixelmatch": "^5.1.0",
     "pkg-up": "^2.0.0",
     "pngjs": "^3.4.0",
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 7a858deff41d3..399720f310f67 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -94,7 +94,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["run"]; });
 
-/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(704);
+/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(703);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildProductionProjects"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
@@ -105,10 +105,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(515);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_3__["Project"]; });
 
-/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(577);
+/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(576);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__["copyWorkspacePackages"]; });
 
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(578);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(577);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["getProjectPaths"]; });
 
 /*
@@ -152,7 +152,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var _commands__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(688);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(687);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
@@ -2506,9 +2506,9 @@ module.exports = require("path");
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "commands", function() { return commands; });
 /* harmony import */ var _bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
-/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(585);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(685);
-/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(686);
+/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(584);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(684);
+/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(685);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -2551,8 +2551,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
 /* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(499);
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(500);
-/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(579);
-/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(584);
+/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(578);
+/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(583);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -43866,7 +43866,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(514);
 /* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(515);
-/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(577);
+/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(576);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -47386,7 +47386,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(514);
 /* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
 /* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(516);
-/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(562);
+/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(561);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -52557,8 +52557,8 @@ const fs = __webpack_require__(545);
 const writeFileAtomic = __webpack_require__(549);
 const sortKeys = __webpack_require__(556);
 const makeDir = __webpack_require__(558);
-const pify = __webpack_require__(560);
-const detectIndent = __webpack_require__(561);
+const pify = __webpack_require__(559);
+const detectIndent = __webpack_require__(560);
 
 const init = (fn, filePath, data, options) => {
 	if (!filePath) {
@@ -54852,81 +54852,6 @@ module.exports = (input, options) => {
 "use strict";
 
 
-const processFn = (fn, options) => function (...args) {
-	const P = options.promiseModule;
-
-	return new P((resolve, reject) => {
-		if (options.multiArgs) {
-			args.push((...result) => {
-				if (options.errorFirst) {
-					if (result[0]) {
-						reject(result);
-					} else {
-						result.shift();
-						resolve(result);
-					}
-				} else {
-					resolve(result);
-				}
-			});
-		} else if (options.errorFirst) {
-			args.push((error, result) => {
-				if (error) {
-					reject(error);
-				} else {
-					resolve(result);
-				}
-			});
-		} else {
-			args.push(resolve);
-		}
-
-		fn.apply(this, args);
-	});
-};
-
-module.exports = (input, options) => {
-	options = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, options);
-
-	const objType = typeof input;
-	if (!(input !== null && (objType === 'object' || objType === 'function'))) {
-		throw new TypeError(`Expected \`input\` to be a \`Function\` or \`Object\`, got \`${input === null ? 'null' : objType}\``);
-	}
-
-	const filter = key => {
-		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
-		return options.include ? options.include.some(match) : !options.exclude.some(match);
-	};
-
-	let ret;
-	if (objType === 'function') {
-		ret = function (...args) {
-			return options.excludeMain ? input(...args) : processFn(input, options).apply(this, args);
-		};
-	} else {
-		ret = Object.create(Object.getPrototypeOf(input));
-	}
-
-	for (const key in input) { // eslint-disable-line guard-for-in
-		const property = input[key];
-		ret[key] = typeof property === 'function' && filter(key) ? processFn(property, options) : property;
-	}
-
-	return ret;
-};
-
-
-/***/ }),
-/* 561 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
 // detect either spaces or tabs but not both to properly handle tabs
 // for indentation and spaces for alignment
 const INDENT_RE = /^(?:( )+|\t+)/;
@@ -55050,7 +54975,7 @@ module.exports = str => {
 
 
 /***/ }),
-/* 562 */
+/* 561 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55059,7 +54984,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackage", function() { return runScriptInPackage; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackageStreaming", function() { return runScriptInPackageStreaming; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yarnWorkspacesInfo", function() { return yarnWorkspacesInfo; });
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(563);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(562);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -55129,7 +55054,7 @@ async function yarnWorkspacesInfo(directory) {
 }
 
 /***/ }),
-/* 563 */
+/* 562 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -55140,9 +55065,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(351);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(564);
+/* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(563);
 /* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(log_symbols__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(569);
+/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(568);
 /* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
@@ -55208,12 +55133,12 @@ function spawnStreaming(command, args, opts, {
 }
 
 /***/ }),
-/* 564 */
+/* 563 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(565);
+const chalk = __webpack_require__(564);
 
 const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
 
@@ -55235,16 +55160,16 @@ module.exports = isSupported ? main : fallbacks;
 
 
 /***/ }),
-/* 565 */
+/* 564 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(566);
-const stdoutColor = __webpack_require__(567).stdout;
+const ansiStyles = __webpack_require__(565);
+const stdoutColor = __webpack_require__(566).stdout;
 
-const template = __webpack_require__(568);
+const template = __webpack_require__(567);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -55470,7 +55395,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 566 */
+/* 565 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55643,7 +55568,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 567 */
+/* 566 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55785,7 +55710,7 @@ module.exports = {
 
 
 /***/ }),
-/* 568 */
+/* 567 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55920,7 +55845,7 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 569 */
+/* 568 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright IBM Corp. 2014,2018. All Rights Reserved.
@@ -55928,12 +55853,12 @@ module.exports = (chalk, tmp) => {
 // This file is licensed under the Apache License 2.0.
 // License text available at https://opensource.org/licenses/Apache-2.0
 
-module.exports = __webpack_require__(570);
-module.exports.cli = __webpack_require__(574);
+module.exports = __webpack_require__(569);
+module.exports.cli = __webpack_require__(573);
 
 
 /***/ }),
-/* 570 */
+/* 569 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55948,9 +55873,9 @@ var stream = __webpack_require__(27);
 var util = __webpack_require__(29);
 var fs = __webpack_require__(23);
 
-var through = __webpack_require__(571);
-var duplexer = __webpack_require__(572);
-var StringDecoder = __webpack_require__(573).StringDecoder;
+var through = __webpack_require__(570);
+var duplexer = __webpack_require__(571);
+var StringDecoder = __webpack_require__(572).StringDecoder;
 
 module.exports = Logger;
 
@@ -56139,7 +56064,7 @@ function lineMerger(host) {
 
 
 /***/ }),
-/* 571 */
+/* 570 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(27)
@@ -56253,7 +56178,7 @@ function through (write, end, opts) {
 
 
 /***/ }),
-/* 572 */
+/* 571 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(27)
@@ -56346,13 +56271,13 @@ function duplex(writer, reader) {
 
 
 /***/ }),
-/* 573 */
+/* 572 */
 /***/ (function(module, exports) {
 
 module.exports = require("string_decoder");
 
 /***/ }),
-/* 574 */
+/* 573 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -56363,11 +56288,11 @@ module.exports = require("string_decoder");
 
 
 
-var minimist = __webpack_require__(575);
+var minimist = __webpack_require__(574);
 var path = __webpack_require__(16);
 
-var Logger = __webpack_require__(570);
-var pkg = __webpack_require__(576);
+var Logger = __webpack_require__(569);
+var pkg = __webpack_require__(575);
 
 module.exports = cli;
 
@@ -56421,7 +56346,7 @@ function usage($0, p) {
 
 
 /***/ }),
-/* 575 */
+/* 574 */
 /***/ (function(module, exports) {
 
 module.exports = function (args, opts) {
@@ -56663,13 +56588,13 @@ function isNumber (x) {
 
 
 /***/ }),
-/* 576 */
+/* 575 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"name\":\"strong-log-transformer\",\"version\":\"2.1.0\",\"description\":\"Stream transformer that prefixes lines with timestamps and other things.\",\"author\":\"Ryan Graham <ryan@strongloop.com>\",\"license\":\"Apache-2.0\",\"repository\":{\"type\":\"git\",\"url\":\"git://github.com/strongloop/strong-log-transformer\"},\"keywords\":[\"logging\",\"streams\"],\"bugs\":{\"url\":\"https://github.com/strongloop/strong-log-transformer/issues\"},\"homepage\":\"https://github.com/strongloop/strong-log-transformer\",\"directories\":{\"test\":\"test\"},\"bin\":{\"sl-log-transformer\":\"bin/sl-log-transformer.js\"},\"main\":\"index.js\",\"scripts\":{\"test\":\"tap --100 test/test-*\"},\"dependencies\":{\"duplexer\":\"^0.1.1\",\"minimist\":\"^1.2.0\",\"through\":\"^2.3.4\"},\"devDependencies\":{\"tap\":\"^12.0.1\"},\"engines\":{\"node\":\">=4\"}}");
 
 /***/ }),
-/* 577 */
+/* 576 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56682,7 +56607,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(578);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(577);
 /* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
 /* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(516);
 /* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(500);
@@ -56777,7 +56702,7 @@ function packagesFromGlobPattern({
 }
 
 /***/ }),
-/* 578 */
+/* 577 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56847,7 +56772,7 @@ function getProjectPaths({
 }
 
 /***/ }),
-/* 579 */
+/* 578 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -56855,13 +56780,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAllChecksums", function() { return getAllChecksums; });
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(23);
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(580);
+/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(579);
 /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(351);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(581);
+/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(580);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -57087,19 +57012,19 @@ async function getAllChecksums(kbn, log) {
 }
 
 /***/ }),
-/* 580 */
+/* 579 */
 /***/ (function(module, exports) {
 
 module.exports = require("crypto");
 
 /***/ }),
-/* 581 */
+/* 580 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readYarnLock", function() { return readYarnLock; });
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(582);
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(581);
 /* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
 /*
@@ -57143,7 +57068,7 @@ async function readYarnLock(kbn) {
 }
 
 /***/ }),
-/* 582 */
+/* 581 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports =
@@ -58702,7 +58627,7 @@ module.exports = invariant;
 /* 9 */
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(580);
+module.exports = __webpack_require__(579);
 
 /***/ }),
 /* 10 */,
@@ -61026,7 +60951,7 @@ function onceStrict (fn) {
 /* 63 */
 /***/ (function(module, exports) {
 
-module.exports = __webpack_require__(583);
+module.exports = __webpack_require__(582);
 
 /***/ }),
 /* 64 */,
@@ -67421,13 +67346,13 @@ module.exports = process && support(supportLevel);
 /******/ ]);
 
 /***/ }),
-/* 583 */
+/* 582 */
 /***/ (function(module, exports) {
 
 module.exports = require("buffer");
 
 /***/ }),
-/* 584 */
+/* 583 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -67524,7 +67449,7 @@ class BootstrapCacheFile {
 }
 
 /***/ }),
-/* 585 */
+/* 584 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -67532,9 +67457,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CleanCommand", function() { return CleanCommand; });
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(586);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(585);
 /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(674);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(673);
 /* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
@@ -67633,21 +67558,21 @@ const CleanCommand = {
 };
 
 /***/ }),
-/* 586 */
+/* 585 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const {promisify} = __webpack_require__(29);
 const path = __webpack_require__(16);
-const globby = __webpack_require__(587);
-const isGlob = __webpack_require__(604);
-const slash = __webpack_require__(665);
+const globby = __webpack_require__(586);
+const isGlob = __webpack_require__(603);
+const slash = __webpack_require__(664);
 const gracefulFs = __webpack_require__(22);
-const isPathCwd = __webpack_require__(667);
-const isPathInside = __webpack_require__(668);
-const rimraf = __webpack_require__(669);
-const pMap = __webpack_require__(670);
+const isPathCwd = __webpack_require__(666);
+const isPathInside = __webpack_require__(667);
+const rimraf = __webpack_require__(668);
+const pMap = __webpack_require__(669);
 
 const rimrafP = promisify(rimraf);
 
@@ -67761,19 +67686,19 @@ module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options
 
 
 /***/ }),
-/* 587 */
+/* 586 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const arrayUnion = __webpack_require__(588);
-const merge2 = __webpack_require__(589);
-const glob = __webpack_require__(590);
-const fastGlob = __webpack_require__(595);
-const dirGlob = __webpack_require__(661);
-const gitignore = __webpack_require__(663);
-const {FilterStream, UniqueStream} = __webpack_require__(666);
+const arrayUnion = __webpack_require__(587);
+const merge2 = __webpack_require__(588);
+const glob = __webpack_require__(589);
+const fastGlob = __webpack_require__(594);
+const dirGlob = __webpack_require__(660);
+const gitignore = __webpack_require__(662);
+const {FilterStream, UniqueStream} = __webpack_require__(665);
 
 const DEFAULT_FILTER = () => false;
 
@@ -67946,7 +67871,7 @@ module.exports.gitignore = gitignore;
 
 
 /***/ }),
-/* 588 */
+/* 587 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67958,7 +67883,7 @@ module.exports = (...arguments_) => {
 
 
 /***/ }),
-/* 589 */
+/* 588 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68072,7 +67997,7 @@ function pauseStreams (streams, options) {
 
 
 /***/ }),
-/* 590 */
+/* 589 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Approach:
@@ -68121,13 +68046,13 @@ var fs = __webpack_require__(23)
 var rp = __webpack_require__(502)
 var minimatch = __webpack_require__(504)
 var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(591)
+var inherits = __webpack_require__(590)
 var EE = __webpack_require__(379).EventEmitter
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
 var isAbsolute = __webpack_require__(510)
-var globSync = __webpack_require__(593)
-var common = __webpack_require__(594)
+var globSync = __webpack_require__(592)
+var common = __webpack_require__(593)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
@@ -68868,7 +68793,7 @@ Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
 
 
 /***/ }),
-/* 591 */
+/* 590 */
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
@@ -68878,12 +68803,12 @@ try {
   module.exports = util.inherits;
 } catch (e) {
   /* istanbul ignore next */
-  module.exports = __webpack_require__(592);
+  module.exports = __webpack_require__(591);
 }
 
 
 /***/ }),
-/* 592 */
+/* 591 */
 /***/ (function(module, exports) {
 
 if (typeof Object.create === 'function') {
@@ -68916,7 +68841,7 @@ if (typeof Object.create === 'function') {
 
 
 /***/ }),
-/* 593 */
+/* 592 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = globSync
@@ -68926,12 +68851,12 @@ var fs = __webpack_require__(23)
 var rp = __webpack_require__(502)
 var minimatch = __webpack_require__(504)
 var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(590).Glob
+var Glob = __webpack_require__(589).Glob
 var util = __webpack_require__(29)
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
 var isAbsolute = __webpack_require__(510)
-var common = __webpack_require__(594)
+var common = __webpack_require__(593)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
@@ -69408,7 +69333,7 @@ GlobSync.prototype._makeAbs = function (f) {
 
 
 /***/ }),
-/* 594 */
+/* 593 */
 /***/ (function(module, exports, __webpack_require__) {
 
 exports.alphasort = alphasort
@@ -69654,17 +69579,17 @@ function childrenIgnored (self, path) {
 
 
 /***/ }),
-/* 595 */
+/* 594 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const taskManager = __webpack_require__(596);
-const async_1 = __webpack_require__(624);
-const stream_1 = __webpack_require__(657);
-const sync_1 = __webpack_require__(658);
-const settings_1 = __webpack_require__(660);
-const utils = __webpack_require__(597);
+const taskManager = __webpack_require__(595);
+const async_1 = __webpack_require__(623);
+const stream_1 = __webpack_require__(656);
+const sync_1 = __webpack_require__(657);
+const settings_1 = __webpack_require__(659);
+const utils = __webpack_require__(596);
 function FastGlob(source, options) {
     try {
         assertPatternsInput(source);
@@ -69722,13 +69647,13 @@ module.exports = FastGlob;
 
 
 /***/ }),
-/* 596 */
+/* 595 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 function generate(patterns, settings) {
     const positivePatterns = getPositivePatterns(patterns);
     const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
@@ -69796,28 +69721,28 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
 
 /***/ }),
-/* 597 */
+/* 596 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const array = __webpack_require__(598);
+const array = __webpack_require__(597);
 exports.array = array;
-const errno = __webpack_require__(599);
+const errno = __webpack_require__(598);
 exports.errno = errno;
-const fs = __webpack_require__(600);
+const fs = __webpack_require__(599);
 exports.fs = fs;
-const path = __webpack_require__(601);
+const path = __webpack_require__(600);
 exports.path = path;
-const pattern = __webpack_require__(602);
+const pattern = __webpack_require__(601);
 exports.pattern = pattern;
-const stream = __webpack_require__(623);
+const stream = __webpack_require__(622);
 exports.stream = stream;
 
 
 /***/ }),
-/* 598 */
+/* 597 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69830,7 +69755,7 @@ exports.flatten = flatten;
 
 
 /***/ }),
-/* 599 */
+/* 598 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69843,7 +69768,7 @@ exports.isEnoentCodeError = isEnoentCodeError;
 
 
 /***/ }),
-/* 600 */
+/* 599 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69868,7 +69793,7 @@ exports.createDirentFromStats = createDirentFromStats;
 
 
 /***/ }),
-/* 601 */
+/* 600 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69889,16 +69814,16 @@ exports.makeAbsolute = makeAbsolute;
 
 
 /***/ }),
-/* 602 */
+/* 601 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const globParent = __webpack_require__(603);
-const isGlob = __webpack_require__(604);
-const micromatch = __webpack_require__(606);
+const globParent = __webpack_require__(602);
+const isGlob = __webpack_require__(603);
+const micromatch = __webpack_require__(605);
 const GLOBSTAR = '**';
 function isStaticPattern(pattern) {
     return !isDynamicPattern(pattern);
@@ -69987,13 +69912,13 @@ exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 603 */
+/* 602 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isGlob = __webpack_require__(604);
+var isGlob = __webpack_require__(603);
 var pathPosixDirname = __webpack_require__(16).posix.dirname;
 var isWin32 = __webpack_require__(11).platform() === 'win32';
 
@@ -70028,7 +69953,7 @@ module.exports = function globParent(str) {
 
 
 /***/ }),
-/* 604 */
+/* 603 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -70038,7 +69963,7 @@ module.exports = function globParent(str) {
  * Released under the MIT License.
  */
 
-var isExtglob = __webpack_require__(605);
+var isExtglob = __webpack_require__(604);
 var chars = { '{': '}', '(': ')', '[': ']'};
 var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
 var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
@@ -70082,7 +70007,7 @@ module.exports = function isGlob(str, options) {
 
 
 /***/ }),
-/* 605 */
+/* 604 */
 /***/ (function(module, exports) {
 
 /*!
@@ -70108,16 +70033,16 @@ module.exports = function isExtglob(str) {
 
 
 /***/ }),
-/* 606 */
+/* 605 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const util = __webpack_require__(29);
-const braces = __webpack_require__(607);
-const picomatch = __webpack_require__(617);
-const utils = __webpack_require__(620);
+const braces = __webpack_require__(606);
+const picomatch = __webpack_require__(616);
+const utils = __webpack_require__(619);
 const isEmptyString = val => typeof val === 'string' && (val === '' || val === './');
 
 /**
@@ -70582,16 +70507,16 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 607 */
+/* 606 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringify = __webpack_require__(608);
-const compile = __webpack_require__(610);
-const expand = __webpack_require__(614);
-const parse = __webpack_require__(615);
+const stringify = __webpack_require__(607);
+const compile = __webpack_require__(609);
+const expand = __webpack_require__(613);
+const parse = __webpack_require__(614);
 
 /**
  * Expand the given pattern or create a regex-compatible string.
@@ -70759,13 +70684,13 @@ module.exports = braces;
 
 
 /***/ }),
-/* 608 */
+/* 607 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const utils = __webpack_require__(609);
+const utils = __webpack_require__(608);
 
 module.exports = (ast, options = {}) => {
   let stringify = (node, parent = {}) => {
@@ -70798,7 +70723,7 @@ module.exports = (ast, options = {}) => {
 
 
 /***/ }),
-/* 609 */
+/* 608 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70917,14 +70842,14 @@ exports.flatten = (...args) => {
 
 
 /***/ }),
-/* 610 */
+/* 609 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const fill = __webpack_require__(611);
-const utils = __webpack_require__(609);
+const fill = __webpack_require__(610);
+const utils = __webpack_require__(608);
 
 const compile = (ast, options = {}) => {
   let walk = (node, parent = {}) => {
@@ -70981,7 +70906,7 @@ module.exports = compile;
 
 
 /***/ }),
-/* 611 */
+/* 610 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70995,7 +70920,7 @@ module.exports = compile;
 
 
 const util = __webpack_require__(29);
-const toRegexRange = __webpack_require__(612);
+const toRegexRange = __webpack_require__(611);
 
 const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
 
@@ -71237,7 +71162,7 @@ module.exports = fill;
 
 
 /***/ }),
-/* 612 */
+/* 611 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71250,7 +71175,7 @@ module.exports = fill;
 
 
 
-const isNumber = __webpack_require__(613);
+const isNumber = __webpack_require__(612);
 
 const toRegexRange = (min, max, options) => {
   if (isNumber(min) === false) {
@@ -71532,7 +71457,7 @@ module.exports = toRegexRange;
 
 
 /***/ }),
-/* 613 */
+/* 612 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71557,15 +71482,15 @@ module.exports = function(num) {
 
 
 /***/ }),
-/* 614 */
+/* 613 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const fill = __webpack_require__(611);
-const stringify = __webpack_require__(608);
-const utils = __webpack_require__(609);
+const fill = __webpack_require__(610);
+const stringify = __webpack_require__(607);
+const utils = __webpack_require__(608);
 
 const append = (queue = '', stash = '', enclose = false) => {
   let result = [];
@@ -71677,13 +71602,13 @@ module.exports = expand;
 
 
 /***/ }),
-/* 615 */
+/* 614 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringify = __webpack_require__(608);
+const stringify = __webpack_require__(607);
 
 /**
  * Constants
@@ -71705,7 +71630,7 @@ const {
   CHAR_SINGLE_QUOTE, /* ' */
   CHAR_NO_BREAK_SPACE,
   CHAR_ZERO_WIDTH_NOBREAK_SPACE
-} = __webpack_require__(616);
+} = __webpack_require__(615);
 
 /**
  * parse
@@ -72017,7 +71942,7 @@ module.exports = parse;
 
 
 /***/ }),
-/* 616 */
+/* 615 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -72081,26 +72006,26 @@ module.exports = {
 
 
 /***/ }),
-/* 617 */
+/* 616 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = __webpack_require__(618);
+module.exports = __webpack_require__(617);
 
 
 /***/ }),
-/* 618 */
+/* 617 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(16);
-const scan = __webpack_require__(619);
-const parse = __webpack_require__(622);
-const utils = __webpack_require__(620);
+const scan = __webpack_require__(618);
+const parse = __webpack_require__(621);
+const utils = __webpack_require__(619);
 
 /**
  * Creates a matcher function from one or more glob patterns. The
@@ -72403,7 +72328,7 @@ picomatch.toRegex = (source, options) => {
  * @return {Object}
  */
 
-picomatch.constants = __webpack_require__(621);
+picomatch.constants = __webpack_require__(620);
 
 /**
  * Expose "picomatch"
@@ -72413,13 +72338,13 @@ module.exports = picomatch;
 
 
 /***/ }),
-/* 619 */
+/* 618 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const utils = __webpack_require__(620);
+const utils = __webpack_require__(619);
 
 const {
   CHAR_ASTERISK,             /* * */
@@ -72437,7 +72362,7 @@ const {
   CHAR_RIGHT_CURLY_BRACE,    /* } */
   CHAR_RIGHT_PARENTHESES,    /* ) */
   CHAR_RIGHT_SQUARE_BRACKET /* ] */
-} = __webpack_require__(621);
+} = __webpack_require__(620);
 
 const isPathSeparator = code => {
   return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
@@ -72639,7 +72564,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 620 */
+/* 619 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -72651,7 +72576,7 @@ const {
   REGEX_SPECIAL_CHARS,
   REGEX_SPECIAL_CHARS_GLOBAL,
   REGEX_REMOVE_BACKSLASH
-} = __webpack_require__(621);
+} = __webpack_require__(620);
 
 exports.isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
 exports.hasRegexChars = str => REGEX_SPECIAL_CHARS.test(str);
@@ -72689,7 +72614,7 @@ exports.escapeLast = (input, char, lastIdx) => {
 
 
 /***/ }),
-/* 621 */
+/* 620 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -72875,14 +72800,14 @@ module.exports = {
 
 
 /***/ }),
-/* 622 */
+/* 621 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const utils = __webpack_require__(620);
-const constants = __webpack_require__(621);
+const utils = __webpack_require__(619);
+const constants = __webpack_require__(620);
 
 /**
  * Constants
@@ -73893,13 +73818,13 @@ module.exports = parse;
 
 
 /***/ }),
-/* 623 */
+/* 622 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const merge2 = __webpack_require__(589);
+const merge2 = __webpack_require__(588);
 function merge(streams) {
     const mergedStream = merge2(streams);
     streams.forEach((stream) => {
@@ -73911,14 +73836,14 @@ exports.merge = merge;
 
 
 /***/ }),
-/* 624 */
+/* 623 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(625);
-const provider_1 = __webpack_require__(652);
+const stream_1 = __webpack_require__(624);
+const provider_1 = __webpack_require__(651);
 class ProviderAsync extends provider_1.default {
     constructor() {
         super(...arguments);
@@ -73946,16 +73871,16 @@ exports.default = ProviderAsync;
 
 
 /***/ }),
-/* 625 */
+/* 624 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = __webpack_require__(27);
-const fsStat = __webpack_require__(626);
-const fsWalk = __webpack_require__(631);
-const reader_1 = __webpack_require__(651);
+const fsStat = __webpack_require__(625);
+const fsWalk = __webpack_require__(630);
+const reader_1 = __webpack_require__(650);
 class ReaderStream extends reader_1.default {
     constructor() {
         super(...arguments);
@@ -74008,15 +73933,15 @@ exports.default = ReaderStream;
 
 
 /***/ }),
-/* 626 */
+/* 625 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(627);
-const sync = __webpack_require__(628);
-const settings_1 = __webpack_require__(629);
+const async = __webpack_require__(626);
+const sync = __webpack_require__(627);
+const settings_1 = __webpack_require__(628);
 exports.Settings = settings_1.default;
 function stat(path, optionsOrSettingsOrCallback, callback) {
     if (typeof optionsOrSettingsOrCallback === 'function') {
@@ -74039,7 +73964,7 @@ function getSettings(settingsOrOptions = {}) {
 
 
 /***/ }),
-/* 627 */
+/* 626 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74077,7 +74002,7 @@ function callSuccessCallback(callback, result) {
 
 
 /***/ }),
-/* 628 */
+/* 627 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74106,13 +74031,13 @@ exports.read = read;
 
 
 /***/ }),
-/* 629 */
+/* 628 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(630);
+const fs = __webpack_require__(629);
 class Settings {
     constructor(_options = {}) {
         this._options = _options;
@@ -74129,7 +74054,7 @@ exports.default = Settings;
 
 
 /***/ }),
-/* 630 */
+/* 629 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74152,16 +74077,16 @@ exports.createFileSystemAdapter = createFileSystemAdapter;
 
 
 /***/ }),
-/* 631 */
+/* 630 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __webpack_require__(632);
-const stream_1 = __webpack_require__(647);
-const sync_1 = __webpack_require__(648);
-const settings_1 = __webpack_require__(650);
+const async_1 = __webpack_require__(631);
+const stream_1 = __webpack_require__(646);
+const sync_1 = __webpack_require__(647);
+const settings_1 = __webpack_require__(649);
 exports.Settings = settings_1.default;
 function walk(dir, optionsOrSettingsOrCallback, callback) {
     if (typeof optionsOrSettingsOrCallback === 'function') {
@@ -74191,13 +74116,13 @@ function getSettings(settingsOrOptions = {}) {
 
 
 /***/ }),
-/* 632 */
+/* 631 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __webpack_require__(633);
+const async_1 = __webpack_require__(632);
 class AsyncProvider {
     constructor(_root, _settings) {
         this._root = _root;
@@ -74228,17 +74153,17 @@ function callSuccessCallback(callback, entries) {
 
 
 /***/ }),
-/* 633 */
+/* 632 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = __webpack_require__(379);
-const fsScandir = __webpack_require__(634);
-const fastq = __webpack_require__(643);
-const common = __webpack_require__(645);
-const reader_1 = __webpack_require__(646);
+const fsScandir = __webpack_require__(633);
+const fastq = __webpack_require__(642);
+const common = __webpack_require__(644);
+const reader_1 = __webpack_require__(645);
 class AsyncReader extends reader_1.default {
     constructor(_root, _settings) {
         super(_root, _settings);
@@ -74328,15 +74253,15 @@ exports.default = AsyncReader;
 
 
 /***/ }),
-/* 634 */
+/* 633 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(635);
-const sync = __webpack_require__(640);
-const settings_1 = __webpack_require__(641);
+const async = __webpack_require__(634);
+const sync = __webpack_require__(639);
+const settings_1 = __webpack_require__(640);
 exports.Settings = settings_1.default;
 function scandir(path, optionsOrSettingsOrCallback, callback) {
     if (typeof optionsOrSettingsOrCallback === 'function') {
@@ -74359,16 +74284,16 @@ function getSettings(settingsOrOptions = {}) {
 
 
 /***/ }),
-/* 635 */
+/* 634 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(626);
-const rpl = __webpack_require__(636);
-const constants_1 = __webpack_require__(637);
-const utils = __webpack_require__(638);
+const fsStat = __webpack_require__(625);
+const rpl = __webpack_require__(635);
+const constants_1 = __webpack_require__(636);
+const utils = __webpack_require__(637);
 function read(dir, settings, callback) {
     if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
         return readdirWithFileTypes(dir, settings, callback);
@@ -74457,7 +74382,7 @@ function callSuccessCallback(callback, result) {
 
 
 /***/ }),
-/* 636 */
+/* 635 */
 /***/ (function(module, exports) {
 
 module.exports = runParallel
@@ -74511,7 +74436,7 @@ function runParallel (tasks, cb) {
 
 
 /***/ }),
-/* 637 */
+/* 636 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74527,18 +74452,18 @@ exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = MAJOR_VERSION > 10 || (MAJOR_VERSIO
 
 
 /***/ }),
-/* 638 */
+/* 637 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(639);
+const fs = __webpack_require__(638);
 exports.fs = fs;
 
 
 /***/ }),
-/* 639 */
+/* 638 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74563,15 +74488,15 @@ exports.createDirentFromStats = createDirentFromStats;
 
 
 /***/ }),
-/* 640 */
+/* 639 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(626);
-const constants_1 = __webpack_require__(637);
-const utils = __webpack_require__(638);
+const fsStat = __webpack_require__(625);
+const constants_1 = __webpack_require__(636);
+const utils = __webpack_require__(637);
 function read(dir, settings) {
     if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
         return readdirWithFileTypes(dir, settings);
@@ -74622,15 +74547,15 @@ exports.readdir = readdir;
 
 
 /***/ }),
-/* 641 */
+/* 640 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const fsStat = __webpack_require__(626);
-const fs = __webpack_require__(642);
+const fsStat = __webpack_require__(625);
+const fs = __webpack_require__(641);
 class Settings {
     constructor(_options = {}) {
         this._options = _options;
@@ -74653,7 +74578,7 @@ exports.default = Settings;
 
 
 /***/ }),
-/* 642 */
+/* 641 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74678,13 +74603,13 @@ exports.createFileSystemAdapter = createFileSystemAdapter;
 
 
 /***/ }),
-/* 643 */
+/* 642 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var reusify = __webpack_require__(644)
+var reusify = __webpack_require__(643)
 
 function fastqueue (context, worker, concurrency) {
   if (typeof context === 'function') {
@@ -74858,7 +74783,7 @@ module.exports = fastqueue
 
 
 /***/ }),
-/* 644 */
+/* 643 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74898,7 +74823,7 @@ module.exports = reusify
 
 
 /***/ }),
-/* 645 */
+/* 644 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74929,13 +74854,13 @@ exports.joinPathSegments = joinPathSegments;
 
 
 /***/ }),
-/* 646 */
+/* 645 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const common = __webpack_require__(645);
+const common = __webpack_require__(644);
 class Reader {
     constructor(_root, _settings) {
         this._root = _root;
@@ -74947,14 +74872,14 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 647 */
+/* 646 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = __webpack_require__(27);
-const async_1 = __webpack_require__(633);
+const async_1 = __webpack_require__(632);
 class StreamProvider {
     constructor(_root, _settings) {
         this._root = _root;
@@ -74984,13 +74909,13 @@ exports.default = StreamProvider;
 
 
 /***/ }),
-/* 648 */
+/* 647 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(649);
+const sync_1 = __webpack_require__(648);
 class SyncProvider {
     constructor(_root, _settings) {
         this._root = _root;
@@ -75005,15 +74930,15 @@ exports.default = SyncProvider;
 
 
 /***/ }),
-/* 649 */
+/* 648 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsScandir = __webpack_require__(634);
-const common = __webpack_require__(645);
-const reader_1 = __webpack_require__(646);
+const fsScandir = __webpack_require__(633);
+const common = __webpack_require__(644);
+const reader_1 = __webpack_require__(645);
 class SyncReader extends reader_1.default {
     constructor() {
         super(...arguments);
@@ -75071,14 +74996,14 @@ exports.default = SyncReader;
 
 
 /***/ }),
-/* 650 */
+/* 649 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const fsScandir = __webpack_require__(634);
+const fsScandir = __webpack_require__(633);
 class Settings {
     constructor(_options = {}) {
         this._options = _options;
@@ -75104,15 +75029,15 @@ exports.default = Settings;
 
 
 /***/ }),
-/* 651 */
+/* 650 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const fsStat = __webpack_require__(626);
-const utils = __webpack_require__(597);
+const fsStat = __webpack_require__(625);
+const utils = __webpack_require__(596);
 class Reader {
     constructor(_settings) {
         this._settings = _settings;
@@ -75144,17 +75069,17 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 652 */
+/* 651 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __webpack_require__(16);
-const deep_1 = __webpack_require__(653);
-const entry_1 = __webpack_require__(654);
-const error_1 = __webpack_require__(655);
-const entry_2 = __webpack_require__(656);
+const deep_1 = __webpack_require__(652);
+const entry_1 = __webpack_require__(653);
+const error_1 = __webpack_require__(654);
+const entry_2 = __webpack_require__(655);
 class Provider {
     constructor(_settings) {
         this._settings = _settings;
@@ -75199,13 +75124,13 @@ exports.default = Provider;
 
 
 /***/ }),
-/* 653 */
+/* 652 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 class DeepFilter {
     constructor(_settings, _micromatchOptions) {
         this._settings = _settings;
@@ -75265,13 +75190,13 @@ exports.default = DeepFilter;
 
 
 /***/ }),
-/* 654 */
+/* 653 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 class EntryFilter {
     constructor(_settings, _micromatchOptions) {
         this._settings = _settings;
@@ -75326,13 +75251,13 @@ exports.default = EntryFilter;
 
 
 /***/ }),
-/* 655 */
+/* 654 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 class ErrorFilter {
     constructor(_settings) {
         this._settings = _settings;
@@ -75348,13 +75273,13 @@ exports.default = ErrorFilter;
 
 
 /***/ }),
-/* 656 */
+/* 655 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(597);
+const utils = __webpack_require__(596);
 class EntryTransformer {
     constructor(_settings) {
         this._settings = _settings;
@@ -75381,15 +75306,15 @@ exports.default = EntryTransformer;
 
 
 /***/ }),
-/* 657 */
+/* 656 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = __webpack_require__(27);
-const stream_2 = __webpack_require__(625);
-const provider_1 = __webpack_require__(652);
+const stream_2 = __webpack_require__(624);
+const provider_1 = __webpack_require__(651);
 class ProviderStream extends provider_1.default {
     constructor() {
         super(...arguments);
@@ -75417,14 +75342,14 @@ exports.default = ProviderStream;
 
 
 /***/ }),
-/* 658 */
+/* 657 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(659);
-const provider_1 = __webpack_require__(652);
+const sync_1 = __webpack_require__(658);
+const provider_1 = __webpack_require__(651);
 class ProviderSync extends provider_1.default {
     constructor() {
         super(...arguments);
@@ -75447,15 +75372,15 @@ exports.default = ProviderSync;
 
 
 /***/ }),
-/* 659 */
+/* 658 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(626);
-const fsWalk = __webpack_require__(631);
-const reader_1 = __webpack_require__(651);
+const fsStat = __webpack_require__(625);
+const fsWalk = __webpack_require__(630);
+const reader_1 = __webpack_require__(650);
 class ReaderSync extends reader_1.default {
     constructor() {
         super(...arguments);
@@ -75497,7 +75422,7 @@ exports.default = ReaderSync;
 
 
 /***/ }),
-/* 660 */
+/* 659 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75557,13 +75482,13 @@ exports.default = Settings;
 
 
 /***/ }),
-/* 661 */
+/* 660 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const pathType = __webpack_require__(662);
+const pathType = __webpack_require__(661);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -75639,7 +75564,7 @@ module.exports.sync = (input, options) => {
 
 
 /***/ }),
-/* 662 */
+/* 661 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75689,7 +75614,7 @@ exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 
 /***/ }),
-/* 663 */
+/* 662 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75697,9 +75622,9 @@ exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 const {promisify} = __webpack_require__(29);
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const fastGlob = __webpack_require__(595);
-const gitIgnore = __webpack_require__(664);
-const slash = __webpack_require__(665);
+const fastGlob = __webpack_require__(594);
+const gitIgnore = __webpack_require__(663);
+const slash = __webpack_require__(664);
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -75813,7 +75738,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 664 */
+/* 663 */
 /***/ (function(module, exports) {
 
 // A simple implementation of make-array
@@ -76404,7 +76329,7 @@ if (
 
 
 /***/ }),
-/* 665 */
+/* 664 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76422,7 +76347,7 @@ module.exports = path => {
 
 
 /***/ }),
-/* 666 */
+/* 665 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76475,7 +76400,7 @@ module.exports = {
 
 
 /***/ }),
-/* 667 */
+/* 666 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76497,7 +76422,7 @@ module.exports = path_ => {
 
 
 /***/ }),
-/* 668 */
+/* 667 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76525,7 +76450,7 @@ module.exports = (childPath, parentPath) => {
 
 
 /***/ }),
-/* 669 */
+/* 668 */
 /***/ (function(module, exports, __webpack_require__) {
 
 const assert = __webpack_require__(30)
@@ -76533,7 +76458,7 @@ const path = __webpack_require__(16)
 const fs = __webpack_require__(23)
 let glob = undefined
 try {
-  glob = __webpack_require__(590)
+  glob = __webpack_require__(589)
 } catch (_err) {
   // treat glob as optional.
 }
@@ -76899,12 +76824,12 @@ rimraf.sync = rimrafSync
 
 
 /***/ }),
-/* 670 */
+/* 669 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const AggregateError = __webpack_require__(671);
+const AggregateError = __webpack_require__(670);
 
 module.exports = async (
 	iterable,
@@ -76987,13 +76912,13 @@ module.exports = async (
 
 
 /***/ }),
-/* 671 */
+/* 670 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const indentString = __webpack_require__(672);
-const cleanStack = __webpack_require__(673);
+const indentString = __webpack_require__(671);
+const cleanStack = __webpack_require__(672);
 
 const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
 
@@ -77041,7 +76966,7 @@ module.exports = AggregateError;
 
 
 /***/ }),
-/* 672 */
+/* 671 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77083,7 +77008,7 @@ module.exports = (string, count = 1, options) => {
 
 
 /***/ }),
-/* 673 */
+/* 672 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77130,15 +77055,15 @@ module.exports = (stack, options) => {
 
 
 /***/ }),
-/* 674 */
+/* 673 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(675);
-const cliCursor = __webpack_require__(679);
-const cliSpinners = __webpack_require__(683);
-const logSymbols = __webpack_require__(564);
+const chalk = __webpack_require__(674);
+const cliCursor = __webpack_require__(678);
+const cliSpinners = __webpack_require__(682);
+const logSymbols = __webpack_require__(563);
 
 class Ora {
 	constructor(options) {
@@ -77285,16 +77210,16 @@ module.exports.promise = (action, options) => {
 
 
 /***/ }),
-/* 675 */
+/* 674 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(676);
-const stdoutColor = __webpack_require__(677).stdout;
+const ansiStyles = __webpack_require__(675);
+const stdoutColor = __webpack_require__(676).stdout;
 
-const template = __webpack_require__(678);
+const template = __webpack_require__(677);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -77520,7 +77445,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 676 */
+/* 675 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77693,7 +77618,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 677 */
+/* 676 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77835,7 +77760,7 @@ module.exports = {
 
 
 /***/ }),
-/* 678 */
+/* 677 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77970,12 +77895,12 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 679 */
+/* 678 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const restoreCursor = __webpack_require__(680);
+const restoreCursor = __webpack_require__(679);
 
 let hidden = false;
 
@@ -78016,12 +77941,12 @@ exports.toggle = (force, stream) => {
 
 
 /***/ }),
-/* 680 */
+/* 679 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const onetime = __webpack_require__(681);
+const onetime = __webpack_require__(680);
 const signalExit = __webpack_require__(377);
 
 module.exports = onetime(() => {
@@ -78032,12 +77957,12 @@ module.exports = onetime(() => {
 
 
 /***/ }),
-/* 681 */
+/* 680 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const mimicFn = __webpack_require__(682);
+const mimicFn = __webpack_require__(681);
 
 module.exports = (fn, opts) => {
 	// TODO: Remove this in v3
@@ -78078,7 +78003,7 @@ module.exports = (fn, opts) => {
 
 
 /***/ }),
-/* 682 */
+/* 681 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78094,22 +78019,22 @@ module.exports = (to, from) => {
 
 
 /***/ }),
-/* 683 */
+/* 682 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = __webpack_require__(684);
+module.exports = __webpack_require__(683);
 
 
 /***/ }),
-/* 684 */
+/* 683 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"dots\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠹\",\"⠸\",\"⠼\",\"⠴\",\"⠦\",\"⠧\",\"⠇\",\"⠏\"]},\"dots2\":{\"interval\":80,\"frames\":[\"⣾\",\"⣽\",\"⣻\",\"⢿\",\"⡿\",\"⣟\",\"⣯\",\"⣷\"]},\"dots3\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠞\",\"⠖\",\"⠦\",\"⠴\",\"⠲\",\"⠳\",\"⠓\"]},\"dots4\":{\"interval\":80,\"frames\":[\"⠄\",\"⠆\",\"⠇\",\"⠋\",\"⠙\",\"⠸\",\"⠰\",\"⠠\",\"⠰\",\"⠸\",\"⠙\",\"⠋\",\"⠇\",\"⠆\"]},\"dots5\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\"]},\"dots6\":{\"interval\":80,\"frames\":[\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠴\",\"⠲\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠚\",\"⠙\",\"⠉\",\"⠁\"]},\"dots7\":{\"interval\":80,\"frames\":[\"⠈\",\"⠉\",\"⠋\",\"⠓\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠖\",\"⠦\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\"]},\"dots8\":{\"interval\":80,\"frames\":[\"⠁\",\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\",\"⠈\"]},\"dots9\":{\"interval\":80,\"frames\":[\"⢹\",\"⢺\",\"⢼\",\"⣸\",\"⣇\",\"⡧\",\"⡗\",\"⡏\"]},\"dots10\":{\"interval\":80,\"frames\":[\"⢄\",\"⢂\",\"⢁\",\"⡁\",\"⡈\",\"⡐\",\"⡠\"]},\"dots11\":{\"interval\":100,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⡀\",\"⢀\",\"⠠\",\"⠐\",\"⠈\"]},\"dots12\":{\"interval\":80,\"frames\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"line\":{\"interval\":130,\"frames\":[\"-\",\"\\\\\",\"|\",\"/\"]},\"line2\":{\"interval\":100,\"frames\":[\"⠂\",\"-\",\"–\",\"—\",\"–\",\"-\"]},\"pipe\":{\"interval\":100,\"frames\":[\"┤\",\"┘\",\"┴\",\"└\",\"├\",\"┌\",\"┬\",\"┐\"]},\"simpleDots\":{\"interval\":400,\"frames\":[\".  \",\".. \",\"...\",\"   \"]},\"simpleDotsScrolling\":{\"interval\":200,\"frames\":[\".  \",\".. \",\"...\",\" ..\",\"  .\",\"   \"]},\"star\":{\"interval\":70,\"frames\":[\"✶\",\"✸\",\"✹\",\"✺\",\"✹\",\"✷\"]},\"star2\":{\"interval\":80,\"frames\":[\"+\",\"x\",\"*\"]},\"flip\":{\"interval\":70,\"frames\":[\"_\",\"_\",\"_\",\"-\",\"`\",\"`\",\"'\",\"´\",\"-\",\"_\",\"_\",\"_\"]},\"hamburger\":{\"interval\":100,\"frames\":[\"☱\",\"☲\",\"☴\"]},\"growVertical\":{\"interval\":120,\"frames\":[\"▁\",\"▃\",\"▄\",\"▅\",\"▆\",\"▇\",\"▆\",\"▅\",\"▄\",\"▃\"]},\"growHorizontal\":{\"interval\":120,\"frames\":[\"▏\",\"▎\",\"▍\",\"▌\",\"▋\",\"▊\",\"▉\",\"▊\",\"▋\",\"▌\",\"▍\",\"▎\"]},\"balloon\":{\"interval\":140,\"frames\":[\" \",\".\",\"o\",\"O\",\"@\",\"*\",\" \"]},\"balloon2\":{\"interval\":120,\"frames\":[\".\",\"o\",\"O\",\"°\",\"O\",\"o\",\".\"]},\"noise\":{\"interval\":100,\"frames\":[\"▓\",\"▒\",\"░\"]},\"bounce\":{\"interval\":120,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⠂\"]},\"boxBounce\":{\"interval\":120,\"frames\":[\"▖\",\"▘\",\"▝\",\"▗\"]},\"boxBounce2\":{\"interval\":100,\"frames\":[\"▌\",\"▀\",\"▐\",\"▄\"]},\"triangle\":{\"interval\":50,\"frames\":[\"◢\",\"◣\",\"◤\",\"◥\"]},\"arc\":{\"interval\":100,\"frames\":[\"◜\",\"◠\",\"◝\",\"◞\",\"◡\",\"◟\"]},\"circle\":{\"interval\":120,\"frames\":[\"◡\",\"⊙\",\"◠\"]},\"squareCorners\":{\"interval\":180,\"frames\":[\"◰\",\"◳\",\"◲\",\"◱\"]},\"circleQuarters\":{\"interval\":120,\"frames\":[\"◴\",\"◷\",\"◶\",\"◵\"]},\"circleHalves\":{\"interval\":50,\"frames\":[\"◐\",\"◓\",\"◑\",\"◒\"]},\"squish\":{\"interval\":100,\"frames\":[\"╫\",\"╪\"]},\"toggle\":{\"interval\":250,\"frames\":[\"⊶\",\"⊷\"]},\"toggle2\":{\"interval\":80,\"frames\":[\"▫\",\"▪\"]},\"toggle3\":{\"interval\":120,\"frames\":[\"□\",\"■\"]},\"toggle4\":{\"interval\":100,\"frames\":[\"■\",\"□\",\"▪\",\"▫\"]},\"toggle5\":{\"interval\":100,\"frames\":[\"▮\",\"▯\"]},\"toggle6\":{\"interval\":300,\"frames\":[\"ဝ\",\"၀\"]},\"toggle7\":{\"interval\":80,\"frames\":[\"⦾\",\"⦿\"]},\"toggle8\":{\"interval\":100,\"frames\":[\"◍\",\"◌\"]},\"toggle9\":{\"interval\":100,\"frames\":[\"◉\",\"◎\"]},\"toggle10\":{\"interval\":100,\"frames\":[\"㊂\",\"㊀\",\"㊁\"]},\"toggle11\":{\"interval\":50,\"frames\":[\"⧇\",\"⧆\"]},\"toggle12\":{\"interval\":120,\"frames\":[\"☗\",\"☖\"]},\"toggle13\":{\"interval\":80,\"frames\":[\"=\",\"*\",\"-\"]},\"arrow\":{\"interval\":100,\"frames\":[\"←\",\"↖\",\"↑\",\"↗\",\"→\",\"↘\",\"↓\",\"↙\"]},\"arrow2\":{\"interval\":80,\"frames\":[\"⬆️ \",\"↗️ \",\"➡️ \",\"↘️ \",\"⬇️ \",\"↙️ \",\"⬅️ \",\"↖️ \"]},\"arrow3\":{\"interval\":120,\"frames\":[\"▹▹▹▹▹\",\"▸▹▹▹▹\",\"▹▸▹▹▹\",\"▹▹▸▹▹\",\"▹▹▹▸▹\",\"▹▹▹▹▸\"]},\"bouncingBar\":{\"interval\":80,\"frames\":[\"[    ]\",\"[=   ]\",\"[==  ]\",\"[=== ]\",\"[ ===]\",\"[  ==]\",\"[   =]\",\"[    ]\",\"[   =]\",\"[  ==]\",\"[ ===]\",\"[====]\",\"[=== ]\",\"[==  ]\",\"[=   ]\"]},\"bouncingBall\":{\"interval\":80,\"frames\":[\"( ●    )\",\"(  ●   )\",\"(   ●  )\",\"(    ● )\",\"(     ●)\",\"(    ● )\",\"(   ●  )\",\"(  ●   )\",\"( ●    )\",\"(●     )\"]},\"smiley\":{\"interval\":200,\"frames\":[\"😄 \",\"😝 \"]},\"monkey\":{\"interval\":300,\"frames\":[\"🙈 \",\"🙈 \",\"🙉 \",\"🙊 \"]},\"hearts\":{\"interval\":100,\"frames\":[\"💛 \",\"💙 \",\"💜 \",\"💚 \",\"❤️ \"]},\"clock\":{\"interval\":100,\"frames\":[\"🕐 \",\"🕑 \",\"🕒 \",\"🕓 \",\"🕔 \",\"🕕 \",\"🕖 \",\"🕗 \",\"🕘 \",\"🕙 \",\"🕚 \"]},\"earth\":{\"interval\":180,\"frames\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"moon\":{\"interval\":80,\"frames\":[\"🌑 \",\"🌒 \",\"🌓 \",\"🌔 \",\"🌕 \",\"🌖 \",\"🌗 \",\"🌘 \"]},\"runner\":{\"interval\":140,\"frames\":[\"🚶 \",\"🏃 \"]},\"pong\":{\"interval\":80,\"frames\":[\"▐⠂       ▌\",\"▐⠈       ▌\",\"▐ ⠂      ▌\",\"▐ ⠠      ▌\",\"▐  ⡀     ▌\",\"▐  ⠠     ▌\",\"▐   ⠂    ▌\",\"▐   ⠈    ▌\",\"▐    ⠂   ▌\",\"▐    ⠠   ▌\",\"▐     ⡀  ▌\",\"▐     ⠠  ▌\",\"▐      ⠂ ▌\",\"▐      ⠈ ▌\",\"▐       ⠂▌\",\"▐       ⠠▌\",\"▐       ⡀▌\",\"▐      ⠠ ▌\",\"▐      ⠂ ▌\",\"▐     ⠈  ▌\",\"▐     ⠂  ▌\",\"▐    ⠠   ▌\",\"▐    ⡀   ▌\",\"▐   ⠠    ▌\",\"▐   ⠂    ▌\",\"▐  ⠈     ▌\",\"▐  ⠂     ▌\",\"▐ ⠠      ▌\",\"▐ ⡀      ▌\",\"▐⠠       ▌\"]},\"shark\":{\"interval\":120,\"frames\":[\"▐|\\\\____________▌\",\"▐_|\\\\___________▌\",\"▐__|\\\\__________▌\",\"▐___|\\\\_________▌\",\"▐____|\\\\________▌\",\"▐_____|\\\\_______▌\",\"▐______|\\\\______▌\",\"▐_______|\\\\_____▌\",\"▐________|\\\\____▌\",\"▐_________|\\\\___▌\",\"▐__________|\\\\__▌\",\"▐___________|\\\\_▌\",\"▐____________|\\\\▌\",\"▐____________/|▌\",\"▐___________/|_▌\",\"▐__________/|__▌\",\"▐_________/|___▌\",\"▐________/|____▌\",\"▐_______/|_____▌\",\"▐______/|______▌\",\"▐_____/|_______▌\",\"▐____/|________▌\",\"▐___/|_________▌\",\"▐__/|__________▌\",\"▐_/|___________▌\",\"▐/|____________▌\"]},\"dqpb\":{\"interval\":100,\"frames\":[\"d\",\"q\",\"p\",\"b\"]},\"weather\":{\"interval\":100,\"frames\":[\"☀️ \",\"☀️ \",\"☀️ \",\"🌤 \",\"⛅️ \",\"🌥 \",\"☁️ \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"⛈ \",\"🌨 \",\"🌧 \",\"🌨 \",\"☁️ \",\"🌥 \",\"⛅️ \",\"🌤 \",\"☀️ \",\"☀️ \"]},\"christmas\":{\"interval\":400,\"frames\":[\"🌲\",\"🎄\"]}}");
 
 /***/ }),
-/* 685 */
+/* 684 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78169,7 +78094,7 @@ const RunCommand = {
 };
 
 /***/ }),
-/* 686 */
+/* 685 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78180,7 +78105,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
 /* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(499);
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(500);
-/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(687);
+/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(686);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -78264,7 +78189,7 @@ const WatchCommand = {
 };
 
 /***/ }),
-/* 687 */
+/* 686 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78338,7 +78263,7 @@ function waitUntilWatchIsReady(stream, opts = {}) {
 }
 
 /***/ }),
-/* 688 */
+/* 687 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78346,15 +78271,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runCommand", function() { return runCommand; });
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(689);
+/* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(688);
 /* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(indent_string__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(690);
+/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(689);
 /* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(wrap_ansi__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(514);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34);
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(500);
-/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(697);
-/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(698);
+/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(696);
+/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(697);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -78442,7 +78367,7 @@ function toArray(value) {
 }
 
 /***/ }),
-/* 689 */
+/* 688 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78476,13 +78401,13 @@ module.exports = (str, count, opts) => {
 
 
 /***/ }),
-/* 690 */
+/* 689 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const stringWidth = __webpack_require__(691);
-const stripAnsi = __webpack_require__(695);
+const stringWidth = __webpack_require__(690);
+const stripAnsi = __webpack_require__(694);
 
 const ESCAPES = new Set([
 	'\u001B',
@@ -78676,13 +78601,13 @@ module.exports = (str, cols, opts) => {
 
 
 /***/ }),
-/* 691 */
+/* 690 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const stripAnsi = __webpack_require__(692);
-const isFullwidthCodePoint = __webpack_require__(694);
+const stripAnsi = __webpack_require__(691);
+const isFullwidthCodePoint = __webpack_require__(693);
 
 module.exports = str => {
 	if (typeof str !== 'string' || str.length === 0) {
@@ -78719,18 +78644,18 @@ module.exports = str => {
 
 
 /***/ }),
-/* 692 */
+/* 691 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(693);
+const ansiRegex = __webpack_require__(692);
 
 module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
 
 
 /***/ }),
-/* 693 */
+/* 692 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78747,7 +78672,7 @@ module.exports = () => {
 
 
 /***/ }),
-/* 694 */
+/* 693 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78800,18 +78725,18 @@ module.exports = x => {
 
 
 /***/ }),
-/* 695 */
+/* 694 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(696);
+const ansiRegex = __webpack_require__(695);
 
 module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
 
 
 /***/ }),
-/* 696 */
+/* 695 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78828,7 +78753,7 @@ module.exports = () => {
 
 
 /***/ }),
-/* 697 */
+/* 696 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78981,7 +78906,7 @@ function addProjectToTree(tree, pathParts, project) {
 }
 
 /***/ }),
-/* 698 */
+/* 697 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78989,12 +78914,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kibana", function() { return Kibana; });
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(699);
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(698);
 /* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(703);
+/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(702);
 /* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(500);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(578);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(577);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -79135,15 +79060,15 @@ class Kibana {
 }
 
 /***/ }),
-/* 699 */
+/* 698 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const minimatch = __webpack_require__(504);
-const arrayUnion = __webpack_require__(700);
-const arrayDiffer = __webpack_require__(701);
-const arrify = __webpack_require__(702);
+const arrayUnion = __webpack_require__(699);
+const arrayDiffer = __webpack_require__(700);
+const arrify = __webpack_require__(701);
 
 module.exports = (list, patterns, options = {}) => {
 	list = arrify(list);
@@ -79167,7 +79092,7 @@ module.exports = (list, patterns, options = {}) => {
 
 
 /***/ }),
-/* 700 */
+/* 699 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79179,7 +79104,7 @@ module.exports = (...arguments_) => {
 
 
 /***/ }),
-/* 701 */
+/* 700 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79194,7 +79119,7 @@ module.exports = arrayDiffer;
 
 
 /***/ }),
-/* 702 */
+/* 701 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79224,7 +79149,7 @@ module.exports = arrify;
 
 
 /***/ }),
-/* 703 */
+/* 702 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79252,15 +79177,15 @@ module.exports = (childPath, parentPath) => {
 
 
 /***/ }),
-/* 704 */
+/* 703 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(705);
+/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(704);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _build_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildProductionProjects"]; });
 
-/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(923);
+/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(922);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
 
 /*
@@ -79285,19 +79210,19 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 705 */
+/* 704 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return buildProductionProjects; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(706);
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(705);
 /* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(586);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(585);
 /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(578);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(577);
 /* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
 /* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(516);
@@ -79433,7 +79358,7 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
 }
 
 /***/ }),
-/* 706 */
+/* 705 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79441,13 +79366,13 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
 const EventEmitter = __webpack_require__(379);
 const path = __webpack_require__(16);
 const os = __webpack_require__(11);
-const pAll = __webpack_require__(707);
-const arrify = __webpack_require__(709);
-const globby = __webpack_require__(710);
-const isGlob = __webpack_require__(604);
-const cpFile = __webpack_require__(908);
-const junk = __webpack_require__(920);
-const CpyError = __webpack_require__(921);
+const pAll = __webpack_require__(706);
+const arrify = __webpack_require__(708);
+const globby = __webpack_require__(709);
+const isGlob = __webpack_require__(603);
+const cpFile = __webpack_require__(907);
+const junk = __webpack_require__(919);
+const CpyError = __webpack_require__(920);
 
 const defaultOptions = {
 	ignoreJunk: true
@@ -79566,12 +79491,12 @@ module.exports = (source, destination, {
 
 
 /***/ }),
-/* 707 */
+/* 706 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pMap = __webpack_require__(708);
+const pMap = __webpack_require__(707);
 
 module.exports = (iterable, options) => pMap(iterable, element => element(), options);
 // TODO: Remove this for the next major release
@@ -79579,7 +79504,7 @@ module.exports.default = module.exports;
 
 
 /***/ }),
-/* 708 */
+/* 707 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79658,7 +79583,7 @@ module.exports.default = pMap;
 
 
 /***/ }),
-/* 709 */
+/* 708 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79688,17 +79613,17 @@ module.exports = arrify;
 
 
 /***/ }),
-/* 710 */
+/* 709 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const arrayUnion = __webpack_require__(711);
-const glob = __webpack_require__(713);
-const fastGlob = __webpack_require__(718);
-const dirGlob = __webpack_require__(901);
-const gitignore = __webpack_require__(904);
+const arrayUnion = __webpack_require__(710);
+const glob = __webpack_require__(712);
+const fastGlob = __webpack_require__(717);
+const dirGlob = __webpack_require__(900);
+const gitignore = __webpack_require__(903);
 
 const DEFAULT_FILTER = () => false;
 
@@ -79843,12 +79768,12 @@ module.exports.gitignore = gitignore;
 
 
 /***/ }),
-/* 711 */
+/* 710 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var arrayUniq = __webpack_require__(712);
+var arrayUniq = __webpack_require__(711);
 
 module.exports = function () {
 	return arrayUniq([].concat.apply([], arguments));
@@ -79856,7 +79781,7 @@ module.exports = function () {
 
 
 /***/ }),
-/* 712 */
+/* 711 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79925,7 +79850,7 @@ if ('Set' in global) {
 
 
 /***/ }),
-/* 713 */
+/* 712 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Approach:
@@ -79974,13 +79899,13 @@ var fs = __webpack_require__(23)
 var rp = __webpack_require__(502)
 var minimatch = __webpack_require__(504)
 var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(714)
+var inherits = __webpack_require__(713)
 var EE = __webpack_require__(379).EventEmitter
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
 var isAbsolute = __webpack_require__(510)
-var globSync = __webpack_require__(716)
-var common = __webpack_require__(717)
+var globSync = __webpack_require__(715)
+var common = __webpack_require__(716)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
@@ -80721,7 +80646,7 @@ Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
 
 
 /***/ }),
-/* 714 */
+/* 713 */
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
@@ -80731,12 +80656,12 @@ try {
   module.exports = util.inherits;
 } catch (e) {
   /* istanbul ignore next */
-  module.exports = __webpack_require__(715);
+  module.exports = __webpack_require__(714);
 }
 
 
 /***/ }),
-/* 715 */
+/* 714 */
 /***/ (function(module, exports) {
 
 if (typeof Object.create === 'function') {
@@ -80769,7 +80694,7 @@ if (typeof Object.create === 'function') {
 
 
 /***/ }),
-/* 716 */
+/* 715 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = globSync
@@ -80779,12 +80704,12 @@ var fs = __webpack_require__(23)
 var rp = __webpack_require__(502)
 var minimatch = __webpack_require__(504)
 var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(713).Glob
+var Glob = __webpack_require__(712).Glob
 var util = __webpack_require__(29)
 var path = __webpack_require__(16)
 var assert = __webpack_require__(30)
 var isAbsolute = __webpack_require__(510)
-var common = __webpack_require__(717)
+var common = __webpack_require__(716)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
 var setopts = common.setopts
@@ -81261,7 +81186,7 @@ GlobSync.prototype._makeAbs = function (f) {
 
 
 /***/ }),
-/* 717 */
+/* 716 */
 /***/ (function(module, exports, __webpack_require__) {
 
 exports.alphasort = alphasort
@@ -81507,10 +81432,10 @@ function childrenIgnored (self, path) {
 
 
 /***/ }),
-/* 718 */
+/* 717 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const pkg = __webpack_require__(719);
+const pkg = __webpack_require__(718);
 
 module.exports = pkg.async;
 module.exports.default = pkg.async;
@@ -81523,19 +81448,19 @@ module.exports.generateTasks = pkg.generateTasks;
 
 
 /***/ }),
-/* 719 */
+/* 718 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var optionsManager = __webpack_require__(720);
-var taskManager = __webpack_require__(721);
-var reader_async_1 = __webpack_require__(872);
-var reader_stream_1 = __webpack_require__(896);
-var reader_sync_1 = __webpack_require__(897);
-var arrayUtils = __webpack_require__(899);
-var streamUtils = __webpack_require__(900);
+var optionsManager = __webpack_require__(719);
+var taskManager = __webpack_require__(720);
+var reader_async_1 = __webpack_require__(871);
+var reader_stream_1 = __webpack_require__(895);
+var reader_sync_1 = __webpack_require__(896);
+var arrayUtils = __webpack_require__(898);
+var streamUtils = __webpack_require__(899);
 /**
  * Synchronous API.
  */
@@ -81601,7 +81526,7 @@ function isString(source) {
 
 
 /***/ }),
-/* 720 */
+/* 719 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -81639,13 +81564,13 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 721 */
+/* 720 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var patternUtils = __webpack_require__(722);
+var patternUtils = __webpack_require__(721);
 /**
  * Generate tasks based on parent directory of each pattern.
  */
@@ -81736,16 +81661,16 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
 
 /***/ }),
-/* 722 */
+/* 721 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var globParent = __webpack_require__(723);
-var isGlob = __webpack_require__(726);
-var micromatch = __webpack_require__(727);
+var globParent = __webpack_require__(722);
+var isGlob = __webpack_require__(725);
+var micromatch = __webpack_require__(726);
 var GLOBSTAR = '**';
 /**
  * Return true for static pattern.
@@ -81891,15 +81816,15 @@ exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 723 */
+/* 722 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var path = __webpack_require__(16);
-var isglob = __webpack_require__(724);
-var pathDirname = __webpack_require__(725);
+var isglob = __webpack_require__(723);
+var pathDirname = __webpack_require__(724);
 var isWin32 = __webpack_require__(11).platform() === 'win32';
 
 module.exports = function globParent(str) {
@@ -81922,7 +81847,7 @@ module.exports = function globParent(str) {
 
 
 /***/ }),
-/* 724 */
+/* 723 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -81932,7 +81857,7 @@ module.exports = function globParent(str) {
  * Licensed under the MIT License.
  */
 
-var isExtglob = __webpack_require__(605);
+var isExtglob = __webpack_require__(604);
 
 module.exports = function isGlob(str) {
   if (typeof str !== 'string' || str === '') {
@@ -81953,7 +81878,7 @@ module.exports = function isGlob(str) {
 
 
 /***/ }),
-/* 725 */
+/* 724 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82103,7 +82028,7 @@ module.exports.win32 = win32;
 
 
 /***/ }),
-/* 726 */
+/* 725 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -82113,7 +82038,7 @@ module.exports.win32 = win32;
  * Released under the MIT License.
  */
 
-var isExtglob = __webpack_require__(605);
+var isExtglob = __webpack_require__(604);
 var chars = { '{': '}', '(': ')', '[': ']'};
 
 module.exports = function isGlob(str, options) {
@@ -82155,7 +82080,7 @@ module.exports = function isGlob(str, options) {
 
 
 /***/ }),
-/* 727 */
+/* 726 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -82166,18 +82091,18 @@ module.exports = function isGlob(str, options) {
  */
 
 var util = __webpack_require__(29);
-var braces = __webpack_require__(728);
-var toRegex = __webpack_require__(830);
-var extend = __webpack_require__(838);
+var braces = __webpack_require__(727);
+var toRegex = __webpack_require__(829);
+var extend = __webpack_require__(837);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(841);
-var parsers = __webpack_require__(868);
-var cache = __webpack_require__(869);
-var utils = __webpack_require__(870);
+var compilers = __webpack_require__(840);
+var parsers = __webpack_require__(867);
+var cache = __webpack_require__(868);
+var utils = __webpack_require__(869);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -83039,7 +82964,7 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 728 */
+/* 727 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83049,18 +82974,18 @@ module.exports = micromatch;
  * Module dependencies
  */
 
-var toRegex = __webpack_require__(729);
-var unique = __webpack_require__(741);
-var extend = __webpack_require__(738);
+var toRegex = __webpack_require__(728);
+var unique = __webpack_require__(740);
+var extend = __webpack_require__(737);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(742);
-var parsers = __webpack_require__(757);
-var Braces = __webpack_require__(767);
-var utils = __webpack_require__(743);
+var compilers = __webpack_require__(741);
+var parsers = __webpack_require__(756);
+var Braces = __webpack_require__(766);
+var utils = __webpack_require__(742);
 var MAX_LENGTH = 1024 * 64;
 var cache = {};
 
@@ -83364,15 +83289,15 @@ module.exports = braces;
 
 
 /***/ }),
-/* 729 */
+/* 728 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(730);
-var extend = __webpack_require__(738);
-var not = __webpack_require__(740);
+var define = __webpack_require__(729);
+var extend = __webpack_require__(737);
+var not = __webpack_require__(739);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -83519,7 +83444,7 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 730 */
+/* 729 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83532,7 +83457,7 @@ module.exports.makeRe = makeRe;
 
 
 
-var isDescriptor = __webpack_require__(731);
+var isDescriptor = __webpack_require__(730);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -83557,7 +83482,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 731 */
+/* 730 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83570,9 +83495,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(732);
-var isAccessor = __webpack_require__(733);
-var isData = __webpack_require__(736);
+var typeOf = __webpack_require__(731);
+var isAccessor = __webpack_require__(732);
+var isData = __webpack_require__(735);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -83586,7 +83511,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 732 */
+/* 731 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -83739,7 +83664,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 733 */
+/* 732 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83752,7 +83677,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(734);
+var typeOf = __webpack_require__(733);
 
 // accessor descriptor properties
 var accessor = {
@@ -83815,10 +83740,10 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 734 */
+/* 733 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(735);
+var isBuffer = __webpack_require__(734);
 var toString = Object.prototype.toString;
 
 /**
@@ -83937,7 +83862,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 735 */
+/* 734 */
 /***/ (function(module, exports) {
 
 /*!
@@ -83964,7 +83889,7 @@ function isSlowBuffer (obj) {
 
 
 /***/ }),
-/* 736 */
+/* 735 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -83977,7 +83902,7 @@ function isSlowBuffer (obj) {
 
 
 
-var typeOf = __webpack_require__(737);
+var typeOf = __webpack_require__(736);
 
 // data descriptor properties
 var data = {
@@ -84026,10 +83951,10 @@ module.exports = isDataDescriptor;
 
 
 /***/ }),
-/* 737 */
+/* 736 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(735);
+var isBuffer = __webpack_require__(734);
 var toString = Object.prototype.toString;
 
 /**
@@ -84148,13 +84073,13 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 738 */
+/* 737 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(739);
+var isObject = __webpack_require__(738);
 
 module.exports = function extend(o/*, objects*/) {
   if (!isObject(o)) { o = {}; }
@@ -84188,7 +84113,7 @@ function hasOwn(obj, key) {
 
 
 /***/ }),
-/* 739 */
+/* 738 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84208,13 +84133,13 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 740 */
+/* 739 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(738);
+var extend = __webpack_require__(737);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -84281,7 +84206,7 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 741 */
+/* 740 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84331,13 +84256,13 @@ module.exports.immutable = function uniqueImmutable(arr) {
 
 
 /***/ }),
-/* 742 */
+/* 741 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(743);
+var utils = __webpack_require__(742);
 
 module.exports = function(braces, options) {
   braces.compiler
@@ -84620,25 +84545,25 @@ function hasQueue(node) {
 
 
 /***/ }),
-/* 743 */
+/* 742 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var splitString = __webpack_require__(744);
+var splitString = __webpack_require__(743);
 var utils = module.exports;
 
 /**
  * Module dependencies
  */
 
-utils.extend = __webpack_require__(738);
-utils.flatten = __webpack_require__(750);
-utils.isObject = __webpack_require__(748);
-utils.fillRange = __webpack_require__(751);
-utils.repeat = __webpack_require__(756);
-utils.unique = __webpack_require__(741);
+utils.extend = __webpack_require__(737);
+utils.flatten = __webpack_require__(749);
+utils.isObject = __webpack_require__(747);
+utils.fillRange = __webpack_require__(750);
+utils.repeat = __webpack_require__(755);
+utils.unique = __webpack_require__(740);
 
 utils.define = function(obj, key, val) {
   Object.defineProperty(obj, key, {
@@ -84970,7 +84895,7 @@ utils.escapeRegex = function(str) {
 
 
 /***/ }),
-/* 744 */
+/* 743 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -84983,7 +84908,7 @@ utils.escapeRegex = function(str) {
 
 
 
-var extend = __webpack_require__(745);
+var extend = __webpack_require__(744);
 
 module.exports = function(str, options, fn) {
   if (typeof str !== 'string') {
@@ -85148,14 +85073,14 @@ function keepEscaping(opts, str, idx) {
 
 
 /***/ }),
-/* 745 */
+/* 744 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(746);
-var assignSymbols = __webpack_require__(749);
+var isExtendable = __webpack_require__(745);
+var assignSymbols = __webpack_require__(748);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -85215,7 +85140,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 746 */
+/* 745 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85228,7 +85153,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(747);
+var isPlainObject = __webpack_require__(746);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -85236,7 +85161,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 747 */
+/* 746 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85249,7 +85174,7 @@ module.exports = function isExtendable(val) {
 
 
 
-var isObject = __webpack_require__(748);
+var isObject = __webpack_require__(747);
 
 function isObjectObject(o) {
   return isObject(o) === true
@@ -85280,7 +85205,7 @@ module.exports = function isPlainObject(o) {
 
 
 /***/ }),
-/* 748 */
+/* 747 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85299,7 +85224,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 749 */
+/* 748 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85346,7 +85271,7 @@ module.exports = function(receiver, objects) {
 
 
 /***/ }),
-/* 750 */
+/* 749 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85375,7 +85300,7 @@ function flat(arr, res) {
 
 
 /***/ }),
-/* 751 */
+/* 750 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85389,10 +85314,10 @@ function flat(arr, res) {
 
 
 var util = __webpack_require__(29);
-var isNumber = __webpack_require__(752);
-var extend = __webpack_require__(738);
-var repeat = __webpack_require__(754);
-var toRegex = __webpack_require__(755);
+var isNumber = __webpack_require__(751);
+var extend = __webpack_require__(737);
+var repeat = __webpack_require__(753);
+var toRegex = __webpack_require__(754);
 
 /**
  * Return a range of numbers or letters.
@@ -85590,7 +85515,7 @@ module.exports = fillRange;
 
 
 /***/ }),
-/* 752 */
+/* 751 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85603,7 +85528,7 @@ module.exports = fillRange;
 
 
 
-var typeOf = __webpack_require__(753);
+var typeOf = __webpack_require__(752);
 
 module.exports = function isNumber(num) {
   var type = typeOf(num);
@@ -85619,10 +85544,10 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 753 */
+/* 752 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(735);
+var isBuffer = __webpack_require__(734);
 var toString = Object.prototype.toString;
 
 /**
@@ -85741,7 +85666,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 754 */
+/* 753 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85818,7 +85743,7 @@ function repeat(str, num) {
 
 
 /***/ }),
-/* 755 */
+/* 754 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -85831,8 +85756,8 @@ function repeat(str, num) {
 
 
 
-var repeat = __webpack_require__(754);
-var isNumber = __webpack_require__(752);
+var repeat = __webpack_require__(753);
+var isNumber = __webpack_require__(751);
 var cache = {};
 
 function toRegexRange(min, max, options) {
@@ -86119,7 +86044,7 @@ module.exports = toRegexRange;
 
 
 /***/ }),
-/* 756 */
+/* 755 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -86144,14 +86069,14 @@ module.exports = function repeat(ele, num) {
 
 
 /***/ }),
-/* 757 */
+/* 756 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Node = __webpack_require__(758);
-var utils = __webpack_require__(743);
+var Node = __webpack_require__(757);
+var utils = __webpack_require__(742);
 
 /**
  * Braces parsers
@@ -86511,15 +86436,15 @@ function concatNodes(pos, node, parent, options) {
 
 
 /***/ }),
-/* 758 */
+/* 757 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(748);
-var define = __webpack_require__(759);
-var utils = __webpack_require__(766);
+var isObject = __webpack_require__(747);
+var define = __webpack_require__(758);
+var utils = __webpack_require__(765);
 var ownNames;
 
 /**
@@ -87010,7 +86935,7 @@ exports = module.exports = Node;
 
 
 /***/ }),
-/* 759 */
+/* 758 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87023,7 +86948,7 @@ exports = module.exports = Node;
 
 
 
-var isDescriptor = __webpack_require__(760);
+var isDescriptor = __webpack_require__(759);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -87048,7 +86973,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 760 */
+/* 759 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87061,9 +86986,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(761);
-var isAccessor = __webpack_require__(762);
-var isData = __webpack_require__(764);
+var typeOf = __webpack_require__(760);
+var isAccessor = __webpack_require__(761);
+var isData = __webpack_require__(763);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -87077,7 +87002,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 761 */
+/* 760 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -87212,7 +87137,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 762 */
+/* 761 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87225,7 +87150,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(763);
+var typeOf = __webpack_require__(762);
 
 // accessor descriptor properties
 var accessor = {
@@ -87288,7 +87213,7 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 763 */
+/* 762 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -87423,7 +87348,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 764 */
+/* 763 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -87436,7 +87361,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(765);
+var typeOf = __webpack_require__(764);
 
 module.exports = function isDataDescriptor(obj, prop) {
   // data descriptor properties
@@ -87479,7 +87404,7 @@ module.exports = function isDataDescriptor(obj, prop) {
 
 
 /***/ }),
-/* 765 */
+/* 764 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -87614,13 +87539,13 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 766 */
+/* 765 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(753);
+var typeOf = __webpack_require__(752);
 var utils = module.exports;
 
 /**
@@ -88640,17 +88565,17 @@ function assert(val, message) {
 
 
 /***/ }),
-/* 767 */
+/* 766 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(738);
-var Snapdragon = __webpack_require__(768);
-var compilers = __webpack_require__(742);
-var parsers = __webpack_require__(757);
-var utils = __webpack_require__(743);
+var extend = __webpack_require__(737);
+var Snapdragon = __webpack_require__(767);
+var compilers = __webpack_require__(741);
+var parsers = __webpack_require__(756);
+var utils = __webpack_require__(742);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -88751,17 +88676,17 @@ module.exports = Braces;
 
 
 /***/ }),
-/* 768 */
+/* 767 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Base = __webpack_require__(769);
-var define = __webpack_require__(730);
-var Compiler = __webpack_require__(798);
-var Parser = __webpack_require__(827);
-var utils = __webpack_require__(807);
+var Base = __webpack_require__(768);
+var define = __webpack_require__(729);
+var Compiler = __webpack_require__(797);
+var Parser = __webpack_require__(826);
+var utils = __webpack_require__(806);
 var regexCache = {};
 var cache = {};
 
@@ -88932,20 +88857,20 @@ module.exports.Parser = Parser;
 
 
 /***/ }),
-/* 769 */
+/* 768 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var define = __webpack_require__(770);
-var CacheBase = __webpack_require__(771);
-var Emitter = __webpack_require__(772);
-var isObject = __webpack_require__(748);
-var merge = __webpack_require__(789);
-var pascal = __webpack_require__(792);
-var cu = __webpack_require__(793);
+var define = __webpack_require__(769);
+var CacheBase = __webpack_require__(770);
+var Emitter = __webpack_require__(771);
+var isObject = __webpack_require__(747);
+var merge = __webpack_require__(788);
+var pascal = __webpack_require__(791);
+var cu = __webpack_require__(792);
 
 /**
  * Optionally define a custom `cache` namespace to use.
@@ -89374,7 +89299,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 770 */
+/* 769 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -89387,7 +89312,7 @@ module.exports.namespace = namespace;
 
 
 
-var isDescriptor = __webpack_require__(760);
+var isDescriptor = __webpack_require__(759);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -89412,21 +89337,21 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 771 */
+/* 770 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(748);
-var Emitter = __webpack_require__(772);
-var visit = __webpack_require__(773);
-var toPath = __webpack_require__(776);
-var union = __webpack_require__(777);
-var del = __webpack_require__(781);
-var get = __webpack_require__(779);
-var has = __webpack_require__(786);
-var set = __webpack_require__(780);
+var isObject = __webpack_require__(747);
+var Emitter = __webpack_require__(771);
+var visit = __webpack_require__(772);
+var toPath = __webpack_require__(775);
+var union = __webpack_require__(776);
+var del = __webpack_require__(780);
+var get = __webpack_require__(778);
+var has = __webpack_require__(785);
+var set = __webpack_require__(779);
 
 /**
  * Create a `Cache` constructor that when instantiated will
@@ -89680,7 +89605,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 772 */
+/* 771 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -89849,7 +89774,7 @@ Emitter.prototype.hasListeners = function(event){
 
 
 /***/ }),
-/* 773 */
+/* 772 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -89862,8 +89787,8 @@ Emitter.prototype.hasListeners = function(event){
 
 
 
-var visit = __webpack_require__(774);
-var mapVisit = __webpack_require__(775);
+var visit = __webpack_require__(773);
+var mapVisit = __webpack_require__(774);
 
 module.exports = function(collection, method, val) {
   var result;
@@ -89886,7 +89811,7 @@ module.exports = function(collection, method, val) {
 
 
 /***/ }),
-/* 774 */
+/* 773 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -89899,7 +89824,7 @@ module.exports = function(collection, method, val) {
 
 
 
-var isObject = __webpack_require__(748);
+var isObject = __webpack_require__(747);
 
 module.exports = function visit(thisArg, method, target, val) {
   if (!isObject(thisArg) && typeof thisArg !== 'function') {
@@ -89926,14 +89851,14 @@ module.exports = function visit(thisArg, method, target, val) {
 
 
 /***/ }),
-/* 775 */
+/* 774 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var visit = __webpack_require__(774);
+var visit = __webpack_require__(773);
 
 /**
  * Map `visit` over an array of objects.
@@ -89970,7 +89895,7 @@ function isObject(val) {
 
 
 /***/ }),
-/* 776 */
+/* 775 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -89983,7 +89908,7 @@ function isObject(val) {
 
 
 
-var typeOf = __webpack_require__(753);
+var typeOf = __webpack_require__(752);
 
 module.exports = function toPath(args) {
   if (typeOf(args) !== 'arguments') {
@@ -90010,16 +89935,16 @@ function filter(arr) {
 
 
 /***/ }),
-/* 777 */
+/* 776 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(739);
-var union = __webpack_require__(778);
-var get = __webpack_require__(779);
-var set = __webpack_require__(780);
+var isObject = __webpack_require__(738);
+var union = __webpack_require__(777);
+var get = __webpack_require__(778);
+var set = __webpack_require__(779);
 
 module.exports = function unionValue(obj, prop, value) {
   if (!isObject(obj)) {
@@ -90047,7 +89972,7 @@ function arrayify(val) {
 
 
 /***/ }),
-/* 778 */
+/* 777 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90083,7 +90008,7 @@ module.exports = function union(init) {
 
 
 /***/ }),
-/* 779 */
+/* 778 */
 /***/ (function(module, exports) {
 
 /*!
@@ -90139,7 +90064,7 @@ function toString(val) {
 
 
 /***/ }),
-/* 780 */
+/* 779 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90152,10 +90077,10 @@ function toString(val) {
 
 
 
-var split = __webpack_require__(744);
-var extend = __webpack_require__(738);
-var isPlainObject = __webpack_require__(747);
-var isObject = __webpack_require__(739);
+var split = __webpack_require__(743);
+var extend = __webpack_require__(737);
+var isPlainObject = __webpack_require__(746);
+var isObject = __webpack_require__(738);
 
 module.exports = function(obj, prop, val) {
   if (!isObject(obj)) {
@@ -90201,7 +90126,7 @@ function isValidKey(key) {
 
 
 /***/ }),
-/* 781 */
+/* 780 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90214,8 +90139,8 @@ function isValidKey(key) {
 
 
 
-var isObject = __webpack_require__(748);
-var has = __webpack_require__(782);
+var isObject = __webpack_require__(747);
+var has = __webpack_require__(781);
 
 module.exports = function unset(obj, prop) {
   if (!isObject(obj)) {
@@ -90240,7 +90165,7 @@ module.exports = function unset(obj, prop) {
 
 
 /***/ }),
-/* 782 */
+/* 781 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90253,9 +90178,9 @@ module.exports = function unset(obj, prop) {
 
 
 
-var isObject = __webpack_require__(783);
-var hasValues = __webpack_require__(785);
-var get = __webpack_require__(779);
+var isObject = __webpack_require__(782);
+var hasValues = __webpack_require__(784);
+var get = __webpack_require__(778);
 
 module.exports = function(obj, prop, noZero) {
   if (isObject(obj)) {
@@ -90266,7 +90191,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 /***/ }),
-/* 783 */
+/* 782 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90279,7 +90204,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 
-var isArray = __webpack_require__(784);
+var isArray = __webpack_require__(783);
 
 module.exports = function isObject(val) {
   return val != null && typeof val === 'object' && isArray(val) === false;
@@ -90287,7 +90212,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 784 */
+/* 783 */
 /***/ (function(module, exports) {
 
 var toString = {}.toString;
@@ -90298,7 +90223,7 @@ module.exports = Array.isArray || function (arr) {
 
 
 /***/ }),
-/* 785 */
+/* 784 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90341,7 +90266,7 @@ module.exports = function hasValue(o, noZero) {
 
 
 /***/ }),
-/* 786 */
+/* 785 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90354,9 +90279,9 @@ module.exports = function hasValue(o, noZero) {
 
 
 
-var isObject = __webpack_require__(748);
-var hasValues = __webpack_require__(787);
-var get = __webpack_require__(779);
+var isObject = __webpack_require__(747);
+var hasValues = __webpack_require__(786);
+var get = __webpack_require__(778);
 
 module.exports = function(val, prop) {
   return hasValues(isObject(val) && prop ? get(val, prop) : val);
@@ -90364,7 +90289,7 @@ module.exports = function(val, prop) {
 
 
 /***/ }),
-/* 787 */
+/* 786 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90377,8 +90302,8 @@ module.exports = function(val, prop) {
 
 
 
-var typeOf = __webpack_require__(788);
-var isNumber = __webpack_require__(752);
+var typeOf = __webpack_require__(787);
+var isNumber = __webpack_require__(751);
 
 module.exports = function hasValue(val) {
   // is-number checks for NaN and other edge cases
@@ -90431,10 +90356,10 @@ module.exports = function hasValue(val) {
 
 
 /***/ }),
-/* 788 */
+/* 787 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(735);
+var isBuffer = __webpack_require__(734);
 var toString = Object.prototype.toString;
 
 /**
@@ -90556,14 +90481,14 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 789 */
+/* 788 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(790);
-var forIn = __webpack_require__(791);
+var isExtendable = __webpack_require__(789);
+var forIn = __webpack_require__(790);
 
 function mixinDeep(target, objects) {
   var len = arguments.length, i = 0;
@@ -90627,7 +90552,7 @@ module.exports = mixinDeep;
 
 
 /***/ }),
-/* 790 */
+/* 789 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90640,7 +90565,7 @@ module.exports = mixinDeep;
 
 
 
-var isPlainObject = __webpack_require__(747);
+var isPlainObject = __webpack_require__(746);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -90648,7 +90573,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 791 */
+/* 790 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -90671,7 +90596,7 @@ module.exports = function forIn(obj, fn, thisArg) {
 
 
 /***/ }),
-/* 792 */
+/* 791 */
 /***/ (function(module, exports) {
 
 /*!
@@ -90698,14 +90623,14 @@ module.exports = pascalcase;
 
 
 /***/ }),
-/* 793 */
+/* 792 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var utils = __webpack_require__(794);
+var utils = __webpack_require__(793);
 
 /**
  * Expose class utils
@@ -91070,7 +90995,7 @@ cu.bubble = function(Parent, events) {
 
 
 /***/ }),
-/* 794 */
+/* 793 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91084,10 +91009,10 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.union = __webpack_require__(778);
-utils.define = __webpack_require__(730);
-utils.isObj = __webpack_require__(748);
-utils.staticExtend = __webpack_require__(795);
+utils.union = __webpack_require__(777);
+utils.define = __webpack_require__(729);
+utils.isObj = __webpack_require__(747);
+utils.staticExtend = __webpack_require__(794);
 
 
 /**
@@ -91098,7 +91023,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 795 */
+/* 794 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91111,8 +91036,8 @@ module.exports = utils;
 
 
 
-var copy = __webpack_require__(796);
-var define = __webpack_require__(730);
+var copy = __webpack_require__(795);
+var define = __webpack_require__(729);
 var util = __webpack_require__(29);
 
 /**
@@ -91195,15 +91120,15 @@ module.exports = extend;
 
 
 /***/ }),
-/* 796 */
+/* 795 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(753);
-var copyDescriptor = __webpack_require__(797);
-var define = __webpack_require__(730);
+var typeOf = __webpack_require__(752);
+var copyDescriptor = __webpack_require__(796);
+var define = __webpack_require__(729);
 
 /**
  * Copy static properties, prototype properties, and descriptors from one object to another.
@@ -91376,7 +91301,7 @@ module.exports.has = has;
 
 
 /***/ }),
-/* 797 */
+/* 796 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91464,16 +91389,16 @@ function isObject(val) {
 
 
 /***/ }),
-/* 798 */
+/* 797 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(799);
-var define = __webpack_require__(730);
-var debug = __webpack_require__(801)('snapdragon:compiler');
-var utils = __webpack_require__(807);
+var use = __webpack_require__(798);
+var define = __webpack_require__(729);
+var debug = __webpack_require__(800)('snapdragon:compiler');
+var utils = __webpack_require__(806);
 
 /**
  * Create a new `Compiler` with the given `options`.
@@ -91627,7 +91552,7 @@ Compiler.prototype = {
 
     // source map support
     if (opts.sourcemap) {
-      var sourcemaps = __webpack_require__(826);
+      var sourcemaps = __webpack_require__(825);
       sourcemaps(this);
       this.mapVisit(this.ast.nodes);
       this.applySourceMaps();
@@ -91648,7 +91573,7 @@ module.exports = Compiler;
 
 
 /***/ }),
-/* 799 */
+/* 798 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91661,7 +91586,7 @@ module.exports = Compiler;
 
 
 
-var utils = __webpack_require__(800);
+var utils = __webpack_require__(799);
 
 module.exports = function base(app, opts) {
   if (!utils.isObject(app) && typeof app !== 'function') {
@@ -91776,7 +91701,7 @@ module.exports = function base(app, opts) {
 
 
 /***/ }),
-/* 800 */
+/* 799 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -91790,8 +91715,8 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.define = __webpack_require__(730);
-utils.isObject = __webpack_require__(748);
+utils.define = __webpack_require__(729);
+utils.isObject = __webpack_require__(747);
 
 
 utils.isString = function(val) {
@@ -91806,7 +91731,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 801 */
+/* 800 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -91815,14 +91740,14 @@ module.exports = utils;
  */
 
 if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(802);
+  module.exports = __webpack_require__(801);
 } else {
-  module.exports = __webpack_require__(805);
+  module.exports = __webpack_require__(804);
 }
 
 
 /***/ }),
-/* 802 */
+/* 801 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -91831,7 +91756,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(803);
+exports = module.exports = __webpack_require__(802);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -92013,7 +91938,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 803 */
+/* 802 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -92029,7 +91954,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(804);
+exports.humanize = __webpack_require__(803);
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -92221,7 +92146,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 804 */
+/* 803 */
 /***/ (function(module, exports) {
 
 /**
@@ -92379,7 +92304,7 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 805 */
+/* 804 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -92395,7 +92320,7 @@ var util = __webpack_require__(29);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(803);
+exports = module.exports = __webpack_require__(802);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -92574,7 +92499,7 @@ function createWritableStdioStream (fd) {
 
     case 'PIPE':
     case 'TCP':
-      var net = __webpack_require__(806);
+      var net = __webpack_require__(805);
       stream = new net.Socket({
         fd: fd,
         readable: false,
@@ -92633,13 +92558,13 @@ exports.enable(load());
 
 
 /***/ }),
-/* 806 */
+/* 805 */
 /***/ (function(module, exports) {
 
 module.exports = require("net");
 
 /***/ }),
-/* 807 */
+/* 806 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -92649,9 +92574,9 @@ module.exports = require("net");
  * Module dependencies
  */
 
-exports.extend = __webpack_require__(738);
-exports.SourceMap = __webpack_require__(808);
-exports.sourceMapResolve = __webpack_require__(819);
+exports.extend = __webpack_require__(737);
+exports.SourceMap = __webpack_require__(807);
+exports.sourceMapResolve = __webpack_require__(818);
 
 /**
  * Convert backslash in the given string to forward slashes
@@ -92694,7 +92619,7 @@ exports.last = function(arr, n) {
 
 
 /***/ }),
-/* 808 */
+/* 807 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -92702,13 +92627,13 @@ exports.last = function(arr, n) {
  * Licensed under the New BSD license. See LICENSE.txt or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
-exports.SourceMapGenerator = __webpack_require__(809).SourceMapGenerator;
-exports.SourceMapConsumer = __webpack_require__(815).SourceMapConsumer;
-exports.SourceNode = __webpack_require__(818).SourceNode;
+exports.SourceMapGenerator = __webpack_require__(808).SourceMapGenerator;
+exports.SourceMapConsumer = __webpack_require__(814).SourceMapConsumer;
+exports.SourceNode = __webpack_require__(817).SourceNode;
 
 
 /***/ }),
-/* 809 */
+/* 808 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -92718,10 +92643,10 @@ exports.SourceNode = __webpack_require__(818).SourceNode;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var base64VLQ = __webpack_require__(810);
-var util = __webpack_require__(812);
-var ArraySet = __webpack_require__(813).ArraySet;
-var MappingList = __webpack_require__(814).MappingList;
+var base64VLQ = __webpack_require__(809);
+var util = __webpack_require__(811);
+var ArraySet = __webpack_require__(812).ArraySet;
+var MappingList = __webpack_require__(813).MappingList;
 
 /**
  * An instance of the SourceMapGenerator represents a source map which is
@@ -93130,7 +93055,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
 
 
 /***/ }),
-/* 810 */
+/* 809 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93170,7 +93095,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-var base64 = __webpack_require__(811);
+var base64 = __webpack_require__(810);
 
 // A single base 64 digit can contain 6 bits of data. For the base 64 variable
 // length quantities we use in the source map spec, the first bit is the sign,
@@ -93276,7 +93201,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
 
 
 /***/ }),
-/* 811 */
+/* 810 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93349,7 +93274,7 @@ exports.decode = function (charCode) {
 
 
 /***/ }),
-/* 812 */
+/* 811 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93772,7 +93697,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
 
 
 /***/ }),
-/* 813 */
+/* 812 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93782,7 +93707,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(812);
+var util = __webpack_require__(811);
 var has = Object.prototype.hasOwnProperty;
 var hasNativeMap = typeof Map !== "undefined";
 
@@ -93899,7 +93824,7 @@ exports.ArraySet = ArraySet;
 
 
 /***/ }),
-/* 814 */
+/* 813 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93909,7 +93834,7 @@ exports.ArraySet = ArraySet;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(812);
+var util = __webpack_require__(811);
 
 /**
  * Determine whether mappingB is after mappingA with respect to generated
@@ -93984,7 +93909,7 @@ exports.MappingList = MappingList;
 
 
 /***/ }),
-/* 815 */
+/* 814 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -93994,11 +93919,11 @@ exports.MappingList = MappingList;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(812);
-var binarySearch = __webpack_require__(816);
-var ArraySet = __webpack_require__(813).ArraySet;
-var base64VLQ = __webpack_require__(810);
-var quickSort = __webpack_require__(817).quickSort;
+var util = __webpack_require__(811);
+var binarySearch = __webpack_require__(815);
+var ArraySet = __webpack_require__(812).ArraySet;
+var base64VLQ = __webpack_require__(809);
+var quickSort = __webpack_require__(816).quickSort;
 
 function SourceMapConsumer(aSourceMap) {
   var sourceMap = aSourceMap;
@@ -95072,7 +94997,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
 
 
 /***/ }),
-/* 816 */
+/* 815 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -95189,7 +95114,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
 
 
 /***/ }),
-/* 817 */
+/* 816 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -95309,7 +95234,7 @@ exports.quickSort = function (ary, comparator) {
 
 
 /***/ }),
-/* 818 */
+/* 817 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -95319,8 +95244,8 @@ exports.quickSort = function (ary, comparator) {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var SourceMapGenerator = __webpack_require__(809).SourceMapGenerator;
-var util = __webpack_require__(812);
+var SourceMapGenerator = __webpack_require__(808).SourceMapGenerator;
+var util = __webpack_require__(811);
 
 // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
 // operating systems these days (capturing the result).
@@ -95728,17 +95653,17 @@ exports.SourceNode = SourceNode;
 
 
 /***/ }),
-/* 819 */
+/* 818 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014, 2015, 2016, 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var sourceMappingURL   = __webpack_require__(820)
-var resolveUrl         = __webpack_require__(821)
-var decodeUriComponent = __webpack_require__(822)
-var urix               = __webpack_require__(824)
-var atob               = __webpack_require__(825)
+var sourceMappingURL   = __webpack_require__(819)
+var resolveUrl         = __webpack_require__(820)
+var decodeUriComponent = __webpack_require__(821)
+var urix               = __webpack_require__(823)
+var atob               = __webpack_require__(824)
 
 
 
@@ -96036,7 +95961,7 @@ module.exports = {
 
 
 /***/ }),
-/* 820 */
+/* 819 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
@@ -96099,7 +96024,7 @@ void (function(root, factory) {
 
 
 /***/ }),
-/* 821 */
+/* 820 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
@@ -96117,13 +96042,13 @@ module.exports = resolveUrl
 
 
 /***/ }),
-/* 822 */
+/* 821 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var decodeUriComponent = __webpack_require__(823)
+var decodeUriComponent = __webpack_require__(822)
 
 function customDecodeUriComponent(string) {
   // `decodeUriComponent` turns `+` into ` `, but that's not wanted.
@@ -96134,7 +96059,7 @@ module.exports = customDecodeUriComponent
 
 
 /***/ }),
-/* 823 */
+/* 822 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96235,7 +96160,7 @@ module.exports = function (encodedURI) {
 
 
 /***/ }),
-/* 824 */
+/* 823 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
@@ -96258,7 +96183,7 @@ module.exports = urix
 
 
 /***/ }),
-/* 825 */
+/* 824 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96272,7 +96197,7 @@ module.exports = atob.atob = atob;
 
 
 /***/ }),
-/* 826 */
+/* 825 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96280,8 +96205,8 @@ module.exports = atob.atob = atob;
 
 var fs = __webpack_require__(23);
 var path = __webpack_require__(16);
-var define = __webpack_require__(730);
-var utils = __webpack_require__(807);
+var define = __webpack_require__(729);
+var utils = __webpack_require__(806);
 
 /**
  * Expose `mixin()`.
@@ -96424,19 +96349,19 @@ exports.comment = function(node) {
 
 
 /***/ }),
-/* 827 */
+/* 826 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(799);
+var use = __webpack_require__(798);
 var util = __webpack_require__(29);
-var Cache = __webpack_require__(828);
-var define = __webpack_require__(730);
-var debug = __webpack_require__(801)('snapdragon:parser');
-var Position = __webpack_require__(829);
-var utils = __webpack_require__(807);
+var Cache = __webpack_require__(827);
+var define = __webpack_require__(729);
+var debug = __webpack_require__(800)('snapdragon:parser');
+var Position = __webpack_require__(828);
+var utils = __webpack_require__(806);
 
 /**
  * Create a new `Parser` with the given `input` and `options`.
@@ -96964,7 +96889,7 @@ module.exports = Parser;
 
 
 /***/ }),
-/* 828 */
+/* 827 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97071,13 +96996,13 @@ MapCache.prototype.del = function mapDelete(key) {
 
 
 /***/ }),
-/* 829 */
+/* 828 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(730);
+var define = __webpack_require__(729);
 
 /**
  * Store position for a node
@@ -97092,16 +97017,16 @@ module.exports = function Position(start, parser) {
 
 
 /***/ }),
-/* 830 */
+/* 829 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var safe = __webpack_require__(831);
-var define = __webpack_require__(837);
-var extend = __webpack_require__(838);
-var not = __webpack_require__(840);
+var safe = __webpack_require__(830);
+var define = __webpack_require__(836);
+var extend = __webpack_require__(837);
+var not = __webpack_require__(839);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -97254,10 +97179,10 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 831 */
+/* 830 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(832);
+var parse = __webpack_require__(831);
 var types = parse.types;
 
 module.exports = function (re, opts) {
@@ -97303,13 +97228,13 @@ function isRegExp (x) {
 
 
 /***/ }),
-/* 832 */
+/* 831 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var util      = __webpack_require__(833);
-var types     = __webpack_require__(834);
-var sets      = __webpack_require__(835);
-var positions = __webpack_require__(836);
+var util      = __webpack_require__(832);
+var types     = __webpack_require__(833);
+var sets      = __webpack_require__(834);
+var positions = __webpack_require__(835);
 
 
 module.exports = function(regexpStr) {
@@ -97591,11 +97516,11 @@ module.exports.types = types;
 
 
 /***/ }),
-/* 833 */
+/* 832 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(834);
-var sets  = __webpack_require__(835);
+var types = __webpack_require__(833);
+var sets  = __webpack_require__(834);
 
 
 // All of these are private and only used by randexp.
@@ -97708,7 +97633,7 @@ exports.error = function(regexp, msg) {
 
 
 /***/ }),
-/* 834 */
+/* 833 */
 /***/ (function(module, exports) {
 
 module.exports = {
@@ -97724,10 +97649,10 @@ module.exports = {
 
 
 /***/ }),
-/* 835 */
+/* 834 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(834);
+var types = __webpack_require__(833);
 
 var INTS = function() {
  return [{ type: types.RANGE , from: 48, to: 57 }];
@@ -97812,10 +97737,10 @@ exports.anyChar = function() {
 
 
 /***/ }),
-/* 836 */
+/* 835 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(834);
+var types = __webpack_require__(833);
 
 exports.wordBoundary = function() {
   return { type: types.POSITION, value: 'b' };
@@ -97835,7 +97760,7 @@ exports.end = function() {
 
 
 /***/ }),
-/* 837 */
+/* 836 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97848,8 +97773,8 @@ exports.end = function() {
 
 
 
-var isobject = __webpack_require__(748);
-var isDescriptor = __webpack_require__(760);
+var isobject = __webpack_require__(747);
+var isDescriptor = __webpack_require__(759);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -97880,14 +97805,14 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 838 */
+/* 837 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(839);
-var assignSymbols = __webpack_require__(749);
+var isExtendable = __webpack_require__(838);
+var assignSymbols = __webpack_require__(748);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -97947,7 +97872,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 839 */
+/* 838 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97960,7 +97885,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(747);
+var isPlainObject = __webpack_require__(746);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -97968,14 +97893,14 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 840 */
+/* 839 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(838);
-var safe = __webpack_require__(831);
+var extend = __webpack_require__(837);
+var safe = __webpack_require__(830);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -98047,14 +97972,14 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 841 */
+/* 840 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var nanomatch = __webpack_require__(842);
-var extglob = __webpack_require__(857);
+var nanomatch = __webpack_require__(841);
+var extglob = __webpack_require__(856);
 
 module.exports = function(snapdragon) {
   var compilers = snapdragon.compiler.compilers;
@@ -98131,7 +98056,7 @@ function escapeExtglobs(compiler) {
 
 
 /***/ }),
-/* 842 */
+/* 841 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98142,17 +98067,17 @@ function escapeExtglobs(compiler) {
  */
 
 var util = __webpack_require__(29);
-var toRegex = __webpack_require__(729);
-var extend = __webpack_require__(843);
+var toRegex = __webpack_require__(728);
+var extend = __webpack_require__(842);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(845);
-var parsers = __webpack_require__(846);
-var cache = __webpack_require__(849);
-var utils = __webpack_require__(851);
+var compilers = __webpack_require__(844);
+var parsers = __webpack_require__(845);
+var cache = __webpack_require__(848);
+var utils = __webpack_require__(850);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -98976,14 +98901,14 @@ module.exports = nanomatch;
 
 
 /***/ }),
-/* 843 */
+/* 842 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(844);
-var assignSymbols = __webpack_require__(749);
+var isExtendable = __webpack_require__(843);
+var assignSymbols = __webpack_require__(748);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -99043,7 +98968,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 844 */
+/* 843 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99056,7 +98981,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(747);
+var isPlainObject = __webpack_require__(746);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -99064,7 +98989,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 845 */
+/* 844 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99410,15 +99335,15 @@ module.exports = function(nanomatch, options) {
 
 
 /***/ }),
-/* 846 */
+/* 845 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regexNot = __webpack_require__(740);
-var toRegex = __webpack_require__(729);
-var isOdd = __webpack_require__(847);
+var regexNot = __webpack_require__(739);
+var toRegex = __webpack_require__(728);
+var isOdd = __webpack_require__(846);
 
 /**
  * Characters to use in negation regex (we want to "not" match
@@ -99804,7 +99729,7 @@ module.exports.not = NOT_REGEX;
 
 
 /***/ }),
-/* 847 */
+/* 846 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99817,7 +99742,7 @@ module.exports.not = NOT_REGEX;
 
 
 
-var isNumber = __webpack_require__(848);
+var isNumber = __webpack_require__(847);
 
 module.exports = function isOdd(i) {
   if (!isNumber(i)) {
@@ -99831,7 +99756,7 @@ module.exports = function isOdd(i) {
 
 
 /***/ }),
-/* 848 */
+/* 847 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99859,14 +99784,14 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 849 */
+/* 848 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(850))();
+module.exports = new (__webpack_require__(849))();
 
 
 /***/ }),
-/* 850 */
+/* 849 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99879,7 +99804,7 @@ module.exports = new (__webpack_require__(850))();
 
 
 
-var MapCache = __webpack_require__(828);
+var MapCache = __webpack_require__(827);
 
 /**
  * Create a new `FragmentCache` with an optional object to use for `caches`.
@@ -100001,7 +99926,7 @@ exports = module.exports = FragmentCache;
 
 
 /***/ }),
-/* 851 */
+/* 850 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100014,14 +99939,14 @@ var path = __webpack_require__(16);
  * Module dependencies
  */
 
-var isWindows = __webpack_require__(852)();
-var Snapdragon = __webpack_require__(768);
-utils.define = __webpack_require__(853);
-utils.diff = __webpack_require__(854);
-utils.extend = __webpack_require__(843);
-utils.pick = __webpack_require__(855);
-utils.typeOf = __webpack_require__(856);
-utils.unique = __webpack_require__(741);
+var isWindows = __webpack_require__(851)();
+var Snapdragon = __webpack_require__(767);
+utils.define = __webpack_require__(852);
+utils.diff = __webpack_require__(853);
+utils.extend = __webpack_require__(842);
+utils.pick = __webpack_require__(854);
+utils.typeOf = __webpack_require__(855);
+utils.unique = __webpack_require__(740);
 
 /**
  * Returns true if the given value is effectively an empty string
@@ -100387,7 +100312,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 852 */
+/* 851 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -100415,7 +100340,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 /***/ }),
-/* 853 */
+/* 852 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100428,8 +100353,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 
-var isobject = __webpack_require__(748);
-var isDescriptor = __webpack_require__(760);
+var isobject = __webpack_require__(747);
+var isDescriptor = __webpack_require__(759);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -100460,7 +100385,7 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 854 */
+/* 853 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100514,7 +100439,7 @@ function diffArray(one, two) {
 
 
 /***/ }),
-/* 855 */
+/* 854 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100527,7 +100452,7 @@ function diffArray(one, two) {
 
 
 
-var isObject = __webpack_require__(748);
+var isObject = __webpack_require__(747);
 
 module.exports = function pick(obj, keys) {
   if (!isObject(obj) && typeof obj !== 'function') {
@@ -100556,7 +100481,7 @@ module.exports = function pick(obj, keys) {
 
 
 /***/ }),
-/* 856 */
+/* 855 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -100691,7 +100616,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 857 */
+/* 856 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100701,18 +100626,18 @@ function isBuffer(val) {
  * Module dependencies
  */
 
-var extend = __webpack_require__(738);
-var unique = __webpack_require__(741);
-var toRegex = __webpack_require__(729);
+var extend = __webpack_require__(737);
+var unique = __webpack_require__(740);
+var toRegex = __webpack_require__(728);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(858);
-var parsers = __webpack_require__(864);
-var Extglob = __webpack_require__(867);
-var utils = __webpack_require__(866);
+var compilers = __webpack_require__(857);
+var parsers = __webpack_require__(863);
+var Extglob = __webpack_require__(866);
+var utils = __webpack_require__(865);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -101029,13 +100954,13 @@ module.exports = extglob;
 
 
 /***/ }),
-/* 858 */
+/* 857 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(859);
+var brackets = __webpack_require__(858);
 
 /**
  * Extglob compilers
@@ -101205,7 +101130,7 @@ module.exports = function(extglob) {
 
 
 /***/ }),
-/* 859 */
+/* 858 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101215,17 +101140,17 @@ module.exports = function(extglob) {
  * Local dependencies
  */
 
-var compilers = __webpack_require__(860);
-var parsers = __webpack_require__(862);
+var compilers = __webpack_require__(859);
+var parsers = __webpack_require__(861);
 
 /**
  * Module dependencies
  */
 
-var debug = __webpack_require__(801)('expand-brackets');
-var extend = __webpack_require__(738);
-var Snapdragon = __webpack_require__(768);
-var toRegex = __webpack_require__(729);
+var debug = __webpack_require__(800)('expand-brackets');
+var extend = __webpack_require__(737);
+var Snapdragon = __webpack_require__(767);
+var toRegex = __webpack_require__(728);
 
 /**
  * Parses the given POSIX character class `pattern` and returns a
@@ -101423,13 +101348,13 @@ module.exports = brackets;
 
 
 /***/ }),
-/* 860 */
+/* 859 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var posix = __webpack_require__(861);
+var posix = __webpack_require__(860);
 
 module.exports = function(brackets) {
   brackets.compiler
@@ -101517,7 +101442,7 @@ module.exports = function(brackets) {
 
 
 /***/ }),
-/* 861 */
+/* 860 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101546,14 +101471,14 @@ module.exports = {
 
 
 /***/ }),
-/* 862 */
+/* 861 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(863);
-var define = __webpack_require__(730);
+var utils = __webpack_require__(862);
+var define = __webpack_require__(729);
 
 /**
  * Text regex
@@ -101772,14 +101697,14 @@ module.exports.TEXT_REGEX = TEXT_REGEX;
 
 
 /***/ }),
-/* 863 */
+/* 862 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var toRegex = __webpack_require__(729);
-var regexNot = __webpack_require__(740);
+var toRegex = __webpack_require__(728);
+var regexNot = __webpack_require__(739);
 var cached;
 
 /**
@@ -101813,15 +101738,15 @@ exports.createRegex = function(pattern, include) {
 
 
 /***/ }),
-/* 864 */
+/* 863 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(859);
-var define = __webpack_require__(865);
-var utils = __webpack_require__(866);
+var brackets = __webpack_require__(858);
+var define = __webpack_require__(864);
+var utils = __webpack_require__(865);
 
 /**
  * Characters to use in text regex (we want to "not" match
@@ -101976,7 +101901,7 @@ module.exports = parsers;
 
 
 /***/ }),
-/* 865 */
+/* 864 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101989,7 +101914,7 @@ module.exports = parsers;
 
 
 
-var isDescriptor = __webpack_require__(760);
+var isDescriptor = __webpack_require__(759);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -102014,14 +101939,14 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 866 */
+/* 865 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regex = __webpack_require__(740);
-var Cache = __webpack_require__(850);
+var regex = __webpack_require__(739);
+var Cache = __webpack_require__(849);
 
 /**
  * Utils
@@ -102090,7 +102015,7 @@ utils.createRegex = function(str) {
 
 
 /***/ }),
-/* 867 */
+/* 866 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102100,16 +102025,16 @@ utils.createRegex = function(str) {
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(768);
-var define = __webpack_require__(865);
-var extend = __webpack_require__(738);
+var Snapdragon = __webpack_require__(767);
+var define = __webpack_require__(864);
+var extend = __webpack_require__(737);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(858);
-var parsers = __webpack_require__(864);
+var compilers = __webpack_require__(857);
+var parsers = __webpack_require__(863);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -102175,16 +102100,16 @@ module.exports = Extglob;
 
 
 /***/ }),
-/* 868 */
+/* 867 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extglob = __webpack_require__(857);
-var nanomatch = __webpack_require__(842);
-var regexNot = __webpack_require__(740);
-var toRegex = __webpack_require__(830);
+var extglob = __webpack_require__(856);
+var nanomatch = __webpack_require__(841);
+var regexNot = __webpack_require__(739);
+var toRegex = __webpack_require__(829);
 var not;
 
 /**
@@ -102265,14 +102190,14 @@ function textRegex(pattern) {
 
 
 /***/ }),
-/* 869 */
+/* 868 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(850))();
+module.exports = new (__webpack_require__(849))();
 
 
 /***/ }),
-/* 870 */
+/* 869 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102285,13 +102210,13 @@ var path = __webpack_require__(16);
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(768);
-utils.define = __webpack_require__(837);
-utils.diff = __webpack_require__(854);
-utils.extend = __webpack_require__(838);
-utils.pick = __webpack_require__(855);
-utils.typeOf = __webpack_require__(871);
-utils.unique = __webpack_require__(741);
+var Snapdragon = __webpack_require__(767);
+utils.define = __webpack_require__(836);
+utils.diff = __webpack_require__(853);
+utils.extend = __webpack_require__(837);
+utils.pick = __webpack_require__(854);
+utils.typeOf = __webpack_require__(870);
+utils.unique = __webpack_require__(740);
 
 /**
  * Returns true if the platform is windows, or `path.sep` is `\\`.
@@ -102588,7 +102513,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 871 */
+/* 870 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -102723,7 +102648,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 872 */
+/* 871 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102742,9 +102667,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(873);
-var reader_1 = __webpack_require__(886);
-var fs_stream_1 = __webpack_require__(890);
+var readdir = __webpack_require__(872);
+var reader_1 = __webpack_require__(885);
+var fs_stream_1 = __webpack_require__(889);
 var ReaderAsync = /** @class */ (function (_super) {
     __extends(ReaderAsync, _super);
     function ReaderAsync() {
@@ -102805,15 +102730,15 @@ exports.default = ReaderAsync;
 
 
 /***/ }),
-/* 873 */
+/* 872 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const readdirSync = __webpack_require__(874);
-const readdirAsync = __webpack_require__(882);
-const readdirStream = __webpack_require__(885);
+const readdirSync = __webpack_require__(873);
+const readdirAsync = __webpack_require__(881);
+const readdirStream = __webpack_require__(884);
 
 module.exports = exports = readdirAsyncPath;
 exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
@@ -102897,7 +102822,7 @@ function readdirStreamStat (dir, options) {
 
 
 /***/ }),
-/* 874 */
+/* 873 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102905,11 +102830,11 @@ function readdirStreamStat (dir, options) {
 
 module.exports = readdirSync;
 
-const DirectoryReader = __webpack_require__(875);
+const DirectoryReader = __webpack_require__(874);
 
 let syncFacade = {
-  fs: __webpack_require__(880),
-  forEach: __webpack_require__(881),
+  fs: __webpack_require__(879),
+  forEach: __webpack_require__(880),
   sync: true
 };
 
@@ -102938,7 +102863,7 @@ function readdirSync (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 875 */
+/* 874 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102947,9 +102872,9 @@ function readdirSync (dir, options, internalOptions) {
 const Readable = __webpack_require__(27).Readable;
 const EventEmitter = __webpack_require__(379).EventEmitter;
 const path = __webpack_require__(16);
-const normalizeOptions = __webpack_require__(876);
-const stat = __webpack_require__(878);
-const call = __webpack_require__(879);
+const normalizeOptions = __webpack_require__(875);
+const stat = __webpack_require__(877);
+const call = __webpack_require__(878);
 
 /**
  * Asynchronously reads the contents of a directory and streams the results
@@ -103325,14 +103250,14 @@ module.exports = DirectoryReader;
 
 
 /***/ }),
-/* 876 */
+/* 875 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(16);
-const globToRegExp = __webpack_require__(877);
+const globToRegExp = __webpack_require__(876);
 
 module.exports = normalizeOptions;
 
@@ -103509,7 +103434,7 @@ function normalizeOptions (options, internalOptions) {
 
 
 /***/ }),
-/* 877 */
+/* 876 */
 /***/ (function(module, exports) {
 
 module.exports = function (glob, opts) {
@@ -103646,13 +103571,13 @@ module.exports = function (glob, opts) {
 
 
 /***/ }),
-/* 878 */
+/* 877 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const call = __webpack_require__(879);
+const call = __webpack_require__(878);
 
 module.exports = stat;
 
@@ -103727,7 +103652,7 @@ function symlinkStat (fs, path, lstats, callback) {
 
 
 /***/ }),
-/* 879 */
+/* 878 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103788,14 +103713,14 @@ function callOnce (fn) {
 
 
 /***/ }),
-/* 880 */
+/* 879 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const fs = __webpack_require__(23);
-const call = __webpack_require__(879);
+const call = __webpack_require__(878);
 
 /**
  * A facade around {@link fs.readdirSync} that allows it to be called
@@ -103859,7 +103784,7 @@ exports.lstat = function (path, callback) {
 
 
 /***/ }),
-/* 881 */
+/* 880 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103888,7 +103813,7 @@ function syncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 882 */
+/* 881 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103896,12 +103821,12 @@ function syncForEach (array, iterator, done) {
 
 module.exports = readdirAsync;
 
-const maybe = __webpack_require__(883);
-const DirectoryReader = __webpack_require__(875);
+const maybe = __webpack_require__(882);
+const DirectoryReader = __webpack_require__(874);
 
 let asyncFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(884),
+  forEach: __webpack_require__(883),
   async: true
 };
 
@@ -103943,7 +103868,7 @@ function readdirAsync (dir, options, callback, internalOptions) {
 
 
 /***/ }),
-/* 883 */
+/* 882 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103970,7 +103895,7 @@ module.exports = function maybe (cb, promise) {
 
 
 /***/ }),
-/* 884 */
+/* 883 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104006,7 +103931,7 @@ function asyncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 885 */
+/* 884 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104014,11 +103939,11 @@ function asyncForEach (array, iterator, done) {
 
 module.exports = readdirStream;
 
-const DirectoryReader = __webpack_require__(875);
+const DirectoryReader = __webpack_require__(874);
 
 let streamFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(884),
+  forEach: __webpack_require__(883),
   async: true
 };
 
@@ -104038,16 +103963,16 @@ function readdirStream (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 886 */
+/* 885 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var deep_1 = __webpack_require__(887);
-var entry_1 = __webpack_require__(889);
-var pathUtil = __webpack_require__(888);
+var deep_1 = __webpack_require__(886);
+var entry_1 = __webpack_require__(888);
+var pathUtil = __webpack_require__(887);
 var Reader = /** @class */ (function () {
     function Reader(options) {
         this.options = options;
@@ -104113,14 +104038,14 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 887 */
+/* 886 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(888);
-var patternUtils = __webpack_require__(722);
+var pathUtils = __webpack_require__(887);
+var patternUtils = __webpack_require__(721);
 var DeepFilter = /** @class */ (function () {
     function DeepFilter(options, micromatchOptions) {
         this.options = options;
@@ -104203,7 +104128,7 @@ exports.default = DeepFilter;
 
 
 /***/ }),
-/* 888 */
+/* 887 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104234,14 +104159,14 @@ exports.makeAbsolute = makeAbsolute;
 
 
 /***/ }),
-/* 889 */
+/* 888 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(888);
-var patternUtils = __webpack_require__(722);
+var pathUtils = __webpack_require__(887);
+var patternUtils = __webpack_require__(721);
 var EntryFilter = /** @class */ (function () {
     function EntryFilter(options, micromatchOptions) {
         this.options = options;
@@ -104326,7 +104251,7 @@ exports.default = EntryFilter;
 
 
 /***/ }),
-/* 890 */
+/* 889 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104346,8 +104271,8 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(27);
-var fsStat = __webpack_require__(891);
-var fs_1 = __webpack_require__(895);
+var fsStat = __webpack_require__(890);
+var fs_1 = __webpack_require__(894);
 var FileSystemStream = /** @class */ (function (_super) {
     __extends(FileSystemStream, _super);
     function FileSystemStream() {
@@ -104397,14 +104322,14 @@ exports.default = FileSystemStream;
 
 
 /***/ }),
-/* 891 */
+/* 890 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(892);
-const statProvider = __webpack_require__(894);
+const optionsManager = __webpack_require__(891);
+const statProvider = __webpack_require__(893);
 /**
  * Asynchronous API.
  */
@@ -104435,13 +104360,13 @@ exports.statSync = statSync;
 
 
 /***/ }),
-/* 892 */
+/* 891 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(893);
+const fsAdapter = __webpack_require__(892);
 function prepare(opts) {
     const options = Object.assign({
         fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
@@ -104454,7 +104379,7 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 893 */
+/* 892 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104477,7 +104402,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter;
 
 
 /***/ }),
-/* 894 */
+/* 893 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104529,7 +104454,7 @@ exports.isFollowedSymlink = isFollowedSymlink;
 
 
 /***/ }),
-/* 895 */
+/* 894 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104560,7 +104485,7 @@ exports.default = FileSystem;
 
 
 /***/ }),
-/* 896 */
+/* 895 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104580,9 +104505,9 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(27);
-var readdir = __webpack_require__(873);
-var reader_1 = __webpack_require__(886);
-var fs_stream_1 = __webpack_require__(890);
+var readdir = __webpack_require__(872);
+var reader_1 = __webpack_require__(885);
+var fs_stream_1 = __webpack_require__(889);
 var TransformStream = /** @class */ (function (_super) {
     __extends(TransformStream, _super);
     function TransformStream(reader) {
@@ -104650,7 +104575,7 @@ exports.default = ReaderStream;
 
 
 /***/ }),
-/* 897 */
+/* 896 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104669,9 +104594,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(873);
-var reader_1 = __webpack_require__(886);
-var fs_sync_1 = __webpack_require__(898);
+var readdir = __webpack_require__(872);
+var reader_1 = __webpack_require__(885);
+var fs_sync_1 = __webpack_require__(897);
 var ReaderSync = /** @class */ (function (_super) {
     __extends(ReaderSync, _super);
     function ReaderSync() {
@@ -104731,7 +104656,7 @@ exports.default = ReaderSync;
 
 
 /***/ }),
-/* 898 */
+/* 897 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104750,8 +104675,8 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var fsStat = __webpack_require__(891);
-var fs_1 = __webpack_require__(895);
+var fsStat = __webpack_require__(890);
+var fs_1 = __webpack_require__(894);
 var FileSystemSync = /** @class */ (function (_super) {
     __extends(FileSystemSync, _super);
     function FileSystemSync() {
@@ -104797,7 +104722,7 @@ exports.default = FileSystemSync;
 
 
 /***/ }),
-/* 899 */
+/* 898 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104813,13 +104738,13 @@ exports.flatten = flatten;
 
 
 /***/ }),
-/* 900 */
+/* 899 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var merge2 = __webpack_require__(589);
+var merge2 = __webpack_require__(588);
 /**
  * Merge multiple streams and propagate their errors into one stream in parallel.
  */
@@ -104834,13 +104759,13 @@ exports.merge = merge;
 
 
 /***/ }),
-/* 901 */
+/* 900 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const pathType = __webpack_require__(902);
+const pathType = __webpack_require__(901);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -104906,13 +104831,13 @@ module.exports.sync = (input, opts) => {
 
 
 /***/ }),
-/* 902 */
+/* 901 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const pify = __webpack_require__(903);
+const pify = __webpack_require__(902);
 
 function type(fn, fn2, fp) {
 	if (typeof fp !== 'string') {
@@ -104955,7 +104880,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 
 /***/ }),
-/* 903 */
+/* 902 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105046,17 +104971,17 @@ module.exports = (obj, opts) => {
 
 
 /***/ }),
-/* 904 */
+/* 903 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const fastGlob = __webpack_require__(718);
-const gitIgnore = __webpack_require__(905);
-const pify = __webpack_require__(906);
-const slash = __webpack_require__(907);
+const fastGlob = __webpack_require__(717);
+const gitIgnore = __webpack_require__(904);
+const pify = __webpack_require__(905);
+const slash = __webpack_require__(906);
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -105154,7 +105079,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 905 */
+/* 904 */
 /***/ (function(module, exports) {
 
 // A simple implementation of make-array
@@ -105623,7 +105548,7 @@ module.exports = options => new IgnoreBase(options)
 
 
 /***/ }),
-/* 906 */
+/* 905 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105698,7 +105623,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 907 */
+/* 906 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105716,17 +105641,17 @@ module.exports = input => {
 
 
 /***/ }),
-/* 908 */
+/* 907 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
 const {constants: fsConstants} = __webpack_require__(23);
-const pEvent = __webpack_require__(909);
-const CpFileError = __webpack_require__(912);
-const fs = __webpack_require__(916);
-const ProgressEmitter = __webpack_require__(919);
+const pEvent = __webpack_require__(908);
+const CpFileError = __webpack_require__(911);
+const fs = __webpack_require__(915);
+const ProgressEmitter = __webpack_require__(918);
 
 const cpFileAsync = async (source, destination, options, progressEmitter) => {
 	let readError;
@@ -105840,12 +105765,12 @@ module.exports.sync = (source, destination, options) => {
 
 
 /***/ }),
-/* 909 */
+/* 908 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pTimeout = __webpack_require__(910);
+const pTimeout = __webpack_require__(909);
 
 const symbolAsyncIterator = Symbol.asyncIterator || '@@asyncIterator';
 
@@ -106136,12 +106061,12 @@ module.exports.iterator = (emitter, event, options) => {
 
 
 /***/ }),
-/* 910 */
+/* 909 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const pFinally = __webpack_require__(911);
+const pFinally = __webpack_require__(910);
 
 class TimeoutError extends Error {
 	constructor(message) {
@@ -106187,7 +106112,7 @@ module.exports.TimeoutError = TimeoutError;
 
 
 /***/ }),
-/* 911 */
+/* 910 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106209,12 +106134,12 @@ module.exports = (promise, onFinally) => {
 
 
 /***/ }),
-/* 912 */
+/* 911 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(913);
+const NestedError = __webpack_require__(912);
 
 class CpFileError extends NestedError {
 	constructor(message, nested) {
@@ -106228,10 +106153,10 @@ module.exports = CpFileError;
 
 
 /***/ }),
-/* 913 */
+/* 912 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var inherits = __webpack_require__(914);
+var inherits = __webpack_require__(913);
 
 var NestedError = function (message, nested) {
     this.nested = nested;
@@ -106282,7 +106207,7 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 914 */
+/* 913 */
 /***/ (function(module, exports, __webpack_require__) {
 
 try {
@@ -106290,12 +106215,12 @@ try {
   if (typeof util.inherits !== 'function') throw '';
   module.exports = util.inherits;
 } catch (e) {
-  module.exports = __webpack_require__(915);
+  module.exports = __webpack_require__(914);
 }
 
 
 /***/ }),
-/* 915 */
+/* 914 */
 /***/ (function(module, exports) {
 
 if (typeof Object.create === 'function') {
@@ -106324,16 +106249,16 @@ if (typeof Object.create === 'function') {
 
 
 /***/ }),
-/* 916 */
+/* 915 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const {promisify} = __webpack_require__(29);
 const fs = __webpack_require__(22);
-const makeDir = __webpack_require__(917);
-const pEvent = __webpack_require__(909);
-const CpFileError = __webpack_require__(912);
+const makeDir = __webpack_require__(916);
+const pEvent = __webpack_require__(908);
+const CpFileError = __webpack_require__(911);
 
 const stat = promisify(fs.stat);
 const lstat = promisify(fs.lstat);
@@ -106430,7 +106355,7 @@ exports.copyFileSync = (source, destination, flags) => {
 
 
 /***/ }),
-/* 917 */
+/* 916 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106438,7 +106363,7 @@ exports.copyFileSync = (source, destination, flags) => {
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
 const {promisify} = __webpack_require__(29);
-const semver = __webpack_require__(918);
+const semver = __webpack_require__(917);
 
 const defaults = {
 	mode: 0o777 & (~process.umask()),
@@ -106587,7 +106512,7 @@ module.exports.sync = (input, options) => {
 
 
 /***/ }),
-/* 918 */
+/* 917 */
 /***/ (function(module, exports) {
 
 exports = module.exports = SemVer
@@ -108189,7 +108114,7 @@ function coerce (version, options) {
 
 
 /***/ }),
-/* 919 */
+/* 918 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -108230,7 +108155,7 @@ module.exports = ProgressEmitter;
 
 
 /***/ }),
-/* 920 */
+/* 919 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -108276,12 +108201,12 @@ exports.default = module.exports;
 
 
 /***/ }),
-/* 921 */
+/* 920 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(922);
+const NestedError = __webpack_require__(921);
 
 class CpyError extends NestedError {
 	constructor(message, nested) {
@@ -108295,7 +108220,7 @@ module.exports = CpyError;
 
 
 /***/ }),
-/* 922 */
+/* 921 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var inherits = __webpack_require__(29).inherits;
@@ -108351,7 +108276,7 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 923 */
+/* 922 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
diff --git a/yarn.lock b/yarn.lock
index 20e33fdefc996..11abd95498c8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -61,7 +61,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.0.0", "@babel/core@^7.0.1", "@babel/core@^7.1.0", "@babel/core@^7.4.3", "@babel/core@^7.9.0":
+"@babel/core@^7.0.0", "@babel/core@^7.0.1", "@babel/core@^7.1.0", "@babel/core@^7.4.3", "@babel/core@^7.7.5", "@babel/core@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
   integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
@@ -83,7 +83,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.4.0", "@babel/generator@^7.5.5", "@babel/generator@^7.9.0":
+"@babel/generator@^7.0.0", "@babel/generator@^7.5.5", "@babel/generator@^7.9.0":
   version "7.9.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce"
   integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==
@@ -93,6 +93,16 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
+"@babel/generator@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
+  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
+  dependencies:
+    "@babel/types" "^7.9.5"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
@@ -183,6 +193,15 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/helper-function-name@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.9.5"
+
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
@@ -284,6 +303,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
   integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
 
+"@babel/helper-validator-identifier@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
@@ -312,7 +336,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.2.0", "@babel/parser@^7.4.3", "@babel/parser@^7.5.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.3":
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.2.0", "@babel/parser@^7.5.5", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.3":
   version "7.9.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
   integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
@@ -1101,7 +1125,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+"@babel/template@^7.0.0", "@babel/template@^7.4.4", "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
   integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
@@ -1110,7 +1134,7 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
   integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
@@ -1125,6 +1149,21 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
+"@babel/traverse@^7.7.4":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
+  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.5"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
 "@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
@@ -1134,6 +1173,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
+  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.5"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -1542,6 +1590,21 @@
   resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
   integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
 
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
+  integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==
+  dependencies:
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
+  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
+
 "@jest/console@^24.7.1":
   version "24.7.1"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
@@ -6109,12 +6172,12 @@ append-buffer@^1.0.2:
   dependencies:
     buffer-equal "^1.0.0"
 
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
+append-transform@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12"
+  integrity sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==
   dependencies:
-    default-require-extensions "^2.0.0"
+    default-require-extensions "^3.0.0"
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
@@ -6867,15 +6930,16 @@ babel-plugin-istanbul@^5.1.0:
     istanbul-lib-instrument "^3.0.0"
     test-exclude "^5.0.0"
 
-babel-plugin-istanbul@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
-  integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==
+babel-plugin-istanbul@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    find-up "^3.0.0"
-    istanbul-lib-instrument "^3.3.0"
-    test-exclude "^5.2.3"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^4.0.0"
+    test-exclude "^6.0.0"
 
 babel-plugin-jest-hoist@^24.9.0:
   version "24.9.0"
@@ -8129,15 +8193,15 @@ cachedir@2.3.0:
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
-caching-transform@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.2.tgz#601d46b91eca87687a281e71cef99791b0efca70"
-  integrity sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==
+caching-transform@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-4.0.0.tgz#00d297a4206d71e2163c39eaffa8157ac0651f0f"
+  integrity sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==
   dependencies:
-    hasha "^3.0.0"
-    make-dir "^2.0.0"
-    package-hash "^3.0.0"
-    write-file-atomic "^2.4.2"
+    hasha "^5.0.0"
+    make-dir "^3.0.0"
+    package-hash "^4.0.0"
+    write-file-atomic "^3.0.0"
 
 call-me-maybe@^1.0.1:
   version "1.0.1"
@@ -9564,7 +9628,7 @@ convert-source-map@^0.3.3:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
   integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA=
 
-convert-source-map@^1.5.1, convert-source-map@^1.6.0:
+convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
   integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
@@ -9768,17 +9832,6 @@ cosmiconfig@^5.2.0, cosmiconfig@^5.2.1:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
-cp-file@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d"
-  integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==
-  dependencies:
-    graceful-fs "^4.1.2"
-    make-dir "^2.0.0"
-    nested-error-stacks "^2.0.0"
-    pify "^4.0.1"
-    safe-buffer "^5.0.1"
-
 cp-file@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-7.0.0.tgz#b9454cfd07fe3b974ab9ea0e5f29655791a9b8cd"
@@ -9948,7 +10001,7 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^4, cross-spawn@^4.0.2:
+cross-spawn@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
   integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
@@ -10847,12 +10900,12 @@ default-gateway@^4.2.0:
     execa "^1.0.0"
     ip-regex "^2.1.0"
 
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
+default-require-extensions@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-3.0.0.tgz#e03f93aac9b2b6443fc52e5e4a37b3ad9ad8df96"
+  integrity sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==
   dependencies:
-    strip-bom "^3.0.0"
+    strip-bom "^4.0.0"
 
 default-resolution@^2.0.0:
   version "2.0.0"
@@ -13842,13 +13895,13 @@ foreachasync@^3.0.0:
   resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
   integrity sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=
 
-foreground-child@^1.5.6:
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
-  integrity sha1-T9ca0t/elnibmApcCilZN8svXOk=
+foreground-child@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
+  integrity sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==
   dependencies:
-    cross-spawn "^4"
-    signal-exit "^3.0.0"
+    cross-spawn "^7.0.0"
+    signal-exit "^3.0.2"
 
 forever-agent@~0.6.1:
   version "0.6.1"
@@ -13954,6 +14007,11 @@ from2@^2.1.0, from2@^2.1.1, from2@^2.3.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fromentries@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.2.0.tgz#e6aa06f240d6267f913cea422075ef88b63e7897"
+  integrity sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==
+
 front-matter@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.1.2.tgz#f75983b9f2f413be658c93dfd7bd8ce4078f5cdb"
@@ -15636,12 +15694,13 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
-hasha@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-3.0.0.tgz#52a32fab8569d41ca69a61ff1a214f8eb7c8bd39"
-  integrity sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk=
+hasha@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.0.tgz#33094d1f69c40a4a6ac7be53d5fe3ff95a269e0c"
+  integrity sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==
   dependencies:
-    is-stream "^1.0.1"
+    is-stream "^2.0.0"
+    type-fest "^0.8.0"
 
 hast-util-from-parse5@^5.0.0:
   version "5.0.0"
@@ -15845,6 +15904,11 @@ html-entities@^1.2.0, html-entities@^1.2.1:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
 html-loader@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.5.5.tgz#6356dbeb0c49756d8ebd5ca327f16ff06ab5faea"
@@ -17320,7 +17384,7 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.0"
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -17482,17 +17546,17 @@ istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba"
   integrity sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==
 
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.0.0-alpha.1:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
-istanbul-lib-hook@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
-  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
+istanbul-lib-hook@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz#8f84c9434888cc6b1d0a9d7092a76d239ebf0cc6"
+  integrity sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==
   dependencies:
-    append-transform "^1.0.0"
+    append-transform "^2.0.0"
 
 istanbul-lib-instrument@^1.7.3:
   version "1.10.2"
@@ -17520,18 +17584,31 @@ istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1:
     istanbul-lib-coverage "^2.0.3"
     semver "^5.5.0"
 
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
+  integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@babel/parser" "^7.7.5"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
+istanbul-lib-processinfo@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz#e1426514662244b2f25df728e8fd1ba35fe53b9c"
+  integrity sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==
   dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
+    archy "^1.0.0"
+    cross-spawn "^7.0.0"
+    istanbul-lib-coverage "^3.0.0-alpha.1"
+    make-dir "^3.0.0"
+    p-map "^3.0.0"
+    rimraf "^3.0.0"
+    uuid "^3.3.3"
 
 istanbul-lib-report@^2.0.4:
   version "2.0.4"
@@ -17542,14 +17619,14 @@ istanbul-lib-report@^2.0.4:
     make-dir "^1.3.0"
     supports-color "^6.0.0"
 
-istanbul-lib-report@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
+istanbul-lib-report@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
   dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^3.0.0"
+    supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^3.0.1:
   version "3.0.2"
@@ -17562,24 +17639,30 @@ istanbul-lib-source-maps@^3.0.1:
     rimraf "^2.6.2"
     source-map "^0.6.1"
 
-istanbul-lib-source-maps@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
+istanbul-lib-source-maps@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
+  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
   dependencies:
     debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
+    istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^2.2.4, istanbul-reports@^2.2.6:
+istanbul-reports@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
   integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
   dependencies:
     handlebars "^4.1.2"
 
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
 istanbul@^0.4.0:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
@@ -20121,13 +20204,6 @@ merge-source-map@1.0.4:
   dependencies:
     source-map "^0.5.6"
 
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
-  dependencies:
-    source-map "^0.6.1"
-
 merge-stream@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
@@ -21224,6 +21300,13 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
+node-preload@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
+  integrity sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==
+  dependencies:
+    process-on-spawn "^1.0.0"
+
 node-releases@^1.1.25, node-releases@^1.1.46:
   version "1.1.47"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4"
@@ -21490,36 +21573,37 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-nyc@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-14.1.1.tgz#151d64a6a9f9f5908a1b73233931e4a0a3075eeb"
-  integrity sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==
+nyc@^15.0.1:
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.0.1.tgz#bd4d5c2b17f2ec04370365a5ca1fc0ed26f9f93d"
+  integrity sha512-n0MBXYBYRqa67IVt62qW1r/d9UH/Qtr7SF1w/nQLJ9KxvWF6b2xCHImRAixHN9tnMMYHC2P14uo6KddNGwMgGg==
   dependencies:
-    archy "^1.0.0"
-    caching-transform "^3.0.2"
-    convert-source-map "^1.6.0"
-    cp-file "^6.2.0"
-    find-cache-dir "^2.1.0"
-    find-up "^3.0.0"
-    foreground-child "^1.5.6"
-    glob "^7.1.3"
-    istanbul-lib-coverage "^2.0.5"
-    istanbul-lib-hook "^2.0.7"
-    istanbul-lib-instrument "^3.3.0"
-    istanbul-lib-report "^2.0.8"
-    istanbul-lib-source-maps "^3.0.6"
-    istanbul-reports "^2.2.4"
-    js-yaml "^3.13.1"
-    make-dir "^2.1.0"
-    merge-source-map "^1.1.0"
-    resolve-from "^4.0.0"
-    rimraf "^2.6.3"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    caching-transform "^4.0.0"
+    convert-source-map "^1.7.0"
+    decamelize "^1.2.0"
+    find-cache-dir "^3.2.0"
+    find-up "^4.1.0"
+    foreground-child "^2.0.0"
+    glob "^7.1.6"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-hook "^3.0.0"
+    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-processinfo "^2.0.2"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.0.2"
+    make-dir "^3.0.0"
+    node-preload "^0.2.1"
+    p-map "^3.0.0"
+    process-on-spawn "^1.0.0"
+    resolve-from "^5.0.0"
+    rimraf "^3.0.0"
     signal-exit "^3.0.2"
-    spawn-wrap "^1.4.2"
-    test-exclude "^5.2.3"
-    uuid "^3.3.2"
-    yargs "^13.2.2"
-    yargs-parser "^13.0.0"
+    spawn-wrap "^2.0.0"
+    test-exclude "^6.0.0"
+    yargs "^15.0.2"
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
@@ -21958,7 +22042,7 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
@@ -22200,13 +22284,13 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-hash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-3.0.0.tgz#50183f2d36c9e3e528ea0a8605dff57ce976f88e"
-  integrity sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==
+package-hash@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-4.0.0.tgz#3537f654665ec3cc38827387fc904c163c54f506"
+  integrity sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==
   dependencies:
     graceful-fs "^4.1.15"
-    hasha "^3.0.0"
+    hasha "^5.0.0"
     lodash.flattendeep "^4.4.0"
     release-zalgo "^1.0.0"
 
@@ -23202,6 +23286,13 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+process-on-spawn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/process-on-spawn/-/process-on-spawn-1.0.0.tgz#95b05a23073d30a17acfdc92a440efd2baefdc93"
+  integrity sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==
+  dependencies:
+    fromentries "^1.2.0"
+
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -27207,17 +27298,17 @@ spawn-sync@^1.0.15:
     concat-stream "^1.4.7"
     os-shim "^0.1.2"
 
-spawn-wrap@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.2.tgz#cff58e73a8224617b6561abdc32586ea0c82248c"
-  integrity sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==
+spawn-wrap@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-2.0.0.tgz#103685b8b8f9b79771318827aa78650a610d457e"
+  integrity sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==
   dependencies:
-    foreground-child "^1.5.6"
-    mkdirp "^0.5.0"
-    os-homedir "^1.0.1"
-    rimraf "^2.6.2"
+    foreground-child "^2.0.0"
+    is-windows "^1.0.2"
+    make-dir "^3.0.0"
+    rimraf "^3.0.0"
     signal-exit "^3.0.2"
-    which "^1.3.0"
+    which "^2.0.1"
 
 spdx-compare@^0.1.2:
   version "0.1.2"
@@ -28536,7 +28627,7 @@ terser@^4.4.3:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-test-exclude@^5.0.0, test-exclude@^5.2.3:
+test-exclude@^5.0.0:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
   integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
@@ -28546,6 +28637,15 @@ test-exclude@^5.0.0, test-exclude@^5.2.3:
     read-pkg-up "^4.0.0"
     require-main-filename "^2.0.0"
 
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
@@ -29688,7 +29788,7 @@ type-fest@^0.6.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
-type-fest@^0.8.1:
+type-fest@^0.8.0, type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
@@ -29726,6 +29826,13 @@ typed-styles@^0.0.7:
   resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
   integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
 
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -30453,6 +30560,11 @@ uuid@^3.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
   integrity sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==
 
+uuid@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 v8-compile-cache@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
@@ -31713,6 +31825,16 @@ write-file-atomic@^2.4.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
 write-json-file@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a"
@@ -31954,7 +32076,7 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@13.1.2, yargs-parser@^13.0.0, yargs-parser@^13.1.0, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
+yargs-parser@13.1.2, yargs-parser@^13.1.0, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -32121,7 +32243,7 @@ yargs@^13.2.2, yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.1"
 
-yargs@^15.3.1:
+yargs@^15.0.2, yargs@^15.3.1:
   version "15.3.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
   integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==

From 97d1685c3dea682f80fd1a907bbc1d6f3702ea85 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 9 Apr 2020 23:18:18 -0400
Subject: [PATCH 07/36] Sharing saved-objects phase 1 (#54605)

Co-authored-by: kobelb <brandon.kobel@elastic.co>
---
 docs/api/saved-objects/bulk_create.asciidoc   |    2 +-
 .../kibana-plugin-core-public.savedobject.md  |    1 +
 ...ugin-core-public.savedobject.namespaces.md |   13 +
 ...in-core-server.isavedobjecttyperegistry.md |    2 +-
 .../core/server/kibana-plugin-core-server.md  |    3 +
 .../kibana-plugin-core-server.savedobject.md  |    1 +
 ...ugin-core-server.savedobject.namespaces.md |   13 +
 ...rver.savedobjectsaddtonamespacesoptions.md |   20 +
 ...edobjectsaddtonamespacesoptions.refresh.md |   13 +
 ...edobjectsaddtonamespacesoptions.version.md |   13 +
 ...rver.savedobjectsclient.addtonamespaces.md |   27 +
 ...savedobjectsclient.deletefromnamespaces.md |   27 +
 ...a-plugin-core-server.savedobjectsclient.md |    2 +
 ...savedobjectsdeletefromnamespacesoptions.md |   19 +
 ...ectsdeletefromnamespacesoptions.refresh.md |   13 +
 ...objectserrorhelpers.createconflicterror.md |   23 +
 ...pers.decorateescannotexecutescripterror.md |   23 +
 ...rorhelpers.isescannotexecutescripterror.md |   22 +
 ...in-core-server.savedobjectserrorhelpers.md |    3 +
 ...n-core-server.savedobjectsnamespacetype.md |   15 +
 ....savedobjectsrepository.addtonamespaces.md |   27 +
 ...dobjectsrepository.deletefromnamespaces.md |   27 +
 ...ugin-core-server.savedobjectsrepository.md |    2 +
 ...r.savedobjectsservicesetup.registertype.md |    2 +-
 ...ana-plugin-core-server.savedobjectstype.md |    3 +-
 ...rver.savedobjectstype.namespaceagnostic.md |    9 +-
 ...e-server.savedobjectstype.namespacetype.md |   13 +
 ...avedobjecttyperegistry.ismultinamespace.md |   24 +
 ...dobjecttyperegistry.isnamespaceagnostic.md |    2 +-
 ...vedobjecttyperegistry.issinglenamespace.md |   24 +
 ...gin-core-server.savedobjecttyperegistry.md |    4 +-
 src/core/public/public.api.md                 |    1 +
 src/core/server/index.ts                      |    3 +
 .../__snapshots__/utils.test.ts.snap          |   48 +-
 src/core/server/saved_objects/index.ts        |    1 +
 .../build_active_mappings.test.ts.snap        |    8 +
 .../migrations/core/build_active_mappings.ts  |    3 +
 .../migrations/core/index_migrator.test.ts    |    4 +
 .../kibana_migrator.test.ts.snap              |    4 +
 .../routes/integration_tests/import.test.ts   |    2 +-
 .../saved_objects_service.test.ts             |    4 +-
 .../saved_objects/saved_objects_service.ts    |    2 +-
 .../saved_objects_type_registry.mock.ts       |    6 +
 .../saved_objects_type_registry.test.ts       |   98 +-
 .../saved_objects_type_registry.ts            |   37 +-
 .../saved_objects/schema/schema.test.ts       |   98 +-
 .../server/saved_objects/schema/schema.ts     |   33 +-
 .../serialization/serializer.test.ts          | 1710 +++---
 .../saved_objects/serialization/serializer.ts |   15 +-
 .../saved_objects/serialization/types.ts      |    2 +
 .../lib/__snapshots__/repository.test.js.snap |    5 -
 .../service/lib/decorate_es_error.test.ts     |   32 +
 .../service/lib/decorate_es_error.ts          |   10 +-
 .../saved_objects/service/lib/errors.test.ts  |  172 +-
 .../saved_objects/service/lib/errors.ts       |   16 +
 .../service/lib/included_fields.test.ts       |   26 +-
 .../service/lib/included_fields.ts            |    1 +
 .../service/lib/repository.mock.ts            |    2 +
 .../service/lib/repository.test.js            | 4970 +++++++++--------
 .../saved_objects/service/lib/repository.ts   |  769 ++-
 .../lib/search_dsl/query_params.test.ts       | 1460 +----
 .../service/lib/search_dsl/query_params.ts    |   14 +-
 .../service/saved_objects_client.mock.ts      |    2 +
 .../service/saved_objects_client.test.js      |   34 +
 .../service/saved_objects_client.ts           |   54 +
 src/core/server/saved_objects/types.ts        |   24 +-
 src/core/server/saved_objects/utils.test.ts   |   63 +-
 src/core/server/saved_objects/utils.ts        |   11 +-
 src/core/server/server.api.md                 |   37 +-
 src/core/types/saved_objects.ts               |    2 +
 .../apis/saved_objects/bulk_create.js         |    4 +-
 .../apis/saved_objects/bulk_get.js            |   13 +-
 .../apis/saved_objects/export.js              |    3 +-
 ...ypted_saved_objects_client_wrapper.test.ts |  308 +-
 .../encrypted_saved_objects_client_wrapper.ts |   42 +-
 .../server/saved_objects/index.ts             |    3 +-
 .../server/audit/audit_logger.test.ts         |   36 +-
 .../security/server/audit/audit_logger.ts     |   17 +-
 .../check_privileges.test.ts.snap             |   27 -
 .../authorization/check_privileges.test.ts    | 1216 ++--
 .../server/authorization/check_privileges.ts  |   95 +-
 .../check_privileges_dynamically.ts           |    4 +-
 .../check_saved_objects_privileges.test.ts    |  132 +-
 .../check_saved_objects_privileges.ts         |   34 +-
 .../disable_ui_capabilities.test.ts           |   47 +-
 .../authorization/disable_ui_capabilities.ts  |    8 +-
 x-pack/plugins/security/server/plugin.ts      |    1 +
 .../security/server/saved_objects/index.ts    |   10 +-
 ...ecure_saved_objects_client_wrapper.test.ts | 1448 +++--
 .../secure_saved_objects_client_wrapper.ts    |  212 +-
 .../edit_space/delete_spaces_button.tsx       |   11 +-
 .../spaces_grid/spaces_grid_page.tsx          |   11 +-
 .../lib/copy_to_spaces/copy_to_spaces.test.ts |    6 +
 .../resolve_copy_conflicts.test.ts            |    6 +
 .../lib/spaces_client/spaces_client.test.ts   |   24 +-
 .../server/lib/spaces_client/spaces_client.ts |   14 +-
 .../server/routes/api/external/delete.test.ts |   30 +-
 .../server/routes/api/external/delete.ts      |   10 +-
 .../server/routes/api/external/index.ts       |    4 +
 .../routes/api/external/share_add_spaces.ts   |   62 +
 .../api/external/share_remove_spaces.ts       |   62 +
 .../spaces_saved_objects_client.test.ts.snap  |   29 -
 .../spaces_saved_objects_client.test.ts       |  314 +-
 .../spaces_saved_objects_client.ts            |   46 +
 .../plugins/uptime/server/rest_api/types.ts   |   15 +-
 .../apis/spaces/saved_objects.ts              |    2 +-
 .../common/config.ts                          |    2 +
 .../saved_objects/spaces/data.json            |  103 +-
 .../saved_objects/spaces/mappings.json        |   78 +-
 .../fixtures/hidden_type_plugin/index.js      |    2 +
 .../fixtures/hidden_type_plugin/mappings.json |    2 +-
 .../fixtures/isolated_type_plugin/index.js    |   26 +
 .../isolated_type_plugin/mappings.json        |   31 +
 .../isolated_type_plugin/package.json         |    7 +
 .../mappings.json                             |    2 +-
 .../fixtures/shared_type_plugin/index.js      |   27 +
 .../fixtures/shared_type_plugin/mappings.json |   15 +
 .../fixtures/shared_type_plugin/package.json  |    7 +
 .../common/lib/saved_object_test_cases.ts     |   40 +
 .../common/lib/saved_object_test_utils.ts     |  302 +
 .../common/lib/space_test_utils.ts            |   24 -
 .../common/lib/types.ts                       |   27 +-
 .../common/suites/bulk_create.ts              |  293 +-
 .../common/suites/bulk_get.ts                 |  257 +-
 .../common/suites/bulk_update.ts              |  291 +-
 .../common/suites/create.ts                   |  259 +-
 .../common/suites/delete.ts                   |  190 +-
 .../common/suites/export.ts                   |  291 +-
 .../common/suites/find.ts                     |  401 +-
 .../common/suites/get.ts                      |  226 +-
 .../common/suites/import.ts                   |  285 +-
 .../common/suites/resolve_import_errors.ts    |  312 +-
 .../common/suites/update.ts                   |  246 +-
 .../security_and_spaces/apis/bulk_create.ts   |  278 +-
 .../security_and_spaces/apis/bulk_get.ts      |  260 +-
 .../security_and_spaces/apis/bulk_update.ts   |  347 +-
 .../security_and_spaces/apis/create.ts        |  313 +-
 .../security_and_spaces/apis/delete.ts        |  337 +-
 .../security_and_spaces/apis/export.ts        |  314 +-
 .../security_and_spaces/apis/find.ts          |  766 +--
 .../security_and_spaces/apis/get.ts           |  339 +-
 .../security_and_spaces/apis/import.ts        |  301 +-
 .../security_and_spaces/apis/index.ts         |    2 +-
 .../apis/resolve_import_errors.ts             |  325 +-
 .../security_and_spaces/apis/update.ts        |  338 +-
 .../security_only/apis/bulk_create.ts         |  232 +-
 .../security_only/apis/bulk_get.ts            |  226 +-
 .../security_only/apis/bulk_update.ts         |  323 +-
 .../security_only/apis/create.ts              |  275 +-
 .../security_only/apis/delete.ts              |  313 +-
 .../security_only/apis/export.ts              |  299 +-
 .../security_only/apis/find.ts                |  791 +--
 .../security_only/apis/get.ts                 |  312 +-
 .../security_only/apis/import.ts              |  278 +-
 .../security_only/apis/index.ts               |    2 +-
 .../apis/resolve_import_errors.ts             |  277 +-
 .../security_only/apis/update.ts              |  314 +-
 .../spaces_only/apis/bulk_create.ts           |  123 +-
 .../spaces_only/apis/bulk_get.ts              |   68 +-
 .../spaces_only/apis/bulk_update.ts           |  110 +-
 .../spaces_only/apis/create.ts                |  118 +-
 .../spaces_only/apis/delete.ts                |  109 +-
 .../spaces_only/apis/export.ts                |   65 +-
 .../spaces_only/apis/find.ts                  |  157 +-
 .../spaces_only/apis/get.ts                   |  110 +-
 .../spaces_only/apis/import.ts                |   74 +-
 .../spaces_only/apis/index.ts                 |    2 +-
 .../spaces_only/apis/resolve_import_errors.ts |   85 +-
 .../spaces_only/apis/update.ts                |  110 +-
 .../spaces_api_integration/common/config.ts   |    1 +
 .../saved_objects/spaces/data.json            |  120 +
 .../saved_objects/spaces/mappings.json        |   16 +
 .../fixtures/shared_type_plugin/index.js      |   27 +
 .../fixtures/shared_type_plugin/mappings.json |   15 +
 .../fixtures/shared_type_plugin/package.json  |    7 +
 .../common/lib/saved_object_test_cases.ts     |   40 +
 .../common/suites/delete.ts                   |   20 +
 .../common/suites/share_add.ts                |  118 +
 .../common/suites/share_remove.ts             |  116 +
 .../security_and_spaces/apis/index.ts         |    2 +
 .../security_and_spaces/apis/share_add.ts     |  124 +
 .../security_and_spaces/apis/share_remove.ts  |   99 +
 .../spaces_only/apis/index.ts                 |    2 +
 .../spaces_only/apis/share_add.ts             |   84 +
 .../spaces_only/apis/share_remove.ts          |   99 +
 185 files changed, 12261 insertions(+), 15549 deletions(-)
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobject.namespaces.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobject.namespaces.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.refresh.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.version.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.refresh.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.decorateescannotexecutescripterror.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsnamespacetype.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectstype.namespacetype.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.ismultinamespace.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.issinglenamespace.md
 delete mode 100644 src/core/server/saved_objects/service/lib/__snapshots__/repository.test.js.snap
 delete mode 100644 x-pack/plugins/security/server/authorization/__snapshots__/check_privileges.test.ts.snap
 create mode 100644 x-pack/plugins/spaces/server/routes/api/external/share_add_spaces.ts
 create mode 100644 x-pack/plugins/spaces/server/routes/api/external/share_remove_spaces.ts
 delete mode 100644 x-pack/plugins/spaces/server/saved_objects/__snapshots__/spaces_saved_objects_client.test.ts.snap
 create mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/index.js
 create mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/mappings.json
 create mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/package.json
 create mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/index.js
 create mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/mappings.json
 create mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/package.json
 create mode 100644 x-pack/test/saved_object_api_integration/common/lib/saved_object_test_cases.ts
 create mode 100644 x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
 delete mode 100644 x-pack/test/saved_object_api_integration/common/lib/space_test_utils.ts
 create mode 100644 x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/index.js
 create mode 100644 x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/mappings.json
 create mode 100644 x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/package.json
 create mode 100644 x-pack/test/spaces_api_integration/common/lib/saved_object_test_cases.ts
 create mode 100644 x-pack/test/spaces_api_integration/common/suites/share_add.ts
 create mode 100644 x-pack/test/spaces_api_integration/common/suites/share_remove.ts
 create mode 100644 x-pack/test/spaces_api_integration/security_and_spaces/apis/share_add.ts
 create mode 100644 x-pack/test/spaces_api_integration/security_and_spaces/apis/share_remove.ts
 create mode 100644 x-pack/test/spaces_api_integration/spaces_only/apis/share_add.ts
 create mode 100644 x-pack/test/spaces_api_integration/spaces_only/apis/share_remove.ts

diff --git a/docs/api/saved-objects/bulk_create.asciidoc b/docs/api/saved-objects/bulk_create.asciidoc
index 9daba224b317c..fbd4c6e77f8bf 100644
--- a/docs/api/saved-objects/bulk_create.asciidoc
+++ b/docs/api/saved-objects/bulk_create.asciidoc
@@ -104,7 +104,7 @@ The API returns the following:
       "type": "dashboard",
       "error": {
         "statusCode": 409,
-        "message": "version conflict, document already exists"
+        "message": "Saved object [dashboard/be3733a0-9efe-11e7-acb3-3dab96693fab] conflict"
       }
     }
   ]
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobject.md b/docs/development/core/public/kibana-plugin-core-public.savedobject.md
index c6bc13b98bc06..b67d0536fb336 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobject.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobject.md
@@ -18,6 +18,7 @@ export interface SavedObject<T = unknown>
 |  [error](./kibana-plugin-core-public.savedobject.error.md) | <code>{</code><br/><code>        message: string;</code><br/><code>        statusCode: number;</code><br/><code>    }</code> |  |
 |  [id](./kibana-plugin-core-public.savedobject.id.md) | <code>string</code> | The ID of this Saved Object, guaranteed to be unique for all objects of the same <code>type</code> |
 |  [migrationVersion](./kibana-plugin-core-public.savedobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
+|  [namespaces](./kibana-plugin-core-public.savedobject.namespaces.md) | <code>string[]</code> | Namespace(s) that this saved object exists in. This attribute is only used for multi-namespace saved object types. |
 |  [references](./kibana-plugin-core-public.savedobject.references.md) | <code>SavedObjectReference[]</code> | A reference to another saved object. |
 |  [type](./kibana-plugin-core-public.savedobject.type.md) | <code>string</code> | The type of Saved Object. Each plugin can define it's own custom Saved Object types. |
 |  [updated\_at](./kibana-plugin-core-public.savedobject.updated_at.md) | <code>string</code> | Timestamp of the last time this document had been updated. |
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobject.namespaces.md b/docs/development/core/public/kibana-plugin-core-public.savedobject.namespaces.md
new file mode 100644
index 0000000000000..257df45934506
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobject.namespaces.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObject](./kibana-plugin-core-public.savedobject.md) &gt; [namespaces](./kibana-plugin-core-public.savedobject.namespaces.md)
+
+## SavedObject.namespaces property
+
+Namespace(s) that this saved object exists in. This attribute is only used for multi-namespace saved object types.
+
+<b>Signature:</b>
+
+```typescript
+namespaces?: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.isavedobjecttyperegistry.md b/docs/development/core/server/kibana-plugin-core-server.isavedobjecttyperegistry.md
index 245cb1a56439f..f9c621885c001 100644
--- a/docs/development/core/server/kibana-plugin-core-server.isavedobjecttyperegistry.md
+++ b/docs/development/core/server/kibana-plugin-core-server.isavedobjecttyperegistry.md
@@ -9,5 +9,5 @@ See [SavedObjectTypeRegistry](./kibana-plugin-core-server.savedobjecttyperegistr
 <b>Signature:</b>
 
 ```typescript
-export declare type ISavedObjectTypeRegistry = Pick<SavedObjectTypeRegistry, 'getType' | 'getAllTypes' | 'getIndex' | 'isNamespaceAgnostic' | 'isHidden' | 'getImportableAndExportableTypes' | 'isImportableAndExportable'>;
+export declare type ISavedObjectTypeRegistry = Omit<SavedObjectTypeRegistry, 'registerType'>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index accab9bf0cb36..5c0f10cac5179 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -130,6 +130,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectMigrationContext](./kibana-plugin-core-server.savedobjectmigrationcontext.md) | Migration context provided when invoking a [migration handler](./kibana-plugin-core-server.savedobjectmigrationfn.md) |
 |  [SavedObjectMigrationMap](./kibana-plugin-core-server.savedobjectmigrationmap.md) | A map of [migration functions](./kibana-plugin-core-server.savedobjectmigrationfn.md) to be used for a given type. The map's keys must be valid semver versions.<!-- -->For a given document, only migrations with a higher version number than that of the document will be applied. Migrations are executed in order, starting from the lowest version and ending with the highest one. |
 |  [SavedObjectReference](./kibana-plugin-core-server.savedobjectreference.md) | A reference to another saved object. |
+|  [SavedObjectsAddToNamespacesOptions](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md) |  |
 |  [SavedObjectsBaseOptions](./kibana-plugin-core-server.savedobjectsbaseoptions.md) |  |
 |  [SavedObjectsBulkCreateObject](./kibana-plugin-core-server.savedobjectsbulkcreateobject.md) |  |
 |  [SavedObjectsBulkGetObject](./kibana-plugin-core-server.savedobjectsbulkgetobject.md) |  |
@@ -143,6 +144,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
 |  [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md) |  |
 |  [SavedObjectsDeleteByNamespaceOptions](./kibana-plugin-core-server.savedobjectsdeletebynamespaceoptions.md) |  |
+|  [SavedObjectsDeleteFromNamespacesOptions](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.md) |  |
 |  [SavedObjectsDeleteOptions](./kibana-plugin-core-server.savedobjectsdeleteoptions.md) |  |
 |  [SavedObjectsExportOptions](./kibana-plugin-core-server.savedobjectsexportoptions.md) | Options controlling the export operation. |
 |  [SavedObjectsExportResultDetails](./kibana-plugin-core-server.savedobjectsexportresultdetails.md) | Structure of the export result details entry |
@@ -262,6 +264,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsClientFactoryProvider](./kibana-plugin-core-server.savedobjectsclientfactoryprovider.md) | Provider to invoke to retrieve a [SavedObjectsClientFactory](./kibana-plugin-core-server.savedobjectsclientfactory.md)<!-- -->. |
 |  [SavedObjectsClientWrapperFactory](./kibana-plugin-core-server.savedobjectsclientwrapperfactory.md) | Describes the factory used to create instances of Saved Objects Client Wrappers. |
 |  [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) | Describe a [saved object type mapping](./kibana-plugin-core-server.savedobjectstypemappingdefinition.md) field.<!-- -->Please refer to [elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html) For the mapping documentation |
+|  [SavedObjectsNamespaceType](./kibana-plugin-core-server.savedobjectsnamespacetype.md) | The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global.<!-- -->Note: do not write logic that uses this value directly; instead, use the appropriate accessors in the [type registry](./kibana-plugin-core-server.savedobjecttyperegistry.md)<!-- -->. |
 |  [ScopeableRequest](./kibana-plugin-core-server.scopeablerequest.md) | A user credentials container. It accommodates the necessary auth credentials to impersonate the current user.<!-- -->See [KibanaRequest](./kibana-plugin-core-server.kibanarequest.md)<!-- -->. |
 |  [ServiceStatusLevel](./kibana-plugin-core-server.servicestatuslevel.md) | A convenience type that represents the union of each value in [ServiceStatusLevels](./kibana-plugin-core-server.servicestatuslevels.md)<!-- -->. |
 |  [SharedGlobalConfig](./kibana-plugin-core-server.sharedglobalconfig.md) |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobject.md b/docs/development/core/server/kibana-plugin-core-server.savedobject.md
index 0df97b0d4221a..94d1c378899df 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobject.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobject.md
@@ -18,6 +18,7 @@ export interface SavedObject<T = unknown>
 |  [error](./kibana-plugin-core-server.savedobject.error.md) | <code>{</code><br/><code>        message: string;</code><br/><code>        statusCode: number;</code><br/><code>    }</code> |  |
 |  [id](./kibana-plugin-core-server.savedobject.id.md) | <code>string</code> | The ID of this Saved Object, guaranteed to be unique for all objects of the same <code>type</code> |
 |  [migrationVersion](./kibana-plugin-core-server.savedobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
+|  [namespaces](./kibana-plugin-core-server.savedobject.namespaces.md) | <code>string[]</code> | Namespace(s) that this saved object exists in. This attribute is only used for multi-namespace saved object types. |
 |  [references](./kibana-plugin-core-server.savedobject.references.md) | <code>SavedObjectReference[]</code> | A reference to another saved object. |
 |  [type](./kibana-plugin-core-server.savedobject.type.md) | <code>string</code> | The type of Saved Object. Each plugin can define it's own custom Saved Object types. |
 |  [updated\_at](./kibana-plugin-core-server.savedobject.updated_at.md) | <code>string</code> | Timestamp of the last time this document had been updated. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobject.namespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobject.namespaces.md
new file mode 100644
index 0000000000000..2a555db01df3b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobject.namespaces.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObject](./kibana-plugin-core-server.savedobject.md) &gt; [namespaces](./kibana-plugin-core-server.savedobject.namespaces.md)
+
+## SavedObject.namespaces property
+
+Namespace(s) that this saved object exists in. This attribute is only used for multi-namespace saved object types.
+
+<b>Signature:</b>
+
+```typescript
+namespaces?: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md
new file mode 100644
index 0000000000000..711588bdd608c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsAddToNamespacesOptions](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md)
+
+## SavedObjectsAddToNamespacesOptions interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsAddToNamespacesOptions extends SavedObjectsBaseOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [refresh](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
+|  [version](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.version.md) | <code>string</code> | An opaque version number which changes on each successful write operation. Can be used for implementing optimistic concurrency control. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.refresh.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.refresh.md
new file mode 100644
index 0000000000000..c0a1008ab5331
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.refresh.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsAddToNamespacesOptions](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md) &gt; [refresh](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.refresh.md)
+
+## SavedObjectsAddToNamespacesOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+<b>Signature:</b>
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.version.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.version.md
new file mode 100644
index 0000000000000..9432b4bf80da6
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.version.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsAddToNamespacesOptions](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.md) &gt; [version](./kibana-plugin-core-server.savedobjectsaddtonamespacesoptions.version.md)
+
+## SavedObjectsAddToNamespacesOptions.version property
+
+An opaque version number which changes on each successful write operation. Can be used for implementing optimistic concurrency control.
+
+<b>Signature:</b>
+
+```typescript
+version?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md
new file mode 100644
index 0000000000000..45c9c39f9626a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md
@@ -0,0 +1,27 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsClient](./kibana-plugin-core-server.savedobjectsclient.md) &gt; [addToNamespaces](./kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md)
+
+## SavedObjectsClient.addToNamespaces() method
+
+Adds namespaces to a SavedObject
+
+<b>Signature:</b>
+
+```typescript
+addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<{}>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  type | <code>string</code> |  |
+|  id | <code>string</code> |  |
+|  namespaces | <code>string[]</code> |  |
+|  options | <code>SavedObjectsAddToNamespacesOptions</code> |  |
+
+<b>Returns:</b>
+
+`Promise<{}>`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md
new file mode 100644
index 0000000000000..80b58d29d393b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md
@@ -0,0 +1,27 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsClient](./kibana-plugin-core-server.savedobjectsclient.md) &gt; [deleteFromNamespaces](./kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md)
+
+## SavedObjectsClient.deleteFromNamespaces() method
+
+Removes namespaces from a SavedObject
+
+<b>Signature:</b>
+
+```typescript
+deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  type | <code>string</code> |  |
+|  id | <code>string</code> |  |
+|  namespaces | <code>string[]</code> |  |
+|  options | <code>SavedObjectsDeleteFromNamespacesOptions</code> |  |
+
+<b>Returns:</b>
+
+`Promise<{}>`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md
index 5a8a213d2bccc..7038c0c07012f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md
@@ -25,11 +25,13 @@ The constructor for this class is marked as internal. Third-party code should no
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
+|  [addToNamespaces(type, id, namespaces, options)](./kibana-plugin-core-server.savedobjectsclient.addtonamespaces.md) |  | Adds namespaces to a SavedObject |
 |  [bulkCreate(objects, options)](./kibana-plugin-core-server.savedobjectsclient.bulkcreate.md) |  | Persists multiple documents batched together as a single request |
 |  [bulkGet(objects, options)](./kibana-plugin-core-server.savedobjectsclient.bulkget.md) |  | Returns an array of objects by id |
 |  [bulkUpdate(objects, options)](./kibana-plugin-core-server.savedobjectsclient.bulkupdate.md) |  | Bulk Updates multiple SavedObject at once |
 |  [create(type, attributes, options)](./kibana-plugin-core-server.savedobjectsclient.create.md) |  | Persists a SavedObject |
 |  [delete(type, id, options)](./kibana-plugin-core-server.savedobjectsclient.delete.md) |  | Deletes a SavedObject |
+|  [deleteFromNamespaces(type, id, namespaces, options)](./kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md) |  | Removes namespaces from a SavedObject |
 |  [find(options)](./kibana-plugin-core-server.savedobjectsclient.find.md) |  | Find all SavedObjects matching the search query |
 |  [get(type, id, options)](./kibana-plugin-core-server.savedobjectsclient.get.md) |  | Retrieves a single object |
 |  [update(type, id, attributes, options)](./kibana-plugin-core-server.savedobjectsclient.update.md) |  | Updates an SavedObject |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.md
new file mode 100644
index 0000000000000..8a2afe6656fa4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsDeleteFromNamespacesOptions](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.md)
+
+## SavedObjectsDeleteFromNamespacesOptions interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsDeleteFromNamespacesOptions extends SavedObjectsBaseOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [refresh](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.refresh.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.refresh.md
new file mode 100644
index 0000000000000..1175b79bc1abd
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.refresh.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsDeleteFromNamespacesOptions](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.md) &gt; [refresh](./kibana-plugin-core-server.savedobjectsdeletefromnamespacesoptions.refresh.md)
+
+## SavedObjectsDeleteFromNamespacesOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+<b>Signature:</b>
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md
new file mode 100644
index 0000000000000..8e04282ce0c71
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [createConflictError](./kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md)
+
+## SavedObjectsErrorHelpers.createConflictError() method
+
+<b>Signature:</b>
+
+```typescript
+static createConflictError(type: string, id: string): DecoratedError;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  type | <code>string</code> |  |
+|  id | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`DecoratedError`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.decorateescannotexecutescripterror.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.decorateescannotexecutescripterror.md
new file mode 100644
index 0000000000000..94060bba50067
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.decorateescannotexecutescripterror.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [decorateEsCannotExecuteScriptError](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateescannotexecutescripterror.md)
+
+## SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError() method
+
+<b>Signature:</b>
+
+```typescript
+static decorateEsCannotExecuteScriptError(error: Error, reason?: string): DecoratedError;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  error | <code>Error</code> |  |
+|  reason | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`DecoratedError`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md
new file mode 100644
index 0000000000000..debb94fe4f8d8
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [isEsCannotExecuteScriptError](./kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md)
+
+## SavedObjectsErrorHelpers.isEsCannotExecuteScriptError() method
+
+<b>Signature:</b>
+
+```typescript
+static isEsCannotExecuteScriptError(error: Error | DecoratedError): boolean;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  error | <code>Error &#124; DecoratedError</code> |  |
+
+<b>Returns:</b>
+
+`boolean`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md
index 55a42e4f4eb7a..250b9d3899670 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md
@@ -16,12 +16,14 @@ export declare class SavedObjectsErrorHelpers
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
 |  [createBadRequestError(reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createbadrequesterror.md) | <code>static</code> |  |
+|  [createConflictError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md) | <code>static</code> |  |
 |  [createEsAutoCreateIndexError()](./kibana-plugin-core-server.savedobjectserrorhelpers.createesautocreateindexerror.md) | <code>static</code> |  |
 |  [createGenericNotFoundError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.creategenericnotfounderror.md) | <code>static</code> |  |
 |  [createInvalidVersionError(versionInput)](./kibana-plugin-core-server.savedobjectserrorhelpers.createinvalidversionerror.md) | <code>static</code> |  |
 |  [createUnsupportedTypeError(type)](./kibana-plugin-core-server.savedobjectserrorhelpers.createunsupportedtypeerror.md) | <code>static</code> |  |
 |  [decorateBadRequestError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoratebadrequesterror.md) | <code>static</code> |  |
 |  [decorateConflictError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateconflicterror.md) | <code>static</code> |  |
+|  [decorateEsCannotExecuteScriptError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateescannotexecutescripterror.md) | <code>static</code> |  |
 |  [decorateEsUnavailableError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateesunavailableerror.md) | <code>static</code> |  |
 |  [decorateForbiddenError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateforbiddenerror.md) | <code>static</code> |  |
 |  [decorateGeneralError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorategeneralerror.md) | <code>static</code> |  |
@@ -30,6 +32,7 @@ export declare class SavedObjectsErrorHelpers
 |  [isBadRequestError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isbadrequesterror.md) | <code>static</code> |  |
 |  [isConflictError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isconflicterror.md) | <code>static</code> |  |
 |  [isEsAutoCreateIndexError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isesautocreateindexerror.md) | <code>static</code> |  |
+|  [isEsCannotExecuteScriptError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md) | <code>static</code> |  |
 |  [isEsUnavailableError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isesunavailableerror.md) | <code>static</code> |  |
 |  [isForbiddenError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isforbiddenerror.md) | <code>static</code> |  |
 |  [isInvalidVersionError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isinvalidversionerror.md) | <code>static</code> |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsnamespacetype.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsnamespacetype.md
new file mode 100644
index 0000000000000..173b9e19321d0
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsnamespacetype.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsNamespaceType](./kibana-plugin-core-server.savedobjectsnamespacetype.md)
+
+## SavedObjectsNamespaceType type
+
+The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global.
+
+Note: do not write logic that uses this value directly; instead, use the appropriate accessors in the [type registry](./kibana-plugin-core-server.savedobjecttyperegistry.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+export declare type SavedObjectsNamespaceType = 'single' | 'multiple' | 'agnostic';
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md
new file mode 100644
index 0000000000000..bbb20d2bc3b96
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md
@@ -0,0 +1,27 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsRepository](./kibana-plugin-core-server.savedobjectsrepository.md) &gt; [addToNamespaces](./kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md)
+
+## SavedObjectsRepository.addToNamespaces() method
+
+Adds one or more namespaces to a given multi-namespace saved object. This method and \[`deleteFromNamespaces`<!-- -->\][SavedObjectsRepository.deleteFromNamespaces()](./kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md) are the only ways to change which Spaces a multi-namespace saved object is shared to.
+
+<b>Signature:</b>
+
+```typescript
+addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<{}>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  type | <code>string</code> |  |
+|  id | <code>string</code> |  |
+|  namespaces | <code>string[]</code> |  |
+|  options | <code>SavedObjectsAddToNamespacesOptions</code> |  |
+
+<b>Returns:</b>
+
+`Promise<{}>`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md
new file mode 100644
index 0000000000000..471c3e3c5092d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md
@@ -0,0 +1,27 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsRepository](./kibana-plugin-core-server.savedobjectsrepository.md) &gt; [deleteFromNamespaces](./kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md)
+
+## SavedObjectsRepository.deleteFromNamespaces() method
+
+Removes one or more namespaces from a given multi-namespace saved object. If no namespaces remain, the saved object is deleted entirely. This method and \[`addToNamespaces`<!-- -->\][SavedObjectsRepository.addToNamespaces()](./kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md) are the only ways to change which Spaces a multi-namespace saved object is shared to.
+
+<b>Signature:</b>
+
+```typescript
+deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  type | <code>string</code> |  |
+|  id | <code>string</code> |  |
+|  namespaces | <code>string[]</code> |  |
+|  options | <code>SavedObjectsDeleteFromNamespacesOptions</code> |  |
+
+<b>Returns:</b>
+
+`Promise<{}>`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md
index 37547af2497e9..bd86ff3abbe9b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md
@@ -15,12 +15,14 @@ export declare class SavedObjectsRepository
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
+|  [addToNamespaces(type, id, namespaces, options)](./kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md) |  | Adds one or more namespaces to a given multi-namespace saved object. This method and \[<code>deleteFromNamespaces</code>\][SavedObjectsRepository.deleteFromNamespaces()](./kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md) are the only ways to change which Spaces a multi-namespace saved object is shared to. |
 |  [bulkCreate(objects, options)](./kibana-plugin-core-server.savedobjectsrepository.bulkcreate.md) |  | Creates multiple documents at once |
 |  [bulkGet(objects, options)](./kibana-plugin-core-server.savedobjectsrepository.bulkget.md) |  | Returns an array of objects by id |
 |  [bulkUpdate(objects, options)](./kibana-plugin-core-server.savedobjectsrepository.bulkupdate.md) |  | Updates multiple objects in bulk |
 |  [create(type, attributes, options)](./kibana-plugin-core-server.savedobjectsrepository.create.md) |  | Persists an object |
 |  [delete(type, id, options)](./kibana-plugin-core-server.savedobjectsrepository.delete.md) |  | Deletes an object |
 |  [deleteByNamespace(namespace, options)](./kibana-plugin-core-server.savedobjectsrepository.deletebynamespace.md) |  | Deletes all objects from the provided namespace. |
+|  [deleteFromNamespaces(type, id, namespaces, options)](./kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md) |  | Removes one or more namespaces from a given multi-namespace saved object. If no namespaces remain, the saved object is deleted entirely. This method and \[<code>addToNamespaces</code>\][SavedObjectsRepository.addToNamespaces()](./kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md) are the only ways to change which Spaces a multi-namespace saved object is shared to. |
 |  [find({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespace, type, filter, })](./kibana-plugin-core-server.savedobjectsrepository.find.md) |  |  |
 |  [get(type, id, options)](./kibana-plugin-core-server.savedobjectsrepository.get.md) |  | Gets a single object |
 |  [incrementCounter(type, id, counterFieldName, options)](./kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md) |  | Increases a counter field by one. Creates the document if one doesn't exist for the given id. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md
index c24fa7e7038c6..57c9e04966c1b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md
@@ -29,7 +29,7 @@ import * as migrations from './migrations';
 export const myType: SavedObjectsType = {
   name: 'MyType',
   hidden: false,
-  namespaceAgnostic: true,
+  namespaceType: 'multiple',
   mappings: {
     properties: {
       textField: {
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.md
index ad7bf9a0f00d0..d8202545f0eae 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.md
@@ -25,5 +25,6 @@ This is only internal for now, and will only be public when we expose the regist
 |  [mappings](./kibana-plugin-core-server.savedobjectstype.mappings.md) | <code>SavedObjectsTypeMappingDefinition</code> | The [mapping definition](./kibana-plugin-core-server.savedobjectstypemappingdefinition.md) for the type. |
 |  [migrations](./kibana-plugin-core-server.savedobjectstype.migrations.md) | <code>SavedObjectMigrationMap</code> | An optional map of [migrations](./kibana-plugin-core-server.savedobjectmigrationfn.md) to be used to migrate the type. |
 |  [name](./kibana-plugin-core-server.savedobjectstype.name.md) | <code>string</code> | The name of the type, which is also used as the internal id. |
-|  [namespaceAgnostic](./kibana-plugin-core-server.savedobjectstype.namespaceagnostic.md) | <code>boolean</code> | Is the type global (true), or namespaced (false). |
+|  [namespaceAgnostic](./kibana-plugin-core-server.savedobjectstype.namespaceagnostic.md) | <code>boolean</code> | Is the type global (true), or not (false). |
+|  [namespaceType](./kibana-plugin-core-server.savedobjectstype.namespacetype.md) | <code>SavedObjectsNamespaceType</code> | The [namespace type](./kibana-plugin-core-server.savedobjectsnamespacetype.md) for the type. |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.namespaceagnostic.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.namespaceagnostic.md
index 8f43db86449d0..e347421590482 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.namespaceagnostic.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.namespaceagnostic.md
@@ -4,10 +4,15 @@
 
 ## SavedObjectsType.namespaceAgnostic property
 
-Is the type global (true), or namespaced (false).
+> Warning: This API is now obsolete.
+> 
+> Use `namespaceType` instead.
+> 
+
+Is the type global (true), or not (false).
 
 <b>Signature:</b>
 
 ```typescript
-namespaceAgnostic: boolean;
+namespaceAgnostic?: boolean;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.namespacetype.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.namespacetype.md
new file mode 100644
index 0000000000000..69912f9144980
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.namespacetype.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsType](./kibana-plugin-core-server.savedobjectstype.md) &gt; [namespaceType](./kibana-plugin-core-server.savedobjectstype.namespacetype.md)
+
+## SavedObjectsType.namespaceType property
+
+The [namespace type](./kibana-plugin-core-server.savedobjectsnamespacetype.md) for the type.
+
+<b>Signature:</b>
+
+```typescript
+namespaceType?: SavedObjectsNamespaceType;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.ismultinamespace.md b/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.ismultinamespace.md
new file mode 100644
index 0000000000000..6532c5251d816
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.ismultinamespace.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectTypeRegistry](./kibana-plugin-core-server.savedobjecttyperegistry.md) &gt; [isMultiNamespace](./kibana-plugin-core-server.savedobjecttyperegistry.ismultinamespace.md)
+
+## SavedObjectTypeRegistry.isMultiNamespace() method
+
+Returns whether the type is multi-namespace (shareable); resolves to `false` if the type is not registered
+
+<b>Signature:</b>
+
+```typescript
+isMultiNamespace(type: string): boolean;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  type | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`boolean`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.isnamespaceagnostic.md b/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.isnamespaceagnostic.md
index 92dfa5465235a..859c7b9711816 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.isnamespaceagnostic.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.isnamespaceagnostic.md
@@ -4,7 +4,7 @@
 
 ## SavedObjectTypeRegistry.isNamespaceAgnostic() method
 
-Returns the `namespaceAgnostic` property for given type, or `false` if the type is not registered.
+Returns whether the type is namespace-agnostic (global); resolves to `false` if the type is not registered
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.issinglenamespace.md b/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.issinglenamespace.md
new file mode 100644
index 0000000000000..18146b2fd6ea1
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.issinglenamespace.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectTypeRegistry](./kibana-plugin-core-server.savedobjecttyperegistry.md) &gt; [isSingleNamespace](./kibana-plugin-core-server.savedobjecttyperegistry.issinglenamespace.md)
+
+## SavedObjectTypeRegistry.isSingleNamespace() method
+
+Returns whether the type is single-namespace (isolated); resolves to `true` if the type is not registered
+
+<b>Signature:</b>
+
+```typescript
+isSingleNamespace(type: string): boolean;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  type | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`boolean`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.md b/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.md
index 410b709252b72..69a94e4ad8c88 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.md
@@ -22,6 +22,8 @@ export declare class SavedObjectTypeRegistry
 |  [getType(type)](./kibana-plugin-core-server.savedobjecttyperegistry.gettype.md) |  | Return the [type](./kibana-plugin-core-server.savedobjectstype.md) definition for given type name. |
 |  [isHidden(type)](./kibana-plugin-core-server.savedobjecttyperegistry.ishidden.md) |  | Returns the <code>hidden</code> property for given type, or <code>false</code> if the type is not registered. |
 |  [isImportableAndExportable(type)](./kibana-plugin-core-server.savedobjecttyperegistry.isimportableandexportable.md) |  | Returns the <code>management.importableAndExportable</code> property for given type, or <code>false</code> if the type is not registered or does not define a management section. |
-|  [isNamespaceAgnostic(type)](./kibana-plugin-core-server.savedobjecttyperegistry.isnamespaceagnostic.md) |  | Returns the <code>namespaceAgnostic</code> property for given type, or <code>false</code> if the type is not registered. |
+|  [isMultiNamespace(type)](./kibana-plugin-core-server.savedobjecttyperegistry.ismultinamespace.md) |  | Returns whether the type is multi-namespace (shareable); resolves to <code>false</code> if the type is not registered |
+|  [isNamespaceAgnostic(type)](./kibana-plugin-core-server.savedobjecttyperegistry.isnamespaceagnostic.md) |  | Returns whether the type is namespace-agnostic (global); resolves to <code>false</code> if the type is not registered |
+|  [isSingleNamespace(type)](./kibana-plugin-core-server.savedobjecttyperegistry.issinglenamespace.md) |  | Returns whether the type is single-namespace (isolated); resolves to <code>true</code> if the type is not registered |
 |  [registerType(type)](./kibana-plugin-core-server.savedobjecttyperegistry.registertype.md) |  | Register a [type](./kibana-plugin-core-server.savedobjectstype.md) inside the registry. A type can only be registered once. subsequent calls with the same type name will throw an error. |
 
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 9f7f649f1e2a5..a5aa37becabc2 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -956,6 +956,7 @@ export interface SavedObject<T = unknown> {
     };
     id: string;
     migrationVersion?: SavedObjectsMigrationVersion;
+    namespaces?: string[];
     references: SavedObjectReference[];
     type: string;
     updated_at?: string;
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index a298f80f96d8f..039988fa08968 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -227,6 +227,8 @@ export {
   SavedObjectsLegacyService,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
+  SavedObjectsAddToNamespacesOptions,
+  SavedObjectsDeleteFromNamespacesOptions,
   SavedObjectsServiceStart,
   SavedObjectsServiceSetup,
   SavedObjectStatusMeta,
@@ -242,6 +244,7 @@ export {
   SavedObjectsMappingProperties,
   SavedObjectTypeRegistry,
   ISavedObjectTypeRegistry,
+  SavedObjectsNamespaceType,
   SavedObjectsType,
   SavedObjectsTypeManagementDefinition,
   SavedObjectMigrationMap,
diff --git a/src/core/server/saved_objects/__snapshots__/utils.test.ts.snap b/src/core/server/saved_objects/__snapshots__/utils.test.ts.snap
index 5431d2ca47892..7cd0297e57857 100644
--- a/src/core/server/saved_objects/__snapshots__/utils.test.ts.snap
+++ b/src/core/server/saved_objects/__snapshots__/utils.test.ts.snap
@@ -16,7 +16,7 @@ Array [
     },
     "migrations": Object {},
     "name": "typeA",
-    "namespaceAgnostic": false,
+    "namespaceType": "single",
   },
   Object {
     "convertToAliasScript": undefined,
@@ -32,7 +32,7 @@ Array [
     },
     "migrations": Object {},
     "name": "typeB",
-    "namespaceAgnostic": false,
+    "namespaceType": "single",
   },
   Object {
     "convertToAliasScript": undefined,
@@ -48,7 +48,7 @@ Array [
     },
     "migrations": Object {},
     "name": "typeC",
-    "namespaceAgnostic": false,
+    "namespaceType": "single",
   },
 ]
 `;
@@ -72,7 +72,7 @@ Array [
       "2.0.4": [Function],
     },
     "name": "typeA",
-    "namespaceAgnostic": true,
+    "namespaceType": "agnostic",
   },
   Object {
     "convertToAliasScript": "some alias script",
@@ -91,7 +91,7 @@ Array [
     },
     "migrations": Object {},
     "name": "typeB",
-    "namespaceAgnostic": false,
+    "namespaceType": "single",
   },
   Object {
     "convertToAliasScript": undefined,
@@ -109,7 +109,7 @@ Array [
       "1.5.3": [Function],
     },
     "name": "typeC",
-    "namespaceAgnostic": false,
+    "namespaceType": "single",
   },
 ]
 `;
@@ -130,7 +130,23 @@ Array [
     },
     "migrations": Object {},
     "name": "typeA",
-    "namespaceAgnostic": true,
+    "namespaceType": "agnostic",
+  },
+  Object {
+    "convertToAliasScript": undefined,
+    "hidden": false,
+    "indexPattern": "barBaz",
+    "management": undefined,
+    "mappings": Object {
+      "properties": Object {
+        "fieldB": Object {
+          "type": "text",
+        },
+      },
+    },
+    "migrations": Object {},
+    "name": "typeB",
+    "namespaceType": "multiple",
   },
   Object {
     "convertToAliasScript": undefined,
@@ -146,7 +162,23 @@ Array [
     },
     "migrations": Object {},
     "name": "typeC",
-    "namespaceAgnostic": false,
+    "namespaceType": "single",
+  },
+  Object {
+    "convertToAliasScript": undefined,
+    "hidden": false,
+    "indexPattern": "bazQux",
+    "management": undefined,
+    "mappings": Object {
+      "properties": Object {
+        "fieldD": Object {
+          "type": "text",
+        },
+      },
+    },
+    "migrations": Object {},
+    "name": "typeD",
+    "namespaceType": "agnostic",
   },
 ]
 `;
diff --git a/src/core/server/saved_objects/index.ts b/src/core/server/saved_objects/index.ts
index fe4795cad11a5..a294b28753f7b 100644
--- a/src/core/server/saved_objects/index.ts
+++ b/src/core/server/saved_objects/index.ts
@@ -69,6 +69,7 @@ export {
 } from './migrations';
 
 export {
+  SavedObjectsNamespaceType,
   SavedObjectStatusMeta,
   SavedObjectsType,
   SavedObjectsTypeManagementDefinition,
diff --git a/src/core/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap b/src/core/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap
index fc26d7e9cf6e9..bc9a66926e880 100644
--- a/src/core/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap
+++ b/src/core/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap
@@ -8,6 +8,7 @@ Object {
       "bbb": "18c78c995965207ed3f6e7fc5c6e55fe",
       "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
       "namespace": "2f4316de49999235636386fe51dc06c1",
+      "namespaces": "2f4316de49999235636386fe51dc06c1",
       "references": "7997cf5a56cc02bdc9c93361bde732b0",
       "type": "2f4316de49999235636386fe51dc06c1",
       "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
@@ -28,6 +29,9 @@ Object {
     "namespace": Object {
       "type": "keyword",
     },
+    "namespaces": Object {
+      "type": "keyword",
+    },
     "references": Object {
       "properties": Object {
         "id": Object {
@@ -59,6 +63,7 @@ Object {
       "firstType": "635418ab953d81d93f1190b70a8d3f57",
       "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
       "namespace": "2f4316de49999235636386fe51dc06c1",
+      "namespaces": "2f4316de49999235636386fe51dc06c1",
       "references": "7997cf5a56cc02bdc9c93361bde732b0",
       "secondType": "72d57924f415fbadb3ee293b67d233ab",
       "thirdType": "510f1f0adb69830cf8a1c5ce2923ed82",
@@ -83,6 +88,9 @@ Object {
     "namespace": Object {
       "type": "keyword",
     },
+    "namespaces": Object {
+      "type": "keyword",
+    },
     "references": Object {
       "properties": Object {
         "id": Object {
diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
index 4d1a607414ca6..418ed95f14e05 100644
--- a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
+++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
@@ -142,6 +142,9 @@ function defaultMapping(): IndexMapping {
       namespace: {
         type: 'keyword',
       },
+      namespaces: {
+        type: 'keyword',
+      },
       updated_at: {
         type: 'date',
       },
diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
index 1c2d3f501ff80..19208e6c83596 100644
--- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -61,6 +61,7 @@ describe('IndexMigrator', () => {
               foo: '18c78c995965207ed3f6e7fc5c6e55fe',
               migrationVersion: '4a1746014a75ade3a714e1db5763276f',
               namespace: '2f4316de49999235636386fe51dc06c1',
+              namespaces: '2f4316de49999235636386fe51dc06c1',
               references: '7997cf5a56cc02bdc9c93361bde732b0',
               type: '2f4316de49999235636386fe51dc06c1',
               updated_at: '00da57df13e94e9d98437d13ace4bfe0',
@@ -70,6 +71,7 @@ describe('IndexMigrator', () => {
             foo: { type: 'long' },
             migrationVersion: { dynamic: 'true', type: 'object' },
             namespace: { type: 'keyword' },
+            namespaces: { type: 'keyword' },
             type: { type: 'keyword' },
             updated_at: { type: 'date' },
             references: {
@@ -178,6 +180,7 @@ describe('IndexMigrator', () => {
               foo: '625b32086eb1d1203564cf85062dd22e',
               migrationVersion: '4a1746014a75ade3a714e1db5763276f',
               namespace: '2f4316de49999235636386fe51dc06c1',
+              namespaces: '2f4316de49999235636386fe51dc06c1',
               references: '7997cf5a56cc02bdc9c93361bde732b0',
               type: '2f4316de49999235636386fe51dc06c1',
               updated_at: '00da57df13e94e9d98437d13ace4bfe0',
@@ -188,6 +191,7 @@ describe('IndexMigrator', () => {
             foo: { type: 'text' },
             migrationVersion: { dynamic: 'true', type: 'object' },
             namespace: { type: 'keyword' },
+            namespaces: { type: 'keyword' },
             type: { type: 'keyword' },
             updated_at: { type: 'date' },
             references: {
diff --git a/src/core/server/saved_objects/migrations/kibana/__snapshots__/kibana_migrator.test.ts.snap b/src/core/server/saved_objects/migrations/kibana/__snapshots__/kibana_migrator.test.ts.snap
index 507c0b0d9339f..3453f3fc80310 100644
--- a/src/core/server/saved_objects/migrations/kibana/__snapshots__/kibana_migrator.test.ts.snap
+++ b/src/core/server/saved_objects/migrations/kibana/__snapshots__/kibana_migrator.test.ts.snap
@@ -8,6 +8,7 @@ Object {
       "bmap": "510f1f0adb69830cf8a1c5ce2923ed82",
       "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
       "namespace": "2f4316de49999235636386fe51dc06c1",
+      "namespaces": "2f4316de49999235636386fe51dc06c1",
       "references": "7997cf5a56cc02bdc9c93361bde732b0",
       "type": "2f4316de49999235636386fe51dc06c1",
       "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
@@ -36,6 +37,9 @@ Object {
     "namespace": Object {
       "type": "keyword",
     },
+    "namespaces": Object {
+      "type": "keyword",
+    },
     "references": Object {
       "properties": Object {
         "id": Object {
diff --git a/src/core/server/saved_objects/routes/integration_tests/import.test.ts b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
index c72d3e241b882..c4a03a0e2e7d2 100644
--- a/src/core/server/saved_objects/routes/integration_tests/import.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
@@ -187,7 +187,7 @@ describe('POST /internal/saved_objects/_import', () => {
           references: [],
           error: {
             statusCode: 409,
-            message: 'version conflict, document already exists',
+            message: 'Saved object [index-pattern/my-pattern] conflict',
           },
         },
         {
diff --git a/src/core/server/saved_objects/saved_objects_service.test.ts b/src/core/server/saved_objects/saved_objects_service.test.ts
index 018117776dcc8..819d79803f371 100644
--- a/src/core/server/saved_objects/saved_objects_service.test.ts
+++ b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -138,7 +138,7 @@ describe('SavedObjectsService', () => {
         const type = {
           name: 'someType',
           hidden: false,
-          namespaceAgnostic: false,
+          namespaceType: 'single' as 'single',
           mappings: { properties: {} },
         };
         setup.registerType(type);
@@ -251,7 +251,7 @@ describe('SavedObjectsService', () => {
         setup.registerType({
           name: 'someType',
           hidden: false,
-          namespaceAgnostic: false,
+          namespaceType: 'single' as 'single',
           mappings: { properties: {} },
         });
       }).toThrowErrorMatchingInlineSnapshot(
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index 62027928c0bb5..ed4ffef5729ab 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -124,7 +124,7 @@ export interface SavedObjectsServiceSetup {
    * export const myType: SavedObjectsType = {
    *   name: 'MyType',
    *   hidden: false,
-   *   namespaceAgnostic: true,
+   *   namespaceType: 'multiple',
    *   mappings: {
    *     properties: {
    *       textField: {
diff --git a/src/core/server/saved_objects/saved_objects_type_registry.mock.ts b/src/core/server/saved_objects/saved_objects_type_registry.mock.ts
index 8c8458d7a5ce4..8bb66859feca2 100644
--- a/src/core/server/saved_objects/saved_objects_type_registry.mock.ts
+++ b/src/core/server/saved_objects/saved_objects_type_registry.mock.ts
@@ -27,6 +27,8 @@ const createRegistryMock = (): jest.Mocked<ISavedObjectTypeRegistry &
     getAllTypes: jest.fn(),
     getImportableAndExportableTypes: jest.fn(),
     isNamespaceAgnostic: jest.fn(),
+    isSingleNamespace: jest.fn(),
+    isMultiNamespace: jest.fn(),
     isHidden: jest.fn(),
     getIndex: jest.fn(),
     isImportableAndExportable: jest.fn(),
@@ -38,6 +40,10 @@ const createRegistryMock = (): jest.Mocked<ISavedObjectTypeRegistry &
   mock.getIndex.mockReturnValue('.kibana-test');
   mock.isHidden.mockReturnValue(false);
   mock.isNamespaceAgnostic.mockImplementation((type: string) => type === 'global');
+  mock.isSingleNamespace.mockImplementation(
+    (type: string) => type !== 'global' && type !== 'shared'
+  );
+  mock.isMultiNamespace.mockImplementation((type: string) => type === 'shared');
   mock.isImportableAndExportable.mockReturnValue(true);
 
   return mock;
diff --git a/src/core/server/saved_objects/saved_objects_type_registry.test.ts b/src/core/server/saved_objects/saved_objects_type_registry.test.ts
index 4d1d5c1eacc25..84337474f3ee3 100644
--- a/src/core/server/saved_objects/saved_objects_type_registry.test.ts
+++ b/src/core/server/saved_objects/saved_objects_type_registry.test.ts
@@ -23,7 +23,7 @@ import { SavedObjectsType } from './types';
 const createType = (type: Partial<SavedObjectsType>): SavedObjectsType => ({
   name: 'unknown',
   hidden: false,
-  namespaceAgnostic: false,
+  namespaceType: 'single' as 'single',
   mappings: { properties: {} },
   migrations: {},
   ...type,
@@ -164,18 +164,92 @@ describe('SavedObjectTypeRegistry', () => {
   });
 
   describe('#isNamespaceAgnostic', () => {
-    it('returns correct value for the type', () => {
-      registry.registerType(createType({ name: 'typeA', namespaceAgnostic: true }));
-      registry.registerType(createType({ name: 'typeB', namespaceAgnostic: false }));
+    const expectResult = (expected: boolean, schemaDefinition?: Partial<SavedObjectsType>) => {
+      registry = new SavedObjectTypeRegistry();
+      registry.registerType(createType({ name: 'foo', ...schemaDefinition }));
+      expect(registry.isNamespaceAgnostic('foo')).toBe(expected);
+    };
 
-      expect(registry.isNamespaceAgnostic('typeA')).toEqual(true);
-      expect(registry.isNamespaceAgnostic('typeB')).toEqual(false);
+    it(`returns false when the type is not registered`, () => {
+      expect(registry.isNamespaceAgnostic('unknownType')).toEqual(false);
     });
-    it('returns false when the type is not registered', () => {
-      registry.registerType(createType({ name: 'typeA', namespaceAgnostic: true }));
-      registry.registerType(createType({ name: 'typeB', namespaceAgnostic: false }));
 
-      expect(registry.isNamespaceAgnostic('unknownType')).toEqual(false);
+    it(`returns true for namespaceType 'agnostic'`, () => {
+      expectResult(true, { namespaceType: 'agnostic' });
+    });
+
+    it(`returns false for other namespaceType`, () => {
+      expectResult(false, { namespaceType: 'multiple' });
+      expectResult(false, { namespaceType: 'single' });
+      expectResult(false, { namespaceType: undefined });
+    });
+
+    // deprecated test cases
+    it(`returns true when namespaceAgnostic is true`, () => {
+      expectResult(true, { namespaceAgnostic: true, namespaceType: 'agnostic' });
+      expectResult(true, { namespaceAgnostic: true, namespaceType: 'multiple' });
+      expectResult(true, { namespaceAgnostic: true, namespaceType: 'single' });
+      expectResult(true, { namespaceAgnostic: true, namespaceType: undefined });
+    });
+  });
+
+  describe('#isSingleNamespace', () => {
+    const expectResult = (expected: boolean, schemaDefinition?: Partial<SavedObjectsType>) => {
+      registry = new SavedObjectTypeRegistry();
+      registry.registerType(createType({ name: 'foo', ...schemaDefinition }));
+      expect(registry.isSingleNamespace('foo')).toBe(expected);
+    };
+
+    it(`returns true when the type is not registered`, () => {
+      expect(registry.isSingleNamespace('unknownType')).toEqual(true);
+    });
+
+    it(`returns true for namespaceType 'single'`, () => {
+      expectResult(true, { namespaceType: 'single' });
+      expectResult(true, { namespaceType: undefined });
+    });
+
+    it(`returns false for other namespaceType`, () => {
+      expectResult(false, { namespaceType: 'agnostic' });
+      expectResult(false, { namespaceType: 'multiple' });
+    });
+
+    // deprecated test cases
+    it(`returns false when namespaceAgnostic is true`, () => {
+      expectResult(false, { namespaceAgnostic: true, namespaceType: 'agnostic' });
+      expectResult(false, { namespaceAgnostic: true, namespaceType: 'multiple' });
+      expectResult(false, { namespaceAgnostic: true, namespaceType: 'single' });
+      expectResult(false, { namespaceAgnostic: true, namespaceType: undefined });
+    });
+  });
+
+  describe('#isMultiNamespace', () => {
+    const expectResult = (expected: boolean, schemaDefinition?: Partial<SavedObjectsType>) => {
+      registry = new SavedObjectTypeRegistry();
+      registry.registerType(createType({ name: 'foo', ...schemaDefinition }));
+      expect(registry.isMultiNamespace('foo')).toBe(expected);
+    };
+
+    it(`returns false when the type is not registered`, () => {
+      expect(registry.isMultiNamespace('unknownType')).toEqual(false);
+    });
+
+    it(`returns true for namespaceType 'multiple'`, () => {
+      expectResult(true, { namespaceType: 'multiple' });
+    });
+
+    it(`returns false for other namespaceType`, () => {
+      expectResult(false, { namespaceType: 'agnostic' });
+      expectResult(false, { namespaceType: 'single' });
+      expectResult(false, { namespaceType: undefined });
+    });
+
+    // deprecated test cases
+    it(`returns false when namespaceAgnostic is true`, () => {
+      expectResult(false, { namespaceAgnostic: true, namespaceType: 'agnostic' });
+      expectResult(false, { namespaceAgnostic: true, namespaceType: 'multiple' });
+      expectResult(false, { namespaceAgnostic: true, namespaceType: 'single' });
+      expectResult(false, { namespaceAgnostic: true, namespaceType: undefined });
     });
   });
 
@@ -206,8 +280,8 @@ describe('SavedObjectTypeRegistry', () => {
       expect(registry.getIndex('typeWithNoIndex')).toBeUndefined();
     });
     it('returns undefined when the type is not registered', () => {
-      registry.registerType(createType({ name: 'typeA', namespaceAgnostic: true }));
-      registry.registerType(createType({ name: 'typeB', namespaceAgnostic: false }));
+      registry.registerType(createType({ name: 'typeA', namespaceType: 'agnostic' }));
+      registry.registerType(createType({ name: 'typeB', namespaceType: 'single' }));
 
       expect(registry.getIndex('unknownType')).toBeUndefined();
     });
diff --git a/src/core/server/saved_objects/saved_objects_type_registry.ts b/src/core/server/saved_objects/saved_objects_type_registry.ts
index 5580ce3815d0d..be3fdb86a994c 100644
--- a/src/core/server/saved_objects/saved_objects_type_registry.ts
+++ b/src/core/server/saved_objects/saved_objects_type_registry.ts
@@ -25,16 +25,7 @@ import { SavedObjectsType } from './types';
  *
  * @public
  */
-export type ISavedObjectTypeRegistry = Pick<
-  SavedObjectTypeRegistry,
-  | 'getType'
-  | 'getAllTypes'
-  | 'getIndex'
-  | 'isNamespaceAgnostic'
-  | 'isHidden'
-  | 'getImportableAndExportableTypes'
-  | 'isImportableAndExportable'
->;
+export type ISavedObjectTypeRegistry = Omit<SavedObjectTypeRegistry, 'registerType'>;
 
 /**
  * Registry holding information about all the registered {@link SavedObjectsType | saved object types}.
@@ -77,11 +68,31 @@ export class SavedObjectTypeRegistry {
   }
 
   /**
-   * Returns the `namespaceAgnostic` property for given type, or `false` if
-   * the type is not registered.
+   * Returns whether the type is namespace-agnostic (global);
+   * resolves to `false` if the type is not registered
    */
   public isNamespaceAgnostic(type: string) {
-    return this.types.get(type)?.namespaceAgnostic ?? false;
+    return (
+      this.types.get(type)?.namespaceType === 'agnostic' ||
+      this.types.get(type)?.namespaceAgnostic ||
+      false
+    );
+  }
+
+  /**
+   * Returns whether the type is single-namespace (isolated);
+   * resolves to `true` if the type is not registered
+   */
+  public isSingleNamespace(type: string) {
+    return !this.isNamespaceAgnostic(type) && !this.isMultiNamespace(type);
+  }
+
+  /**
+   * Returns whether the type is multi-namespace (shareable);
+   * resolves to `false` if the type is not registered
+   */
+  public isMultiNamespace(type: string) {
+    return !this.isNamespaceAgnostic(type) && this.types.get(type)?.namespaceType === 'multiple';
   }
 
   /**
diff --git a/src/core/server/saved_objects/schema/schema.test.ts b/src/core/server/saved_objects/schema/schema.test.ts
index 43cf27fbae790..f2daa13e43fce 100644
--- a/src/core/server/saved_objects/schema/schema.test.ts
+++ b/src/core/server/saved_objects/schema/schema.test.ts
@@ -17,32 +17,90 @@
  * under the License.
  */
 
-import { SavedObjectsSchema } from './schema';
+import { SavedObjectsSchema, SavedObjectsSchemaDefinition } from './schema';
 
 describe('#isNamespaceAgnostic', () => {
+  const expectResult = (expected: boolean, schemaDefinition?: SavedObjectsSchemaDefinition) => {
+    const schema = new SavedObjectsSchema(schemaDefinition);
+    const result = schema.isNamespaceAgnostic('foo');
+    expect(result).toBe(expected);
+  };
+
+  it(`returns false when no schema is defined`, () => {
+    expectResult(false);
+  });
+
   it(`returns false for unknown types`, () => {
-    const schema = new SavedObjectsSchema();
-    const result = schema.isNamespaceAgnostic('bar');
-    expect(result).toBe(false);
+    expectResult(false, { bar: {} });
   });
 
-  it(`returns true for explicitly namespace agnostic type`, () => {
-    const schema = new SavedObjectsSchema({
-      foo: {
-        isNamespaceAgnostic: true,
-      },
-    });
-    const result = schema.isNamespaceAgnostic('foo');
-    expect(result).toBe(true);
+  it(`returns false for non-namespace-agnostic type`, () => {
+    expectResult(false, { foo: { isNamespaceAgnostic: false } });
+    expectResult(false, { foo: { isNamespaceAgnostic: undefined } });
   });
 
-  it(`returns false for explicitly namespaced type`, () => {
-    const schema = new SavedObjectsSchema({
-      foo: {
-        isNamespaceAgnostic: false,
-      },
-    });
-    const result = schema.isNamespaceAgnostic('foo');
-    expect(result).toBe(false);
+  it(`returns true for explicitly namespace-agnostic type`, () => {
+    expectResult(true, { foo: { isNamespaceAgnostic: true } });
+  });
+});
+
+describe('#isSingleNamespace', () => {
+  const expectResult = (expected: boolean, schemaDefinition?: SavedObjectsSchemaDefinition) => {
+    const schema = new SavedObjectsSchema(schemaDefinition);
+    const result = schema.isSingleNamespace('foo');
+    expect(result).toBe(expected);
+  };
+
+  it(`returns true when no schema is defined`, () => {
+    expectResult(true);
+  });
+
+  it(`returns true for unknown types`, () => {
+    expectResult(true, { bar: {} });
+  });
+
+  it(`returns false for explicitly namespace-agnostic type`, () => {
+    expectResult(false, { foo: { isNamespaceAgnostic: true } });
+  });
+
+  it(`returns false for explicitly multi-namespace type`, () => {
+    expectResult(false, { foo: { multiNamespace: true } });
+  });
+
+  it(`returns true for non-namespace-agnostic and non-multi-namespace type`, () => {
+    expectResult(true, { foo: { isNamespaceAgnostic: false, multiNamespace: false } });
+    expectResult(true, { foo: { isNamespaceAgnostic: false, multiNamespace: undefined } });
+    expectResult(true, { foo: { isNamespaceAgnostic: undefined, multiNamespace: false } });
+    expectResult(true, { foo: { isNamespaceAgnostic: undefined, multiNamespace: undefined } });
+  });
+});
+
+describe('#isMultiNamespace', () => {
+  const expectResult = (expected: boolean, schemaDefinition?: SavedObjectsSchemaDefinition) => {
+    const schema = new SavedObjectsSchema(schemaDefinition);
+    const result = schema.isMultiNamespace('foo');
+    expect(result).toBe(expected);
+  };
+
+  it(`returns false when no schema is defined`, () => {
+    expectResult(false);
+  });
+
+  it(`returns false for unknown types`, () => {
+    expectResult(false, { bar: {} });
+  });
+
+  it(`returns false for explicitly namespace-agnostic type`, () => {
+    expectResult(false, { foo: { isNamespaceAgnostic: true } });
+  });
+
+  it(`returns false for non-multi-namespace type`, () => {
+    expectResult(false, { foo: { multiNamespace: false } });
+    expectResult(false, { foo: { multiNamespace: undefined } });
+  });
+
+  it(`returns true for non-namespace-agnostic and explicitly multi-namespace type`, () => {
+    expectResult(true, { foo: { isNamespaceAgnostic: false, multiNamespace: true } });
+    expectResult(true, { foo: { isNamespaceAgnostic: undefined, multiNamespace: true } });
   });
 });
diff --git a/src/core/server/saved_objects/schema/schema.ts b/src/core/server/saved_objects/schema/schema.ts
index 17ca406ea109a..ba1905158e822 100644
--- a/src/core/server/saved_objects/schema/schema.ts
+++ b/src/core/server/saved_objects/schema/schema.ts
@@ -24,7 +24,8 @@ import { LegacyConfig } from '../../legacy';
  * @internal
  **/
 interface SavedObjectsSchemaTypeDefinition {
-  isNamespaceAgnostic: boolean;
+  isNamespaceAgnostic?: boolean;
+  multiNamespace?: boolean;
   hidden?: boolean;
   indexPattern?: ((config: LegacyConfig) => string) | string;
   convertToAliasScript?: string;
@@ -72,7 +73,7 @@ export class SavedObjectsSchema {
   }
 
   public isNamespaceAgnostic(type: string) {
-    // if no plugins have registered a uiExports.savedObjectSchemas,
+    // if no plugins have registered a Saved Objects Schema,
     // this.schema will be undefined, and no types are namespace agnostic
     if (!this.definition) {
       return false;
@@ -84,4 +85,32 @@ export class SavedObjectsSchema {
     }
     return Boolean(typeSchema.isNamespaceAgnostic);
   }
+
+  public isSingleNamespace(type: string) {
+    // if no plugins have registered a Saved Objects Schema,
+    // this.schema will be undefined, and all types are namespace isolated
+    if (!this.definition) {
+      return true;
+    }
+
+    const typeSchema = this.definition[type];
+    if (!typeSchema) {
+      return true;
+    }
+    return !Boolean(typeSchema.isNamespaceAgnostic) && !Boolean(typeSchema.multiNamespace);
+  }
+
+  public isMultiNamespace(type: string) {
+    // if no plugins have registered a Saved Objects Schema,
+    // this.schema will be undefined, and no types are multi-namespace
+    if (!this.definition) {
+      return false;
+    }
+
+    const typeSchema = this.definition[type];
+    if (!typeSchema) {
+      return false;
+    }
+    return !Boolean(typeSchema.isNamespaceAgnostic) && Boolean(typeSchema.multiNamespace);
+  }
 }
diff --git a/src/core/server/saved_objects/serialization/serializer.test.ts b/src/core/server/saved_objects/serialization/serializer.test.ts
index 8f09b25bb3908..1a7dfdd2d130e 100644
--- a/src/core/server/saved_objects/serialization/serializer.test.ts
+++ b/src/core/server/saved_objects/serialization/serializer.test.ts
@@ -19,101 +19,101 @@
 
 import _ from 'lodash';
 import { SavedObjectsSerializer } from './serializer';
+import { SavedObjectsRawDoc } from './types';
 import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import { encodeVersion } from '../version';
 
-describe('saved object conversion', () => {
-  let typeRegistry: ReturnType<typeof typeRegistryMock.create>;
-
-  beforeEach(() => {
-    typeRegistry = typeRegistryMock.create();
-    typeRegistry.isNamespaceAgnostic.mockReturnValue(false);
+let typeRegistry = typeRegistryMock.create();
+typeRegistry.isNamespaceAgnostic.mockReturnValue(true);
+typeRegistry.isSingleNamespace.mockReturnValue(false);
+typeRegistry.isMultiNamespace.mockReturnValue(false);
+const namespaceAgnosticSerializer = new SavedObjectsSerializer(typeRegistry);
+
+typeRegistry = typeRegistryMock.create();
+typeRegistry.isNamespaceAgnostic.mockReturnValue(false);
+typeRegistry.isSingleNamespace.mockReturnValue(true);
+typeRegistry.isMultiNamespace.mockReturnValue(false);
+const singleNamespaceSerializer = new SavedObjectsSerializer(typeRegistry);
+
+typeRegistry = typeRegistryMock.create();
+typeRegistry.isNamespaceAgnostic.mockReturnValue(false);
+typeRegistry.isSingleNamespace.mockReturnValue(false);
+typeRegistry.isMultiNamespace.mockReturnValue(true);
+const multiNamespaceSerializer = new SavedObjectsSerializer(typeRegistry);
+
+const sampleTemplate = {
+  _id: 'foo:bar',
+  _source: {
+    type: 'foo',
+  },
+};
+const createSampleDoc = (raw: any, template = sampleTemplate): SavedObjectsRawDoc =>
+  _.defaultsDeep(raw, template);
+
+describe('#rawToSavedObject', () => {
+  test('it copies the _source.type property to type', () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+      },
+    });
+    expect(actual).toHaveProperty('type', 'foo');
   });
 
-  describe('#rawToSavedObject', () => {
-    test('it copies the _source.type property to type', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
-        _id: 'foo:bar',
-        _source: {
-          type: 'foo',
-        },
-      });
-      expect(actual).toHaveProperty('type', 'foo');
+  test('it copies the _source.references property to references', () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+        references: [{ name: 'ref_0', type: 'index-pattern', id: 'pattern*' }],
+      },
     });
+    expect(actual).toHaveProperty('references', [
+      {
+        name: 'ref_0',
+        type: 'index-pattern',
+        id: 'pattern*',
+      },
+    ]);
+  });
 
-    test('it copies the _source.references property to references', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
-        _id: 'foo:bar',
-        _source: {
-          type: 'foo',
-          references: [{ name: 'ref_0', type: 'index-pattern', id: 'pattern*' }],
-        },
-      });
-      expect(actual).toHaveProperty('references', [
-        {
-          name: 'ref_0',
-          type: 'index-pattern',
-          id: 'pattern*',
+  test('if specified it copies the _source.migrationVersion property to migrationVersion', () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+        migrationVersion: {
+          hello: '1.2.3',
+          acl: '33.3.5',
         },
-      ]);
+      },
     });
-
-    test('if specified it copies the _source.migrationVersion property to migrationVersion', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
-        _id: 'foo:bar',
-        _source: {
-          type: 'foo',
-          migrationVersion: {
-            hello: '1.2.3',
-            acl: '33.3.5',
-          },
-        },
-      });
-      expect(actual).toHaveProperty('migrationVersion', {
-        hello: '1.2.3',
-        acl: '33.3.5',
-      });
+    expect(actual).toHaveProperty('migrationVersion', {
+      hello: '1.2.3',
+      acl: '33.3.5',
     });
+  });
 
-    test(`if _source.migrationVersion is unspecified it doesn't set migrationVersion`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
-        _id: 'foo:bar',
-        _source: {
-          type: 'foo',
-        },
-      });
-      expect(actual).not.toHaveProperty('migrationVersion');
+  test(`if _source.migrationVersion is unspecified it doesn't set migrationVersion`, () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+      },
     });
+    expect(actual).not.toHaveProperty('migrationVersion');
+  });
 
-    test('it converts the id and type properties, and retains migrationVersion', () => {
-      const now = String(new Date());
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
-        _id: 'hello:world',
-        _seq_no: 3,
-        _primary_term: 1,
-        _source: {
-          type: 'hello',
-          hello: {
-            a: 'b',
-            c: 'd',
-          },
-          migrationVersion: {
-            hello: '1.2.3',
-            acl: '33.3.5',
-          },
-          updated_at: now,
-        },
-      });
-      const expected = {
-        id: 'world',
+  test('it converts the id and type properties, and retains migrationVersion', () => {
+    const now = String(new Date());
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'hello:world',
+      _seq_no: 3,
+      _primary_term: 1,
+      _source: {
         type: 'hello',
-        version: encodeVersion(3, 1),
-        attributes: {
+        hello: {
           a: 'b',
           c: 'd',
         },
@@ -122,909 +122,937 @@ describe('saved object conversion', () => {
           acl: '33.3.5',
         },
         updated_at: now,
-        references: [],
-      };
-      expect(expected).toEqual(actual);
+      },
+    });
+    const expected = {
+      id: 'world',
+      type: 'hello',
+      version: encodeVersion(3, 1),
+      attributes: {
+        a: 'b',
+        c: 'd',
+      },
+      migrationVersion: {
+        hello: '1.2.3',
+        acl: '33.3.5',
+      },
+      updated_at: now,
+      references: [],
+    };
+    expect(expected).toEqual(actual);
+  });
+
+  test(`if version is unspecified it doesn't set version`, () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+        hello: {},
+      },
     });
+    expect(actual).not.toHaveProperty('version');
+  });
 
-    test(`if version is unspecified it doesn't set version`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
+  test(`if specified it encodes _seq_no and _primary_term to version`, () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _seq_no: 4,
+      _primary_term: 1,
+      _source: {
+        type: 'foo',
+        hello: {},
+      },
+    });
+    expect(actual).toHaveProperty('version', encodeVersion(4, 1));
+  });
+
+  test(`if only _seq_no is specified it throws`, () => {
+    expect(() =>
+      singleNamespaceSerializer.rawToSavedObject({
         _id: 'foo:bar',
+        _seq_no: 4,
         _source: {
           type: 'foo',
           hello: {},
         },
-      });
-      expect(actual).not.toHaveProperty('version');
-    });
+      })
+    ).toThrowErrorMatchingInlineSnapshot(`"_primary_term from elasticsearch must be an integer"`);
+  });
 
-    test(`if specified it encodes _seq_no and _primary_term to version`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
+  test(`if only _primary_term is throws`, () => {
+    expect(() =>
+      singleNamespaceSerializer.rawToSavedObject({
         _id: 'foo:bar',
-        _seq_no: 4,
         _primary_term: 1,
         _source: {
           type: 'foo',
           hello: {},
         },
-      });
-      expect(actual).toHaveProperty('version', encodeVersion(4, 1));
-    });
+      })
+    ).toThrowErrorMatchingInlineSnapshot(`"_seq_no from elasticsearch must be an integer"`);
+  });
 
-    test(`if only _seq_no is specified it throws`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      expect(() =>
-        serializer.rawToSavedObject({
-          _id: 'foo:bar',
-          _seq_no: 4,
-          _source: {
-            type: 'foo',
-            hello: {},
-          },
-        })
-      ).toThrowErrorMatchingInlineSnapshot(`"_primary_term from elasticsearch must be an integer"`);
+  test('if specified it copies the _source.updated_at property to updated_at', () => {
+    const now = Date();
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+        updated_at: now,
+      },
     });
+    expect(actual).toHaveProperty('updated_at', now);
+  });
 
-    test(`if only _primary_term is throws`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      expect(() =>
-        serializer.rawToSavedObject({
-          _id: 'foo:bar',
-          _primary_term: 1,
-          _source: {
-            type: 'foo',
-            hello: {},
-          },
-        })
-      ).toThrowErrorMatchingInlineSnapshot(`"_seq_no from elasticsearch must be an integer"`);
+  test(`if _source.updated_at is unspecified it doesn't set updated_at`, () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+      },
     });
+    expect(actual).not.toHaveProperty('updated_at');
+  });
 
-    test('if specified it copies the _source.updated_at property to updated_at', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const now = Date();
-      const actual = serializer.rawToSavedObject({
-        _id: 'foo:bar',
-        _source: {
-          type: 'foo',
-          updated_at: now,
+  test('it does not pass unknown properties through', () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'universe',
+      _source: {
+        type: 'hello',
+        hello: {
+          world: 'earth',
         },
-      });
-      expect(actual).toHaveProperty('updated_at', now);
+        banjo: 'Steve Martin',
+      },
+    });
+    expect(actual).toEqual({
+      id: 'universe',
+      type: 'hello',
+      attributes: {
+        world: 'earth',
+      },
+      references: [],
     });
+  });
 
-    test(`if _source.updated_at is unspecified it doesn't set updated_at`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
-        _id: 'foo:bar',
-        _source: {
-          type: 'foo',
-        },
-      });
-      expect(actual).not.toHaveProperty('updated_at');
+  test('it does not create attributes if [type] is missing', () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'universe',
+      _source: {
+        type: 'hello',
+      },
     });
+    expect(actual).toEqual({
+      id: 'universe',
+      type: 'hello',
+      references: [],
+    });
+  });
 
-    test('it does not pass unknown properties through', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
+  test('it fails for documents which do not specify a type', () => {
+    expect(() =>
+      singleNamespaceSerializer.rawToSavedObject({
         _id: 'universe',
         _source: {
-          type: 'hello',
           hello: {
             world: 'earth',
           },
-          banjo: 'Steve Martin',
+        } as any,
+      })
+    ).toThrow(/Expected "undefined" to be a saved object type/);
+  });
+
+  test('it is complimentary with savedObjectToRaw', () => {
+    const raw = {
+      _id: 'foo-namespace:foo:bar',
+      _primary_term: 24,
+      _seq_no: 42,
+      _source: {
+        type: 'foo',
+        foo: {
+          meaning: 42,
+          nested: { stuff: 'here' },
         },
-      });
-      expect(actual).toEqual({
-        id: 'universe',
-        type: 'hello',
-        attributes: {
-          world: 'earth',
+        migrationVersion: {
+          foo: '1.2.3',
+          bar: '9.8.7',
         },
+        namespace: 'foo-namespace',
+        updated_at: String(new Date()),
         references: [],
-      });
-    });
+      },
+    };
+
+    expect(
+      singleNamespaceSerializer.savedObjectToRaw(
+        singleNamespaceSerializer.rawToSavedObject(_.cloneDeep(raw))
+      )
+    ).toEqual(raw);
+  });
 
-    test('it does not create attributes if [type] is missing', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
-        _id: 'universe',
-        _source: {
-          type: 'hello',
-        },
-      });
-      expect(actual).toEqual({
-        id: 'universe',
+  test('it handles unprefixed ids', () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'universe',
+      _source: {
         type: 'hello',
-        references: [],
-      });
+      },
     });
 
-    test('it fails for documents which do not specify a type', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      expect(() =>
-        serializer.rawToSavedObject({
-          _id: 'universe',
-          _source: {
-            hello: {
-              world: 'earth',
-            },
-          } as any,
-        })
-      ).toThrow(/Expected "undefined" to be a saved object type/);
+    expect(actual).toHaveProperty('id', 'universe');
+  });
+
+  describe('namespace-agnostic type with a namespace', () => {
+    const raw = createSampleDoc({ _source: { namespace: 'baz' } });
+    const actual = namespaceAgnosticSerializer.rawToSavedObject(raw);
+
+    test(`removes type prefix from _id`, () => {
+      expect(actual).toHaveProperty('id', 'bar');
     });
 
-    test('it is complimentary with savedObjectToRaw', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const raw = {
-        _id: 'foo-namespace:foo:bar',
-        _primary_term: 24,
-        _seq_no: 42,
-        _source: {
-          type: 'foo',
-          foo: {
-            meaning: 42,
-            nested: { stuff: 'here' },
-          },
-          migrationVersion: {
-            foo: '1.2.3',
-            bar: '9.8.7',
-          },
-          namespace: 'foo-namespace',
-          updated_at: String(new Date()),
-          references: [],
-        },
-      };
+    test(`copies _id to id if prefixed by namespace and type`, () => {
+      const _id = `${raw._source.namespace}:${raw._id}`;
+      const _actual = namespaceAgnosticSerializer.rawToSavedObject({ ...raw, _id });
+      expect(_actual).toHaveProperty('id', _id);
+    });
 
-      expect(serializer.savedObjectToRaw(serializer.rawToSavedObject(_.cloneDeep(raw)))).toEqual(
-        raw
-      );
+    test(`doesn't copy _source.namespace to namespace`, () => {
+      expect(actual).not.toHaveProperty('namespace');
     });
+  });
 
-    test('it handles unprefixed ids', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.rawToSavedObject({
-        _id: 'universe',
-        _source: {
-          type: 'hello',
-        },
-      });
+  describe('namespace-agnostic type with namespaces', () => {
+    const raw = createSampleDoc({ _source: { namespaces: ['baz'] } });
+    const actual = namespaceAgnosticSerializer.rawToSavedObject(raw);
 
-      expect(actual).toHaveProperty('id', 'universe');
+    test(`doesn't copy _source.namespaces to namespaces`, () => {
+      expect(actual).not.toHaveProperty('namespaces');
     });
+  });
 
-    describe('namespaced type without a namespace', () => {
-      test(`removes type prefix from _id`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'foo:bar',
-          _source: {
-            type: 'foo',
-          },
-        });
+  describe('single-namespace type without a namespace', () => {
+    const raw = createSampleDoc({});
+    const actual = singleNamespaceSerializer.rawToSavedObject(raw);
 
-        expect(actual).toHaveProperty('id', 'bar');
-      });
+    test(`removes type prefix from _id`, () => {
+      expect(actual).toHaveProperty('id', 'bar');
+    });
 
-      test(`if prefixed by random prefix and type it copies _id to id`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'random:foo:bar',
-          _source: {
-            type: 'foo',
-          },
-        });
+    test(`copies _id to id if prefixed by random prefix and type`, () => {
+      const _id = `random:${raw._id}`;
+      const _actual = singleNamespaceSerializer.rawToSavedObject({ ...raw, _id });
+      expect(_actual).toHaveProperty('id', _id);
+    });
 
-        expect(actual).toHaveProperty('id', 'random:foo:bar');
-      });
+    test(`doesn't specify namespace`, () => {
+      expect(actual).not.toHaveProperty('namespace');
+    });
+  });
 
-      test(`doesn't specify namespace`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'foo:bar',
-          _source: {
-            type: 'foo',
-          },
-        });
+  describe('single-namespace type with a namespace', () => {
+    const namespace = 'baz';
+    const raw = createSampleDoc({ _source: { namespace } });
+    const actual = singleNamespaceSerializer.rawToSavedObject(raw);
 
-        expect(actual).not.toHaveProperty('namespace');
-      });
+    test(`removes type and namespace prefix from _id`, () => {
+      const _id = `${namespace}:${raw._id}`;
+      const _actual = singleNamespaceSerializer.rawToSavedObject({ ...raw, _id });
+      expect(_actual).toHaveProperty('id', 'bar');
     });
 
-    describe('namespaced type with a namespace', () => {
-      test(`removes type and namespace prefix from _id`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'baz:foo:bar',
-          _source: {
-            type: 'foo',
-            namespace: 'baz',
-          },
-        });
+    test(`copies _id to id if prefixed only by type`, () => {
+      expect(actual).toHaveProperty('id', raw._id);
+    });
 
-        expect(actual).toHaveProperty('id', 'bar');
-      });
+    test(`copies _id to id if prefixed by random prefix and type`, () => {
+      const _id = `random:${raw._id}`;
+      const _actual = singleNamespaceSerializer.rawToSavedObject({ ...raw, _id });
+      expect(_actual).toHaveProperty('id', _id);
+    });
 
-      test(`if prefixed by only type it copies _id to id`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'foo:bar',
-          _source: {
-            type: 'foo',
-            namespace: 'baz',
-          },
-        });
+    test(`copies _source.namespace to namespace`, () => {
+      expect(actual).toHaveProperty('namespace', 'baz');
+    });
+  });
 
-        expect(actual).toHaveProperty('id', 'foo:bar');
-      });
+  describe('single-namespace type with namespaces', () => {
+    const raw = createSampleDoc({ _source: { namespaces: ['baz'] } });
+    const actual = singleNamespaceSerializer.rawToSavedObject(raw);
 
-      test(`if prefixed by random prefix and type it copies _id to id`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'random:foo:bar',
-          _source: {
-            type: 'foo',
-            namespace: 'baz',
-          },
-        });
+    test(`doesn't copy _source.namespaces to namespaces`, () => {
+      expect(actual).not.toHaveProperty('namespaces');
+    });
+  });
 
-        expect(actual).toHaveProperty('id', 'random:foo:bar');
-      });
+  describe('multi-namespace type with a namespace', () => {
+    const raw = createSampleDoc({ _source: { namespace: 'baz' } });
+    const actual = multiNamespaceSerializer.rawToSavedObject(raw);
 
-      test(`copies _source.namespace to namespace`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'baz:foo:bar',
-          _source: {
-            type: 'foo',
-            namespace: 'baz',
-          },
-        });
+    test(`removes type prefix from _id`, () => {
+      expect(actual).toHaveProperty('id', 'bar');
+    });
 
-        expect(actual).toHaveProperty('namespace', 'baz');
-      });
+    test(`copies _id to id if prefixed by namespace and type`, () => {
+      const _id = `${raw._source.namespace}:${raw._id}`;
+      const _actual = multiNamespaceSerializer.rawToSavedObject({ ...raw, _id });
+      expect(_actual).toHaveProperty('id', _id);
     });
 
-    describe('namespace agnostic type with a namespace', () => {
-      beforeEach(() => {
-        typeRegistry.isNamespaceAgnostic.mockReturnValue(true);
-      });
+    test(`doesn't copy _source.namespace to namespace`, () => {
+      expect(actual).not.toHaveProperty('namespace');
+    });
+  });
 
-      test(`removes type prefix from _id`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'foo:bar',
-          _source: {
-            type: 'foo',
-            namespace: 'baz',
-          },
-        });
+  describe('multi-namespace type with namespaces', () => {
+    const raw = createSampleDoc({ _source: { namespaces: ['baz'] } });
+    const actual = multiNamespaceSerializer.rawToSavedObject(raw);
 
-        expect(actual).toHaveProperty('id', 'bar');
-      });
+    test(`copies _source.namespaces to namespaces`, () => {
+      expect(actual).toHaveProperty('namespaces', ['baz']);
+    });
+  });
+});
 
-      test(`if prefixed by namespace and type it copies _id to id`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'baz:foo:bar',
-          _source: {
-            type: 'foo',
-            namespace: 'baz',
-          },
-        });
+describe('#savedObjectToRaw', () => {
+  test('it copies the type property to _source.type and uses the ROOT_TYPE as _type', () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: 'foo',
+      attributes: {},
+    } as any);
 
-        expect(actual).toHaveProperty('id', 'baz:foo:bar');
-      });
+    expect(actual._source).toHaveProperty('type', 'foo');
+  });
 
-      test(`doesn't copy _source.namespace to namespace`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.rawToSavedObject({
-          _id: 'baz:foo:bar',
-          _source: {
-            type: 'foo',
-            namespace: 'baz',
-          },
-        });
+  test('it copies the references property to _source.references', () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      id: '1',
+      type: 'foo',
+      attributes: {},
+      references: [{ name: 'ref_0', type: 'index-pattern', id: 'pattern*' }],
+    });
+    expect(actual._source).toHaveProperty('references', [
+      {
+        name: 'ref_0',
+        type: 'index-pattern',
+        id: 'pattern*',
+      },
+    ]);
+  });
+
+  test('if specified it copies the updated_at property to _source.updated_at', () => {
+    const now = new Date();
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: '',
+      attributes: {},
+      updated_at: now,
+    } as any);
+
+    expect(actual._source).toHaveProperty('updated_at', now);
+  });
+
+  test(`if unspecified it doesn't add updated_at property to _source`, () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: '',
+      attributes: {},
+    } as any);
 
-        expect(actual).not.toHaveProperty('namespace');
-      });
+    expect(actual._source).not.toHaveProperty('updated_at');
+  });
+
+  test('it copies the migrationVersion property to _source.migrationVersion', () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: '',
+      attributes: {},
+      migrationVersion: {
+        foo: '1.2.3',
+        bar: '9.8.7',
+      },
+    } as any);
+
+    expect(actual._source).toHaveProperty('migrationVersion', {
+      foo: '1.2.3',
+      bar: '9.8.7',
     });
   });
 
-  describe('#savedObjectToRaw', () => {
-    test('it copies the type property to _source.type and uses the ROOT_TYPE as _type', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.savedObjectToRaw({
-        type: 'foo',
+  test(`if unspecified it doesn't add migrationVersion property to _source`, () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: '',
+      attributes: {},
+    } as any);
+
+    expect(actual._source).not.toHaveProperty('migrationVersion');
+  });
+
+  test('it decodes the version property to _seq_no and _primary_term', () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: '',
+      attributes: {},
+      version: encodeVersion(1, 2),
+    } as any);
+
+    expect(actual).toHaveProperty('_seq_no', 1);
+    expect(actual).toHaveProperty('_primary_term', 2);
+  });
+
+  test(`if unspecified it doesn't add _seq_no or _primary_term properties`, () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: '',
+      attributes: {},
+    } as any);
+
+    expect(actual).not.toHaveProperty('_seq_no');
+    expect(actual).not.toHaveProperty('_primary_term');
+  });
+
+  test(`if version invalid it throws`, () => {
+    expect(() =>
+      singleNamespaceSerializer.savedObjectToRaw({
+        type: '',
         attributes: {},
-      } as any);
+        version: 'foo',
+      } as any)
+    ).toThrowErrorMatchingInlineSnapshot(`"Invalid version [foo]"`);
+  });
 
-      expect(actual._source).toHaveProperty('type', 'foo');
+  test('it copies attributes to _source[type]', () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: 'foo',
+      attributes: {
+        foo: true,
+        bar: 'quz',
+      },
+    } as any);
+
+    expect(actual._source).toHaveProperty('foo', {
+      foo: true,
+      bar: 'quz',
     });
+  });
 
-    test('it copies the references property to _source.references', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.savedObjectToRaw({
-        id: '1',
+  describe('single-namespace type without a namespace', () => {
+    test('generates an id prefixed with type, if no id is specified', () => {
+      const v1 = singleNamespaceSerializer.savedObjectToRaw({
         type: 'foo',
-        attributes: {},
-        references: [{ name: 'ref_0', type: 'index-pattern', id: 'pattern*' }],
-      });
-      expect(actual._source).toHaveProperty('references', [
-        {
-          name: 'ref_0',
-          type: 'index-pattern',
-          id: 'pattern*',
-        },
-      ]);
+        attributes: { bar: true },
+      } as any);
+
+      const v2 = singleNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
+        attributes: { bar: true },
+      } as any);
+
+      expect(v1._id).toMatch(/^foo\:[\w-]+$/);
+      expect(v1._id).not.toEqual(v2._id);
     });
 
-    test('if specified it copies the updated_at property to _source.updated_at', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const now = new Date();
-      const actual = serializer.savedObjectToRaw({
+    test(`doesn't specify _source.namespace`, () => {
+      const actual = singleNamespaceSerializer.savedObjectToRaw({
         type: '',
         attributes: {},
-        updated_at: now,
       } as any);
 
-      expect(actual._source).toHaveProperty('updated_at', now);
+      expect(actual._source).not.toHaveProperty('namespace');
     });
+  });
 
-    test(`if unspecified it doesn't add updated_at property to _source`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.savedObjectToRaw({
-        type: '',
+  describe('single-namespace type with a namespace', () => {
+    test('generates an id prefixed with namespace and type, if no id is specified', () => {
+      const v1 = singleNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespace: 'bar',
+        attributes: { bar: true },
+      } as any);
+
+      const v2 = singleNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespace: 'bar',
+        attributes: { bar: true },
+      } as any);
+
+      expect(v1._id).toMatch(/^bar\:foo\:[\w-]+$/);
+      expect(v1._id).not.toEqual(v2._id);
+    });
+
+    test(`it copies namespace to _source.namespace`, () => {
+      const actual = singleNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
         attributes: {},
+        namespace: 'bar',
       } as any);
 
-      expect(actual._source).not.toHaveProperty('updated_at');
+      expect(actual._source).toHaveProperty('namespace', 'bar');
     });
+  });
 
-    test('it copies the migrationVersion property to _source.migrationVersion', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.savedObjectToRaw({
-        type: '',
+  describe('single-namespace type with namespaces', () => {
+    test('generates an id prefixed with type, if no id is specified', () => {
+      const v1 = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespaces: ['bar'],
+        attributes: { bar: true },
+      } as any);
+
+      const v2 = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespaces: ['bar'],
+        attributes: { bar: true },
+      } as any);
+
+      expect(v1._id).toMatch(/^foo\:[\w-]+$/);
+      expect(v1._id).not.toEqual(v2._id);
+    });
+
+    test(`doesn't specify _source.namespaces`, () => {
+      const actual = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespaces: ['bar'],
         attributes: {},
-        migrationVersion: {
-          foo: '1.2.3',
-          bar: '9.8.7',
-        },
       } as any);
 
-      expect(actual._source).toHaveProperty('migrationVersion', {
-        foo: '1.2.3',
-        bar: '9.8.7',
-      });
+      expect(actual._source).not.toHaveProperty('namespaces');
     });
+  });
 
-    test(`if unspecified it doesn't add migrationVersion property to _source`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.savedObjectToRaw({
-        type: '',
+  describe('namespace-agnostic type with a namespace', () => {
+    test('generates an id prefixed with type, if no id is specified', () => {
+      const v1 = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespace: 'bar',
+        attributes: { bar: true },
+      } as any);
+
+      const v2 = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespace: 'bar',
+        attributes: { bar: true },
+      } as any);
+
+      expect(v1._id).toMatch(/^foo\:[\w-]+$/);
+      expect(v1._id).not.toEqual(v2._id);
+    });
+
+    test(`doesn't specify _source.namespace`, () => {
+      const actual = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespace: 'bar',
         attributes: {},
       } as any);
 
-      expect(actual._source).not.toHaveProperty('migrationVersion');
+      expect(actual._source).not.toHaveProperty('namespace');
     });
+  });
 
-    test('it decodes the version property to _seq_no and _primary_term', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.savedObjectToRaw({
-        type: '',
+  describe('namespace-agnostic type with namespaces', () => {
+    test('generates an id prefixed with type, if no id is specified', () => {
+      const v1 = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespaces: ['bar'],
+        attributes: { bar: true },
+      } as any);
+
+      const v2 = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespaces: ['bar'],
+        attributes: { bar: true },
+      } as any);
+
+      expect(v1._id).toMatch(/^foo\:[\w-]+$/);
+      expect(v1._id).not.toEqual(v2._id);
+    });
+
+    test(`doesn't specify _source.namespaces`, () => {
+      const actual = namespaceAgnosticSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespaces: ['bar'],
         attributes: {},
-        version: encodeVersion(1, 2),
       } as any);
 
-      expect(actual).toHaveProperty('_seq_no', 1);
-      expect(actual).toHaveProperty('_primary_term', 2);
+      expect(actual._source).not.toHaveProperty('namespaces');
     });
+  });
 
-    test(`if unspecified it doesn't add _seq_no or _primary_term properties`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.savedObjectToRaw({
-        type: '',
+  describe('multi-namespace type with a namespace', () => {
+    test('generates an id prefixed with type, if no id is specified', () => {
+      const v1 = multiNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespace: 'bar',
+        attributes: { bar: true },
+      } as any);
+
+      const v2 = multiNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespace: 'bar',
+        attributes: { bar: true },
+      } as any);
+
+      expect(v1._id).toMatch(/^foo\:[\w-]+$/);
+      expect(v1._id).not.toEqual(v2._id);
+    });
+
+    test(`doesn't specify _source.namespace`, () => {
+      const actual = multiNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespace: 'bar',
         attributes: {},
       } as any);
 
-      expect(actual).not.toHaveProperty('_seq_no');
-      expect(actual).not.toHaveProperty('_primary_term');
+      expect(actual._source).not.toHaveProperty('namespace');
     });
+  });
+
+  describe('multi-namespace type with namespaces', () => {
+    test('generates an id prefixed with type, if no id is specified', () => {
+      const v1 = multiNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespaces: ['bar'],
+        attributes: { bar: true },
+      } as any);
+
+      const v2 = multiNamespaceSerializer.savedObjectToRaw({
+        type: 'foo',
+        namespaces: ['bar'],
+        attributes: { bar: true },
+      } as any);
 
-    test(`if version invalid it throws`, () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      expect(() =>
-        serializer.savedObjectToRaw({
-          type: '',
-          attributes: {},
-          version: 'foo',
-        } as any)
-      ).toThrowErrorMatchingInlineSnapshot(`"Invalid version [foo]"`);
+      expect(v1._id).toMatch(/^foo\:[\w-]+$/);
+      expect(v1._id).not.toEqual(v2._id);
     });
 
-    test('it copies attributes to _source[type]', () => {
-      const serializer = new SavedObjectsSerializer(typeRegistry);
-      const actual = serializer.savedObjectToRaw({
+    test(`it copies namespaces to _source.namespaces`, () => {
+      const actual = multiNamespaceSerializer.savedObjectToRaw({
         type: 'foo',
-        attributes: {
-          foo: true,
-          bar: 'quz',
-        },
+        namespaces: ['bar'],
+        attributes: {},
       } as any);
 
-      expect(actual._source).toHaveProperty('foo', {
-        foo: true,
-        bar: 'quz',
-      });
+      expect(actual._source).toHaveProperty('namespaces', ['bar']);
     });
+  });
+});
 
-    describe('namespaced type without a namespace', () => {
-      test('generates an id prefixed with type, if no id is specified', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const v1 = serializer.savedObjectToRaw({
-          type: 'foo',
-          attributes: {
-            bar: true,
+describe('#isRawSavedObject', () => {
+  describe('single-namespace type without a namespace', () => {
+    test('is true if the id is prefixed and the type matches', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            type: 'hello',
+            hello: {},
           },
-        } as any);
+        })
+      ).toBeTruthy();
+    });
 
-        const v2 = serializer.savedObjectToRaw({
-          type: 'foo',
-          attributes: {
-            bar: true,
+    test('is false if the id is not prefixed', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'world',
+          _source: {
+            type: 'hello',
+            hello: {},
           },
-        } as any);
+        })
+      ).toBeFalsy();
+    });
 
-        expect(v1._id).toMatch(/foo\:[\w-]+$/);
-        expect(v1._id).not.toEqual(v2._id);
-      });
+    test('is false if the type attribute is missing', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            hello: {},
+          } as any,
+        })
+      ).toBeFalsy();
+    });
 
-      test(`doesn't specify _source.namespace`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.savedObjectToRaw({
-          type: '',
-          attributes: {},
-        } as any);
+    test(`is false if the type prefix omits the :`, () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'helloworld',
+          _source: {
+            type: 'hello',
+            hello: {},
+          },
+        })
+      ).toBeFalsy();
+    });
 
-        expect(actual._source).not.toHaveProperty('namespace');
-      });
+    test('is false if the type attribute does not match the id', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            type: 'jam',
+            jam: {},
+            hello: {},
+          },
+        })
+      ).toBeFalsy();
     });
 
-    describe('namespaced type with a namespace', () => {
-      test('generates an id prefixed with namespace and type, if no id is specified', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const v1 = serializer.savedObjectToRaw({
-          type: 'foo',
-          namespace: 'bar',
-          attributes: {
-            bar: true,
+    test('is false if there is no [type] attribute', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            type: 'hello',
+            jam: {},
           },
-        } as any);
+        })
+      ).toBeFalsy();
+    });
+  });
 
-        const v2 = serializer.savedObjectToRaw({
-          type: 'foo',
-          namespace: 'bar',
-          attributes: {
-            bar: true,
+  describe('single-namespace type with a namespace', () => {
+    test('is true if the id is prefixed with type and namespace and the type matches', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'foo:hello:world',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
           },
-        } as any);
+        })
+      ).toBeTruthy();
+    });
 
-        expect(v1._id).toMatch(/bar\:foo\:[\w-]+$/);
-        expect(v1._id).not.toEqual(v2._id);
-      });
+    test('is false if the id is not prefixed by anything', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'world',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
 
-      test(`it copies namespace to _source.namespace`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.savedObjectToRaw({
-          type: 'foo',
-          attributes: {},
-          namespace: 'bar',
-        } as any);
+    test('is false if the id is prefixed only with type and the type matches', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
+
+    test('is false if the id is prefixed only with namespace and the namespace matches', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'foo:world',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
 
-        expect(actual._source).toHaveProperty('namespace', 'bar');
-      });
+    test(`is false if the id prefix omits the trailing :`, () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'foo:helloworld',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
     });
 
-    describe('namespace agnostic type with a namespace', () => {
-      beforeEach(() => {
-        typeRegistry.isNamespaceAgnostic.mockReturnValue(true);
-      });
+    test('is false if the type attribute is missing', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'foo:hello:world',
+          _source: {
+            hello: {},
+            namespace: 'foo',
+          } as any,
+        })
+      ).toBeFalsy();
+    });
 
-      test('generates an id prefixed with type, if no id is specified', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const v1 = serializer.savedObjectToRaw({
-          type: 'foo',
-          namespace: 'bar',
-          attributes: {
-            bar: true,
+    test('is false if the type attribute does not match the id', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'foo:hello:world',
+          _source: {
+            type: 'jam',
+            jam: {},
+            hello: {},
+            namespace: 'foo',
           },
-        } as any);
+        })
+      ).toBeFalsy();
+    });
 
-        const v2 = serializer.savedObjectToRaw({
-          type: 'foo',
-          namespace: 'bar',
-          attributes: {
-            bar: true,
+    test('is false if the namespace attribute does not match the id', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'bar:jam:world',
+          _source: {
+            type: 'jam',
+            jam: {},
+            hello: {},
+            namespace: 'foo',
           },
-        } as any);
+        })
+      ).toBeFalsy();
+    });
 
-        expect(v1._id).toMatch(/foo\:[\w-]+$/);
-        expect(v1._id).not.toEqual(v2._id);
-      });
+    test('is false if there is no [type] attribute', () => {
+      expect(
+        singleNamespaceSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            type: 'hello',
+            jam: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
+  });
 
-      test(`doesn't specify _source.namespace`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const actual = serializer.savedObjectToRaw({
-          type: 'foo',
-          namespace: 'bar',
-          attributes: {},
-        } as any);
+  describe('namespace-agnostic type with a namespace', () => {
+    test('is true if the id is prefixed with type and the type matches', () => {
+      expect(
+        namespaceAgnosticSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeTruthy();
+    });
+
+    test('is false if the id is not prefixed', () => {
+      expect(
+        namespaceAgnosticSerializer.isRawSavedObject({
+          _id: 'world',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
+
+    test('is false if the id is prefixed with type and namespace', () => {
+      expect(
+        namespaceAgnosticSerializer.isRawSavedObject({
+          _id: 'foo:hello:world',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
+
+    test(`is false if the type prefix omits the :`, () => {
+      expect(
+        namespaceAgnosticSerializer.isRawSavedObject({
+          _id: 'helloworld',
+          _source: {
+            type: 'hello',
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
+
+    test('is false if the type attribute is missing', () => {
+      expect(
+        namespaceAgnosticSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            hello: {},
+            namespace: 'foo',
+          } as any,
+        })
+      ).toBeFalsy();
+    });
+
+    test('is false if the type attribute does not match the id', () => {
+      expect(
+        namespaceAgnosticSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            type: 'jam',
+            jam: {},
+            hello: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
+
+    test('is false if there is no [type] attribute', () => {
+      expect(
+        namespaceAgnosticSerializer.isRawSavedObject({
+          _id: 'hello:world',
+          _source: {
+            type: 'hello',
+            jam: {},
+            namespace: 'foo',
+          },
+        })
+      ).toBeFalsy();
+    });
+  });
+});
 
-        expect(actual._source).not.toHaveProperty('namespace');
-      });
+describe('#generateRawId', () => {
+  describe('single-namespace type without a namespace', () => {
+    test('generates an id if none is specified', () => {
+      const id = singleNamespaceSerializer.generateRawId('', 'goodbye');
+      expect(id).toMatch(/^goodbye\:[\w-]+$/);
+    });
+
+    test('uses the id that is specified', () => {
+      const id = singleNamespaceSerializer.generateRawId('', 'hello', 'world');
+      expect(id).toEqual('hello:world');
     });
   });
 
-  describe('#isRawSavedObject', () => {
-    describe('namespaced type without a namespace', () => {
-      test('is true if the id is prefixed and the type matches', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              type: 'hello',
-              hello: {},
-            },
-          })
-        ).toBeTruthy();
-      });
-
-      test('is false if the id is not prefixed', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'world',
-            _source: {
-              type: 'hello',
-              hello: {},
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the type attribute is missing', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              hello: {},
-            } as any,
-          })
-        ).toBeFalsy();
-      });
-
-      test(`is false if the type prefix omits the :`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'helloworld',
-            _source: {
-              type: 'hello',
-              hello: {},
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the type attribute does not match the id', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              type: 'jam',
-              jam: {},
-              hello: {},
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if there is no [type] attribute', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              type: 'hello',
-              jam: {},
-            },
-          })
-        ).toBeFalsy();
-      });
-    });
-
-    describe('namespaced type with a namespace', () => {
-      test('is true if the id is prefixed with type and namespace and the type matches', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'foo:hello:world',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeTruthy();
-      });
-
-      test('is false if the id is not prefixed by anything', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'world',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the id is prefixed only with type and the type matches', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the id is prefixed only with namespace and the namespace matches', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'foo:world',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test(`is false if the id prefix omits the trailing :`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'foo:helloworld',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the type attribute is missing', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'foo:hello:world',
-            _source: {
-              hello: {},
-              namespace: 'foo',
-            } as any,
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the type attribute does not match the id', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'foo:hello:world',
-            _source: {
-              type: 'jam',
-              jam: {},
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the namespace attribute does not match the id', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'bar:jam:world',
-            _source: {
-              type: 'jam',
-              jam: {},
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if there is no [type] attribute', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              type: 'hello',
-              jam: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-    });
-
-    describe('namespace agnostic type with a namespace', () => {
-      beforeEach(() => {
-        typeRegistry.isNamespaceAgnostic.mockReturnValue(true);
-      });
-
-      test('is true if the id is prefixed with type and the type matches', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeTruthy();
-      });
-
-      test('is false if the id is not prefixed', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'world',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the id is prefixed with type and namespace', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'foo:hello:world',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test(`is false if the type prefix omits the :`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'helloworld',
-            _source: {
-              type: 'hello',
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the type attribute is missing', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              hello: {},
-              namespace: 'foo',
-            } as any,
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if the type attribute does not match the id', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              type: 'jam',
-              jam: {},
-              hello: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
-
-      test('is false if there is no [type] attribute', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        expect(
-          serializer.isRawSavedObject({
-            _id: 'hello:world',
-            _source: {
-              type: 'hello',
-              jam: {},
-              namespace: 'foo',
-            },
-          })
-        ).toBeFalsy();
-      });
+  describe('single-namespace type with a namespace', () => {
+    test('generates an id if none is specified and prefixes namespace', () => {
+      const id = singleNamespaceSerializer.generateRawId('foo', 'goodbye');
+      expect(id).toMatch(/^foo:goodbye\:[\w-]+$/);
+    });
+
+    test('uses the id that is specified and prefixes the namespace', () => {
+      const id = singleNamespaceSerializer.generateRawId('foo', 'hello', 'world');
+      expect(id).toEqual('foo:hello:world');
     });
   });
 
-  describe('#generateRawId', () => {
-    describe('namespaced type without a namespace', () => {
-      test('generates an id if none is specified', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const id = serializer.generateRawId('', 'goodbye');
-        expect(id).toMatch(/goodbye\:[\w-]+$/);
-      });
-
-      test('uses the id that is specified', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const id = serializer.generateRawId('', 'hello', 'world');
-        expect(id).toMatch('hello:world');
-      });
-    });
-
-    describe('namespaced type with a namespace', () => {
-      test('generates an id if none is specified and prefixes namespace', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const id = serializer.generateRawId('foo', 'goodbye');
-        expect(id).toMatch(/foo:goodbye\:[\w-]+$/);
-      });
-
-      test('uses the id that is specified and prefixes the namespace', () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const id = serializer.generateRawId('foo', 'hello', 'world');
-        expect(id).toMatch('foo:hello:world');
-      });
-    });
-
-    describe('namespace agnostic type with a namespace', () => {
-      test(`generates an id if none is specified and doesn't prefix namespace`, () => {
-        typeRegistry.isNamespaceAgnostic.mockReturnValue(true);
-
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const id = serializer.generateRawId('foo', 'goodbye');
-        expect(id).toMatch(/goodbye\:[\w-]+$/);
-      });
-
-      test(`uses the id that is specified and doesn't prefix the namespace`, () => {
-        const serializer = new SavedObjectsSerializer(typeRegistry);
-        const id = serializer.generateRawId('foo', 'hello', 'world');
-        expect(id).toMatch('hello:world');
-      });
+  describe('namespace-agnostic type with a namespace', () => {
+    test(`generates an id if none is specified and doesn't prefix namespace`, () => {
+      const id = namespaceAgnosticSerializer.generateRawId('foo', 'goodbye');
+      expect(id).toMatch(/^goodbye\:[\w-]+$/);
+    });
+
+    test(`uses the id that is specified and doesn't prefix the namespace`, () => {
+      const id = namespaceAgnosticSerializer.generateRawId('foo', 'hello', 'world');
+      expect(id).toEqual('hello:world');
     });
   });
 });
diff --git a/src/core/server/saved_objects/serialization/serializer.ts b/src/core/server/saved_objects/serialization/serializer.ts
index 99d6b0c6b59f9..3b19d494d8ecf 100644
--- a/src/core/server/saved_objects/serialization/serializer.ts
+++ b/src/core/server/saved_objects/serialization/serializer.ts
@@ -49,7 +49,7 @@ export class SavedObjectsSerializer {
   public isRawSavedObject(rawDoc: SavedObjectsRawDoc) {
     const { type, namespace } = rawDoc._source;
     const namespacePrefix =
-      namespace && !this.registry.isNamespaceAgnostic(type) ? `${namespace}:` : '';
+      namespace && this.registry.isSingleNamespace(type) ? `${namespace}:` : '';
     return Boolean(
       type &&
         rawDoc._id.startsWith(`${namespacePrefix}${type}:`) &&
@@ -64,7 +64,7 @@ export class SavedObjectsSerializer {
    */
   public rawToSavedObject(doc: SavedObjectsRawDoc): SavedObjectSanitizedDoc {
     const { _id, _source, _seq_no, _primary_term } = doc;
-    const { type, namespace } = _source;
+    const { type, namespace, namespaces } = _source;
 
     const version =
       _seq_no != null || _primary_term != null
@@ -74,7 +74,8 @@ export class SavedObjectsSerializer {
     return {
       type,
       id: this.trimIdPrefix(namespace, type, _id),
-      ...(namespace && !this.registry.isNamespaceAgnostic(type) && { namespace }),
+      ...(namespace && this.registry.isSingleNamespace(type) && { namespace }),
+      ...(namespaces && this.registry.isMultiNamespace(type) && { namespaces }),
       attributes: _source[type],
       references: _source.references || [],
       ...(_source.migrationVersion && { migrationVersion: _source.migrationVersion }),
@@ -93,6 +94,7 @@ export class SavedObjectsSerializer {
       id,
       type,
       namespace,
+      namespaces,
       attributes,
       migrationVersion,
       updated_at,
@@ -103,7 +105,8 @@ export class SavedObjectsSerializer {
       [type]: attributes,
       type,
       references,
-      ...(namespace && !this.registry.isNamespaceAgnostic(type) && { namespace }),
+      ...(namespace && this.registry.isSingleNamespace(type) && { namespace }),
+      ...(namespaces && this.registry.isMultiNamespace(type) && { namespaces }),
       ...(migrationVersion && { migrationVersion }),
       ...(updated_at && { updated_at }),
     };
@@ -124,7 +127,7 @@ export class SavedObjectsSerializer {
    */
   public generateRawId(namespace: string | undefined, type: string, id?: string) {
     const namespacePrefix =
-      namespace && !this.registry.isNamespaceAgnostic(type) ? `${namespace}:` : '';
+      namespace && this.registry.isSingleNamespace(type) ? `${namespace}:` : '';
     return `${namespacePrefix}${type}:${id || uuid.v1()}`;
   }
 
@@ -133,7 +136,7 @@ export class SavedObjectsSerializer {
     assertNonEmptyString(type, 'saved object type');
 
     const namespacePrefix =
-      namespace && !this.registry.isNamespaceAgnostic(type) ? `${namespace}:` : '';
+      namespace && this.registry.isSingleNamespace(type) ? `${namespace}:` : '';
     const prefix = `${namespacePrefix}${type}:`;
 
     if (!id.startsWith(prefix)) {
diff --git a/src/core/server/saved_objects/serialization/types.ts b/src/core/server/saved_objects/serialization/types.ts
index dfaec127ba159..7ea61f67e9496 100644
--- a/src/core/server/saved_objects/serialization/types.ts
+++ b/src/core/server/saved_objects/serialization/types.ts
@@ -36,6 +36,7 @@ export interface SavedObjectsRawDoc {
 export interface SavedObjectsRawDocSource {
   type: string;
   namespace?: string;
+  namespaces?: string[];
   migrationVersion?: SavedObjectsMigrationVersion;
   updated_at?: string;
   references?: SavedObjectReference[];
@@ -54,6 +55,7 @@ interface SavedObjectDoc {
   id?: string; // NOTE: SavedObjectDoc is used for uncreated objects where `id` is optional
   type: string;
   namespace?: string;
+  namespaces?: string[];
   migrationVersion?: SavedObjectsMigrationVersion;
   version?: string;
   updated_at?: string;
diff --git a/src/core/server/saved_objects/service/lib/__snapshots__/repository.test.js.snap b/src/core/server/saved_objects/service/lib/__snapshots__/repository.test.js.snap
deleted file mode 100644
index 609906c97d599..0000000000000
--- a/src/core/server/saved_objects/service/lib/__snapshots__/repository.test.js.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SavedObjectsRepository #deleteByNamespace requires namespace to be a string 1`] = `"namespace is required, and must be a string"`;
-
-exports[`SavedObjectsRepository #deleteByNamespace requires namespace to be defined 1`] = `"namespace is required, and must be a string"`;
diff --git a/src/core/server/saved_objects/service/lib/decorate_es_error.test.ts b/src/core/server/saved_objects/service/lib/decorate_es_error.test.ts
index 2fd9b487f470a..1fdebd87397eb 100644
--- a/src/core/server/saved_objects/service/lib/decorate_es_error.test.ts
+++ b/src/core/server/saved_objects/service/lib/decorate_es_error.test.ts
@@ -100,6 +100,38 @@ describe('savedObjectsClient/decorateEsError', () => {
     expect(SavedObjectsErrorHelpers.isBadRequestError(error)).toBe(true);
   });
 
+  describe('when es.BadRequest has a reason', () => {
+    it('makes a SavedObjectsClient/esCannotExecuteScriptError error when script context is disabled', () => {
+      const error = new esErrors.BadRequest();
+      (error as Record<string, any>).body = {
+        error: { reason: 'cannot execute scripts using [update] context' },
+      };
+      expect(SavedObjectsErrorHelpers.isEsCannotExecuteScriptError(error)).toBe(false);
+      expect(decorateEsError(error)).toBe(error);
+      expect(SavedObjectsErrorHelpers.isEsCannotExecuteScriptError(error)).toBe(true);
+      expect(SavedObjectsErrorHelpers.isBadRequestError(error)).toBe(false);
+    });
+
+    it('makes a SavedObjectsClient/esCannotExecuteScriptError error when inline scripts are disabled', () => {
+      const error = new esErrors.BadRequest();
+      (error as Record<string, any>).body = {
+        error: { reason: 'cannot execute [inline] scripts' },
+      };
+      expect(SavedObjectsErrorHelpers.isEsCannotExecuteScriptError(error)).toBe(false);
+      expect(decorateEsError(error)).toBe(error);
+      expect(SavedObjectsErrorHelpers.isEsCannotExecuteScriptError(error)).toBe(true);
+      expect(SavedObjectsErrorHelpers.isBadRequestError(error)).toBe(false);
+    });
+
+    it('makes a SavedObjectsClient/BadRequest error for any other reason', () => {
+      const error = new esErrors.BadRequest();
+      (error as Record<string, any>).body = { error: { reason: 'some other reason' } };
+      expect(SavedObjectsErrorHelpers.isBadRequestError(error)).toBe(false);
+      expect(decorateEsError(error)).toBe(error);
+      expect(SavedObjectsErrorHelpers.isBadRequestError(error)).toBe(true);
+    });
+  });
+
   it('returns other errors as Boom errors', () => {
     const error = new Error();
     expect(error).not.toHaveProperty('isBoom');
diff --git a/src/core/server/saved_objects/service/lib/decorate_es_error.ts b/src/core/server/saved_objects/service/lib/decorate_es_error.ts
index eb9bc89636435..e57f08aa7a527 100644
--- a/src/core/server/saved_objects/service/lib/decorate_es_error.ts
+++ b/src/core/server/saved_objects/service/lib/decorate_es_error.ts
@@ -35,6 +35,8 @@ const {
   NotFound,
   BadRequest,
 } = legacyElasticsearch.errors;
+const SCRIPT_CONTEXT_DISABLED_REGEX = /(?:cannot execute scripts using \[)([a-z]*)(?:\] context)/;
+const INLINE_SCRIPTS_DISABLED_MESSAGE = 'cannot execute [inline] scripts';
 
 import { SavedObjectsErrorHelpers } from './errors';
 
@@ -43,7 +45,7 @@ export function decorateEsError(error: Error) {
     throw new Error('Expected an instance of Error');
   }
 
-  const { reason } = get(error, 'body.error', { reason: undefined });
+  const { reason } = get(error, 'body.error', { reason: undefined }) as { reason?: string };
   if (
     error instanceof ConnectionFault ||
     error instanceof ServiceUnavailable ||
@@ -74,6 +76,12 @@ export function decorateEsError(error: Error) {
   }
 
   if (error instanceof BadRequest) {
+    if (
+      SCRIPT_CONTEXT_DISABLED_REGEX.test(reason || '') ||
+      reason === INLINE_SCRIPTS_DISABLED_MESSAGE
+    ) {
+      return SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(error, reason);
+    }
     return SavedObjectsErrorHelpers.decorateBadRequestError(error, reason);
   }
 
diff --git a/src/core/server/saved_objects/service/lib/errors.test.ts b/src/core/server/saved_objects/service/lib/errors.test.ts
index 12fc913f93090..4a43835d795d1 100644
--- a/src/core/server/saved_objects/service/lib/errors.test.ts
+++ b/src/core/server/saved_objects/service/lib/errors.test.ts
@@ -34,6 +34,7 @@ describe('savedObjectsClient/errorTypes', () => {
       });
 
       it('has boom properties', () => {
+        expect(errorObj).toHaveProperty('isBoom', true);
         expect(errorObj.output.payload).toMatchObject({
           statusCode: 400,
           message: "Unsupported saved object type: 'someType': Bad Request",
@@ -57,6 +58,7 @@ describe('savedObjectsClient/errorTypes', () => {
       });
 
       it('has boom properties', () => {
+        expect(errorObj).toHaveProperty('isBoom', true);
         expect(errorObj.output.payload).toMatchObject({
           statusCode: 400,
           message: 'test reason message: Bad Request',
@@ -80,14 +82,7 @@ describe('savedObjectsClient/errorTypes', () => {
 
       it('adds boom properties', () => {
         const error = SavedObjectsErrorHelpers.decorateBadRequestError(new Error());
-        expect(typeof error.output).toBe('object');
-        expect(error.output.statusCode).toBe(400);
-      });
-
-      it('preserves boom properties of input', () => {
-        const error = Boom.notFound();
-        SavedObjectsErrorHelpers.decorateBadRequestError(error);
-        expect(error.output.statusCode).toBe(404);
+        expect(error).toHaveProperty('isBoom', true);
       });
 
       describe('error.output', () => {
@@ -95,6 +90,7 @@ describe('savedObjectsClient/errorTypes', () => {
           const error = SavedObjectsErrorHelpers.decorateBadRequestError(new Error('foobar'));
           expect(error.output.payload).toHaveProperty('message', 'foobar');
         });
+
         it('prefixes message with passed reason', () => {
           const error = SavedObjectsErrorHelpers.decorateBadRequestError(
             new Error('foobar'),
@@ -102,13 +98,21 @@ describe('savedObjectsClient/errorTypes', () => {
           );
           expect(error.output.payload).toHaveProperty('message', 'biz: foobar');
         });
+
         it('sets statusCode to 400', () => {
           const error = SavedObjectsErrorHelpers.decorateBadRequestError(new Error('foo'));
           expect(error.output).toHaveProperty('statusCode', 400);
         });
+
+        it('preserves boom properties of input', () => {
+          const error = Boom.notFound();
+          SavedObjectsErrorHelpers.decorateBadRequestError(error);
+          expect(error.output).toHaveProperty('statusCode', 404);
+        });
       });
     });
   });
+
   describe('NotAuthorized error', () => {
     describe('decorateNotAuthorizedError', () => {
       it('returns original object', () => {
@@ -125,14 +129,7 @@ describe('savedObjectsClient/errorTypes', () => {
 
       it('adds boom properties', () => {
         const error = SavedObjectsErrorHelpers.decorateNotAuthorizedError(new Error());
-        expect(typeof error.output).toBe('object');
-        expect(error.output.statusCode).toBe(401);
-      });
-
-      it('preserves boom properties of input', () => {
-        const error = Boom.notFound();
-        SavedObjectsErrorHelpers.decorateNotAuthorizedError(error);
-        expect(error.output.statusCode).toBe(404);
+        expect(error).toHaveProperty('isBoom', true);
       });
 
       describe('error.output', () => {
@@ -140,6 +137,7 @@ describe('savedObjectsClient/errorTypes', () => {
           const error = SavedObjectsErrorHelpers.decorateNotAuthorizedError(new Error('foobar'));
           expect(error.output.payload).toHaveProperty('message', 'foobar');
         });
+
         it('prefixes message with passed reason', () => {
           const error = SavedObjectsErrorHelpers.decorateNotAuthorizedError(
             new Error('foobar'),
@@ -147,13 +145,21 @@ describe('savedObjectsClient/errorTypes', () => {
           );
           expect(error.output.payload).toHaveProperty('message', 'biz: foobar');
         });
+
         it('sets statusCode to 401', () => {
           const error = SavedObjectsErrorHelpers.decorateNotAuthorizedError(new Error('foo'));
           expect(error.output).toHaveProperty('statusCode', 401);
         });
+
+        it('preserves boom properties of input', () => {
+          const error = Boom.notFound();
+          SavedObjectsErrorHelpers.decorateNotAuthorizedError(error);
+          expect(error.output).toHaveProperty('statusCode', 404);
+        });
       });
     });
   });
+
   describe('Forbidden error', () => {
     describe('decorateForbiddenError', () => {
       it('returns original object', () => {
@@ -170,14 +176,7 @@ describe('savedObjectsClient/errorTypes', () => {
 
       it('adds boom properties', () => {
         const error = SavedObjectsErrorHelpers.decorateForbiddenError(new Error());
-        expect(typeof error.output).toBe('object');
-        expect(error.output.statusCode).toBe(403);
-      });
-
-      it('preserves boom properties of input', () => {
-        const error = Boom.notFound();
-        SavedObjectsErrorHelpers.decorateForbiddenError(error);
-        expect(error.output.statusCode).toBe(404);
+        expect(error).toHaveProperty('isBoom', true);
       });
 
       describe('error.output', () => {
@@ -185,17 +184,26 @@ describe('savedObjectsClient/errorTypes', () => {
           const error = SavedObjectsErrorHelpers.decorateForbiddenError(new Error('foobar'));
           expect(error.output.payload).toHaveProperty('message', 'foobar');
         });
+
         it('prefixes message with passed reason', () => {
           const error = SavedObjectsErrorHelpers.decorateForbiddenError(new Error('foobar'), 'biz');
           expect(error.output.payload).toHaveProperty('message', 'biz: foobar');
         });
+
         it('sets statusCode to 403', () => {
           const error = SavedObjectsErrorHelpers.decorateForbiddenError(new Error('foo'));
           expect(error.output).toHaveProperty('statusCode', 403);
         });
+
+        it('preserves boom properties of input', () => {
+          const error = Boom.notFound();
+          SavedObjectsErrorHelpers.decorateForbiddenError(error);
+          expect(error.output).toHaveProperty('statusCode', 404);
+        });
       });
     });
   });
+
   describe('NotFound error', () => {
     describe('createGenericNotFoundError', () => {
       it('makes an error identifiable as a NotFound error', () => {
@@ -203,11 +211,9 @@ describe('savedObjectsClient/errorTypes', () => {
         expect(SavedObjectsErrorHelpers.isNotFoundError(error)).toBe(true);
       });
 
-      it('is a boom error, has boom properties', () => {
+      it('returns a boom error', () => {
         const error = SavedObjectsErrorHelpers.createGenericNotFoundError();
-        expect(error).toHaveProperty('isBoom');
-        expect(typeof error.output).toBe('object');
-        expect(error.output.statusCode).toBe(404);
+        expect(error).toHaveProperty('isBoom', true);
       });
 
       describe('error.output', () => {
@@ -215,6 +221,7 @@ describe('savedObjectsClient/errorTypes', () => {
           const error = SavedObjectsErrorHelpers.createGenericNotFoundError();
           expect(error.output.payload).toHaveProperty('message', 'Not Found');
         });
+
         it('sets statusCode to 404', () => {
           const error = SavedObjectsErrorHelpers.createGenericNotFoundError();
           expect(error.output).toHaveProperty('statusCode', 404);
@@ -222,6 +229,7 @@ describe('savedObjectsClient/errorTypes', () => {
       });
     });
   });
+
   describe('Conflict error', () => {
     describe('decorateConflictError', () => {
       it('returns original object', () => {
@@ -238,14 +246,7 @@ describe('savedObjectsClient/errorTypes', () => {
 
       it('adds boom properties', () => {
         const error = SavedObjectsErrorHelpers.decorateConflictError(new Error());
-        expect(typeof error.output).toBe('object');
-        expect(error.output.statusCode).toBe(409);
-      });
-
-      it('preserves boom properties of input', () => {
-        const error = Boom.notFound();
-        SavedObjectsErrorHelpers.decorateConflictError(error);
-        expect(error.output.statusCode).toBe(404);
+        expect(error).toHaveProperty('isBoom', true);
       });
 
       describe('error.output', () => {
@@ -253,17 +254,77 @@ describe('savedObjectsClient/errorTypes', () => {
           const error = SavedObjectsErrorHelpers.decorateConflictError(new Error('foobar'));
           expect(error.output.payload).toHaveProperty('message', 'foobar');
         });
+
         it('prefixes message with passed reason', () => {
           const error = SavedObjectsErrorHelpers.decorateConflictError(new Error('foobar'), 'biz');
           expect(error.output.payload).toHaveProperty('message', 'biz: foobar');
         });
+
         it('sets statusCode to 409', () => {
           const error = SavedObjectsErrorHelpers.decorateConflictError(new Error('foo'));
           expect(error.output).toHaveProperty('statusCode', 409);
         });
+
+        it('preserves boom properties of input', () => {
+          const error = Boom.notFound();
+          SavedObjectsErrorHelpers.decorateConflictError(error);
+          expect(error.output).toHaveProperty('statusCode', 404);
+        });
+      });
+    });
+  });
+
+  describe('EsCannotExecuteScript error', () => {
+    describe('decorateEsCannotExecuteScriptError', () => {
+      it('returns original object', () => {
+        const error = new Error();
+        expect(SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(error)).toBe(error);
+      });
+
+      it('makes the error identifiable as a EsCannotExecuteScript error', () => {
+        const error = new Error();
+        expect(SavedObjectsErrorHelpers.isEsCannotExecuteScriptError(error)).toBe(false);
+        SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(error);
+        expect(SavedObjectsErrorHelpers.isEsCannotExecuteScriptError(error)).toBe(true);
+      });
+
+      it('adds boom properties', () => {
+        const error = SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(new Error());
+        expect(error).toHaveProperty('isBoom', true);
+      });
+
+      describe('error.output', () => {
+        it('defaults to message of error', () => {
+          const error = SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(
+            new Error('foobar')
+          );
+          expect(error.output.payload).toHaveProperty('message', 'foobar');
+        });
+
+        it('prefixes message with passed reason', () => {
+          const error = SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(
+            new Error('foobar'),
+            'biz'
+          );
+          expect(error.output.payload).toHaveProperty('message', 'biz: foobar');
+        });
+
+        it('sets statusCode to 501', () => {
+          const error = SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(
+            new Error('foo')
+          );
+          expect(error.output).toHaveProperty('statusCode', 400);
+        });
+
+        it('preserves boom properties of input', () => {
+          const error = Boom.notFound();
+          SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(error);
+          expect(error.output).toHaveProperty('statusCode', 404);
+        });
       });
     });
   });
+
   describe('EsUnavailable error', () => {
     describe('decorateEsUnavailableError', () => {
       it('returns original object', () => {
@@ -280,14 +341,7 @@ describe('savedObjectsClient/errorTypes', () => {
 
       it('adds boom properties', () => {
         const error = SavedObjectsErrorHelpers.decorateEsUnavailableError(new Error());
-        expect(typeof error.output).toBe('object');
-        expect(error.output.statusCode).toBe(503);
-      });
-
-      it('preserves boom properties of input', () => {
-        const error = Boom.notFound();
-        SavedObjectsErrorHelpers.decorateEsUnavailableError(error);
-        expect(error.output.statusCode).toBe(404);
+        expect(error).toHaveProperty('isBoom', true);
       });
 
       describe('error.output', () => {
@@ -295,6 +349,7 @@ describe('savedObjectsClient/errorTypes', () => {
           const error = SavedObjectsErrorHelpers.decorateEsUnavailableError(new Error('foobar'));
           expect(error.output.payload).toHaveProperty('message', 'foobar');
         });
+
         it('prefixes message with passed reason', () => {
           const error = SavedObjectsErrorHelpers.decorateEsUnavailableError(
             new Error('foobar'),
@@ -302,13 +357,21 @@ describe('savedObjectsClient/errorTypes', () => {
           );
           expect(error.output.payload).toHaveProperty('message', 'biz: foobar');
         });
+
         it('sets statusCode to 503', () => {
           const error = SavedObjectsErrorHelpers.decorateEsUnavailableError(new Error('foo'));
           expect(error.output).toHaveProperty('statusCode', 503);
         });
+
+        it('preserves boom properties of input', () => {
+          const error = Boom.notFound();
+          SavedObjectsErrorHelpers.decorateEsUnavailableError(error);
+          expect(error.output).toHaveProperty('statusCode', 404);
+        });
       });
     });
   });
+
   describe('General error', () => {
     describe('decorateGeneralError', () => {
       it('returns original object', () => {
@@ -318,14 +381,7 @@ describe('savedObjectsClient/errorTypes', () => {
 
       it('adds boom properties', () => {
         const error = SavedObjectsErrorHelpers.decorateGeneralError(new Error());
-        expect(typeof error.output).toBe('object');
-        expect(error.output.statusCode).toBe(500);
-      });
-
-      it('preserves boom properties of input', () => {
-        const error = Boom.notFound();
-        SavedObjectsErrorHelpers.decorateGeneralError(error);
-        expect(error.output.statusCode).toBe(404);
+        expect(error).toHaveProperty('isBoom', true);
       });
 
       describe('error.output', () => {
@@ -333,10 +389,17 @@ describe('savedObjectsClient/errorTypes', () => {
           const error = SavedObjectsErrorHelpers.decorateGeneralError(new Error('foobar'));
           expect(error.output.payload.message).toMatch(/internal server error/i);
         });
+
         it('sets statusCode to 500', () => {
           const error = SavedObjectsErrorHelpers.decorateGeneralError(new Error('foo'));
           expect(error.output).toHaveProperty('statusCode', 500);
         });
+
+        it('preserves boom properties of input', () => {
+          const error = Boom.notFound();
+          SavedObjectsErrorHelpers.decorateGeneralError(error);
+          expect(error.output).toHaveProperty('statusCode', 404);
+        });
       });
     });
   });
@@ -363,9 +426,7 @@ describe('savedObjectsClient/errorTypes', () => {
 
       it('returns a boom error', () => {
         const error = SavedObjectsErrorHelpers.createEsAutoCreateIndexError();
-        expect(error).toHaveProperty('isBoom');
-        expect(typeof error.output).toBe('object');
-        expect(error.output.statusCode).toBe(503);
+        expect(error).toHaveProperty('isBoom', true);
       });
 
       describe('error.output', () => {
@@ -373,6 +434,7 @@ describe('savedObjectsClient/errorTypes', () => {
           const error = SavedObjectsErrorHelpers.createEsAutoCreateIndexError();
           expect(error.output.payload).toHaveProperty('message', 'Automatic index creation failed');
         });
+
         it('sets statusCode to 503', () => {
           const error = SavedObjectsErrorHelpers.createEsAutoCreateIndexError();
           expect(error.output).toHaveProperty('statusCode', 503);
diff --git a/src/core/server/saved_objects/service/lib/errors.ts b/src/core/server/saved_objects/service/lib/errors.ts
index e9138e9b8a347..478c6b6d26d53 100644
--- a/src/core/server/saved_objects/service/lib/errors.ts
+++ b/src/core/server/saved_objects/service/lib/errors.ts
@@ -33,6 +33,8 @@ const CODE_REQUEST_ENTITY_TOO_LARGE = 'SavedObjectsClient/requestEntityTooLarge'
 const CODE_NOT_FOUND = 'SavedObjectsClient/notFound';
 // 409 - Conflict
 const CODE_CONFLICT = 'SavedObjectsClient/conflict';
+// 400 - Es Cannot Execute Script
+const CODE_ES_CANNOT_EXECUTE_SCRIPT = 'SavedObjectsClient/esCannotExecuteScript';
 // 503 - Es Unavailable
 const CODE_ES_UNAVAILABLE = 'SavedObjectsClient/esUnavailable';
 // 503 - Unable to automatically create index because of action.auto_create_index setting
@@ -152,10 +154,24 @@ export class SavedObjectsErrorHelpers {
     return decorate(error, CODE_CONFLICT, 409, reason);
   }
 
+  public static createConflictError(type: string, id: string) {
+    return SavedObjectsErrorHelpers.decorateConflictError(
+      Boom.conflict(`Saved object [${type}/${id}] conflict`)
+    );
+  }
+
   public static isConflictError(error: Error | DecoratedError) {
     return isSavedObjectsClientError(error) && error[code] === CODE_CONFLICT;
   }
 
+  public static decorateEsCannotExecuteScriptError(error: Error, reason?: string) {
+    return decorate(error, CODE_ES_CANNOT_EXECUTE_SCRIPT, 400, reason);
+  }
+
+  public static isEsCannotExecuteScriptError(error: Error | DecoratedError) {
+    return isSavedObjectsClientError(error) && error[code] === CODE_ES_CANNOT_EXECUTE_SCRIPT;
+  }
+
   public static decorateEsUnavailableError(error: Error, reason?: string) {
     return decorate(error, CODE_ES_UNAVAILABLE, 503, reason);
   }
diff --git a/src/core/server/saved_objects/service/lib/included_fields.test.ts b/src/core/server/saved_objects/service/lib/included_fields.test.ts
index 40d6552c2ad5f..ced99361f1ea0 100644
--- a/src/core/server/saved_objects/service/lib/included_fields.test.ts
+++ b/src/core/server/saved_objects/service/lib/included_fields.test.ts
@@ -26,7 +26,7 @@ describe('includedFields', () => {
 
   it('accepts type string', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(7);
+    expect(fields).toHaveLength(8);
     expect(fields).toContain('type');
   });
 
@@ -37,6 +37,7 @@ Array [
   "config.foo",
   "secret.foo",
   "namespace",
+  "namespaces",
   "type",
   "references",
   "migrationVersion",
@@ -48,14 +49,14 @@ Array [
 
   it('accepts field as string', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(7);
+    expect(fields).toHaveLength(8);
     expect(fields).toContain('config.foo');
   });
 
   it('accepts fields as an array', () => {
     const fields = includedFields('config', ['foo', 'bar']);
 
-    expect(fields).toHaveLength(9);
+    expect(fields).toHaveLength(10);
     expect(fields).toContain('config.foo');
     expect(fields).toContain('config.bar');
   });
@@ -69,6 +70,7 @@ Array [
   "secret.foo",
   "secret.bar",
   "namespace",
+  "namespaces",
   "type",
   "references",
   "migrationVersion",
@@ -81,31 +83,37 @@ Array [
 
   it('includes namespace', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(7);
+    expect(fields).toHaveLength(8);
     expect(fields).toContain('namespace');
   });
 
+  it('includes namespaces', () => {
+    const fields = includedFields('config', 'foo');
+    expect(fields).toHaveLength(8);
+    expect(fields).toContain('namespaces');
+  });
+
   it('includes references', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(7);
+    expect(fields).toHaveLength(8);
     expect(fields).toContain('references');
   });
 
   it('includes migrationVersion', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(7);
+    expect(fields).toHaveLength(8);
     expect(fields).toContain('migrationVersion');
   });
 
   it('includes updated_at', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(7);
+    expect(fields).toHaveLength(8);
     expect(fields).toContain('updated_at');
   });
 
   it('uses wildcard when type is not provided', () => {
     const fields = includedFields(undefined, 'foo');
-    expect(fields).toHaveLength(7);
+    expect(fields).toHaveLength(8);
     expect(fields).toContain('*.foo');
   });
 
@@ -113,7 +121,7 @@ Array [
     it('includes legacy field path', () => {
       const fields = includedFields('config', ['foo', 'bar']);
 
-      expect(fields).toHaveLength(9);
+      expect(fields).toHaveLength(10);
       expect(fields).toContain('foo');
       expect(fields).toContain('bar');
     });
diff --git a/src/core/server/saved_objects/service/lib/included_fields.ts b/src/core/server/saved_objects/service/lib/included_fields.ts
index f372db5a1a635..c50ac22594008 100644
--- a/src/core/server/saved_objects/service/lib/included_fields.ts
+++ b/src/core/server/saved_objects/service/lib/included_fields.ts
@@ -37,6 +37,7 @@ export function includedFields(type: string | string[] = '*', fields?: string[]
       return [...acc, ...sourceFields.map(f => `${t}.${f}`)];
     }, [])
     .concat('namespace')
+    .concat('namespaces')
     .concat('type')
     .concat('references')
     .concat('migrationVersion')
diff --git a/src/core/server/saved_objects/service/lib/repository.mock.ts b/src/core/server/saved_objects/service/lib/repository.mock.ts
index e69c0ff37d1be..afef378b7307b 100644
--- a/src/core/server/saved_objects/service/lib/repository.mock.ts
+++ b/src/core/server/saved_objects/service/lib/repository.mock.ts
@@ -28,6 +28,8 @@ const create = (): jest.Mocked<ISavedObjectsRepository> => ({
   find: jest.fn(),
   get: jest.fn(),
   update: jest.fn(),
+  addToNamespaces: jest.fn(),
+  deleteFromNamespaces: jest.fn(),
   deleteByNamespace: jest.fn(),
   incrementCounter: jest.fn(),
 });
diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js
index 2e5eeec04e0a8..927171438ae99 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import _ from 'lodash';
 
 import { SavedObjectsRepository } from './repository';
 import * as getSearchDslNS from './search_dsl/search_dsl';
@@ -30,162 +29,31 @@ jest.mock('./search_dsl/search_dsl', () => ({ getSearchDsl: jest.fn() }));
 // BEWARE: The SavedObjectClient depends on the implementation details of the SavedObjectsRepository
 // so any breaking changes to this repository are considered breaking changes to the SavedObjectsClient.
 
+const createBadRequestError = (...args) =>
+  SavedObjectsErrorHelpers.createBadRequestError(...args).output.payload;
+const createConflictError = (...args) =>
+  SavedObjectsErrorHelpers.createConflictError(...args).output.payload;
+const createGenericNotFoundError = (...args) =>
+  SavedObjectsErrorHelpers.createGenericNotFoundError(...args).output.payload;
+const createUnsupportedTypeError = (...args) =>
+  SavedObjectsErrorHelpers.createUnsupportedTypeError(...args).output.payload;
+
 describe('SavedObjectsRepository', () => {
   let callAdminCluster;
   let savedObjectsRepository;
   let migrator;
 
+  let serializer;
   const mockTimestamp = '2017-08-14T15:49:14.886Z';
   const mockTimestampFields = { updated_at: mockTimestamp };
   const mockVersionProps = { _seq_no: 1, _primary_term: 1 };
   const mockVersion = encodeHitVersion(mockVersionProps);
-  const noNamespaceSearchResults = {
-    hits: {
-      total: 4,
-      hits: [
-        {
-          _index: '.kibana',
-          _id: 'index-pattern:logstash-*',
-          _score: 1,
-          ...mockVersionProps,
-          _source: {
-            type: 'index-pattern',
-            ...mockTimestampFields,
-            'index-pattern': {
-              title: 'logstash-*',
-              timeFieldName: '@timestamp',
-              notExpandable: true,
-            },
-          },
-        },
-        {
-          _index: '.kibana',
-          _id: 'config:6.0.0-alpha1',
-          _score: 1,
-          ...mockVersionProps,
-          _source: {
-            type: 'config',
-            ...mockTimestampFields,
-            config: {
-              buildNum: 8467,
-              defaultIndex: 'logstash-*',
-            },
-          },
-        },
-        {
-          _index: '.kibana',
-          _id: 'index-pattern:stocks-*',
-          _score: 1,
-          ...mockVersionProps,
-          _source: {
-            type: 'index-pattern',
-            ...mockTimestampFields,
-            'index-pattern': {
-              title: 'stocks-*',
-              timeFieldName: '@timestamp',
-              notExpandable: true,
-            },
-          },
-        },
-        {
-          _index: '.kibana',
-          _id: 'globaltype:something',
-          _score: 1,
-          ...mockVersionProps,
-          _source: {
-            type: 'globaltype',
-            ...mockTimestampFields,
-            globaltype: {
-              name: 'bar',
-            },
-          },
-        },
-      ],
-    },
-  };
-
-  const namespacedSearchResults = {
-    hits: {
-      total: 4,
-      hits: [
-        {
-          _index: '.kibana',
-          _id: 'foo-namespace:index-pattern:logstash-*',
-          _score: 1,
-          ...mockVersionProps,
-          _source: {
-            namespace: 'foo-namespace',
-            type: 'index-pattern',
-            ...mockTimestampFields,
-            'index-pattern': {
-              title: 'logstash-*',
-              timeFieldName: '@timestamp',
-              notExpandable: true,
-            },
-          },
-        },
-        {
-          _index: '.kibana',
-          _id: 'foo-namespace:config:6.0.0-alpha1',
-          _score: 1,
-          ...mockVersionProps,
-          _source: {
-            namespace: 'foo-namespace',
-            type: 'config',
-            ...mockTimestampFields,
-            config: {
-              buildNum: 8467,
-              defaultIndex: 'logstash-*',
-            },
-          },
-        },
-        {
-          _index: '.kibana',
-          _id: 'foo-namespace:index-pattern:stocks-*',
-          _score: 1,
-          ...mockVersionProps,
-          _source: {
-            namespace: 'foo-namespace',
-            type: 'index-pattern',
-            ...mockTimestampFields,
-            'index-pattern': {
-              title: 'stocks-*',
-              timeFieldName: '@timestamp',
-              notExpandable: true,
-            },
-          },
-        },
-        {
-          _index: '.kibana',
-          _id: 'globaltype:something',
-          _score: 1,
-          ...mockVersionProps,
-          _source: {
-            type: 'globaltype',
-            ...mockTimestampFields,
-            globaltype: {
-              name: 'bar',
-            },
-          },
-        },
-      ],
-    },
-  };
 
-  const deleteByQueryResults = {
-    took: 27,
-    timed_out: false,
-    total: 23,
-    deleted: 23,
-    batches: 1,
-    version_conflicts: 0,
-    noops: 0,
-    retries: { bulk: 0, search: 0 },
-    throttled_millis: 0,
-    requests_per_second: -1,
-    throttled_until_millis: 0,
-    failures: [],
-  };
+  const CUSTOM_INDEX_TYPE = 'customIndex';
+  const NAMESPACE_AGNOSTIC_TYPE = 'globalType';
+  const MULTI_NAMESPACE_TYPE = 'shareableType';
+  const MULTI_NAMESPACE_CUSTOM_INDEX_TYPE = 'shareableTypeCustomIndex';
+  const HIDDEN_TYPE = 'hiddenType';
 
   const mappings = {
     properties: {
@@ -194,43 +62,47 @@ describe('SavedObjectsRepository', () => {
           type: 'keyword',
         },
       },
-      foo: {
+      'index-pattern': {
         properties: {
-          type: 'keyword',
+          someField: {
+            type: 'keyword',
+          },
         },
       },
-      bar: {
+      dashboard: {
         properties: {
-          type: 'keyword',
+          otherField: {
+            type: 'keyword',
+          },
         },
       },
-      baz: {
+      [CUSTOM_INDEX_TYPE]: {
         properties: {
           type: 'keyword',
         },
       },
-      'index-pattern': {
+      [NAMESPACE_AGNOSTIC_TYPE]: {
         properties: {
-          someField: {
+          yetAnotherField: {
             type: 'keyword',
           },
         },
       },
-      dashboard: {
+      [MULTI_NAMESPACE_TYPE]: {
         properties: {
-          otherField: {
+          evenYetAnotherField: {
             type: 'keyword',
           },
         },
       },
-      globaltype: {
+      [MULTI_NAMESPACE_CUSTOM_INDEX_TYPE]: {
         properties: {
-          yetAnotherField: {
+          evenYetAnotherField: {
             type: 'keyword',
           },
         },
       },
-      hiddenType: {
+      [HIDDEN_TYPE]: {
         properties: {
           someField: {
             type: 'keyword',
@@ -240,96 +112,97 @@ describe('SavedObjectsRepository', () => {
     },
   };
 
-  const typeRegistry = new SavedObjectTypeRegistry();
-  typeRegistry.registerType({
-    name: 'config',
-    hidden: false,
-    namespaceAgnostic: false,
-    mappings: {
-      properties: {
-        type: 'keyword',
-      },
-    },
+  const createType = type => ({
+    name: type,
+    mappings: { properties: mappings.properties[type].properties },
   });
-  typeRegistry.registerType({
-    name: 'index-pattern',
-    hidden: false,
-    namespaceAgnostic: false,
-    mappings: {
-      properties: {
-        someField: {
-          type: 'keyword',
-        },
-      },
-    },
+
+  const registry = new SavedObjectTypeRegistry();
+  registry.registerType(createType('config'));
+  registry.registerType(createType('index-pattern'));
+  registry.registerType(createType('dashboard'));
+  registry.registerType({
+    ...createType(CUSTOM_INDEX_TYPE),
+    indexPattern: 'custom',
   });
-  typeRegistry.registerType({
-    name: 'dashboard',
-    hidden: false,
-    namespaceAgnostic: false,
-    mappings: {
-      properties: {
-        otherField: {
-          type: 'keyword',
-        },
-      },
-    },
+  registry.registerType({
+    ...createType(NAMESPACE_AGNOSTIC_TYPE),
+    namespaceType: 'agnostic',
   });
-  typeRegistry.registerType({
-    name: 'globaltype',
-    hidden: false,
-    namespaceAgnostic: true,
-    mappings: {
-      properties: {
-        yetAnotherField: {
-          type: 'keyword',
-        },
-      },
-    },
+  registry.registerType({
+    ...createType(MULTI_NAMESPACE_TYPE),
+    namespaceType: 'multiple',
   });
-  typeRegistry.registerType({
-    name: 'foo',
-    hidden: false,
-    namespaceAgnostic: true,
-    mappings: {
-      properties: {
-        type: 'keyword',
-      },
-    },
+  registry.registerType({
+    ...createType(MULTI_NAMESPACE_CUSTOM_INDEX_TYPE),
+    namespaceType: 'multiple',
+    indexPattern: 'custom',
   });
-  typeRegistry.registerType({
-    name: 'bar',
-    hidden: false,
-    namespaceAgnostic: true,
-    mappings: {
-      properties: {
-        type: 'keyword',
-      },
-    },
+  registry.registerType({
+    ...createType(HIDDEN_TYPE),
+    hidden: true,
+    namespaceType: 'agnostic',
   });
-  typeRegistry.registerType({
-    name: 'baz',
-    hidden: false,
-    namespaceAgnostic: false,
-    indexPattern: 'beats',
-    mappings: {
-      properties: {
-        type: 'keyword',
-      },
+
+  const getMockGetResponse = ({ type, id, references, namespace }) => ({
+    // NOTE: Elasticsearch returns more fields (_index, _type) but the SavedObjectsRepository method ignores these
+    found: true,
+    _id: `${registry.isSingleNamespace(type) && namespace ? `${namespace}:` : ''}${type}:${id}`,
+    ...mockVersionProps,
+    _source: {
+      ...(registry.isSingleNamespace(type) && { namespace }),
+      ...(registry.isMultiNamespace(type) && { namespaces: [namespace ?? 'default'] }),
+      type,
+      [type]: { title: 'Testing' },
+      references,
+      specialProperty: 'specialValue',
+      ...mockTimestampFields,
     },
   });
-  typeRegistry.registerType({
-    name: 'hiddenType',
-    hidden: true,
-    namespaceAgnostic: true,
-    mappings: {
-      properties: {
-        someField: {
-          type: 'keyword',
-        },
-      },
+
+  const getMockMgetResponse = (objects, namespace) => ({
+    status: 200,
+    docs: objects.map(obj =>
+      obj.found === false ? obj : getMockGetResponse({ ...obj, namespace })
+    ),
+  });
+
+  const expectClusterCalls = (...actions) => {
+    for (let i = 0; i < actions.length; i++) {
+      expect(callAdminCluster).toHaveBeenNthCalledWith(i + 1, actions[i], expect.any(Object));
+    }
+    expect(callAdminCluster).toHaveBeenCalledTimes(actions.length);
+  };
+  const expectClusterCallArgs = (args, n = 1) => {
+    expect(callAdminCluster).toHaveBeenNthCalledWith(
+      n,
+      expect.any(String),
+      expect.objectContaining(args)
+    );
+  };
+
+  expect.extend({
+    toBeDocumentWithoutError(received, type, id) {
+      if (received.type === type && received.id === id && !received.error) {
+        return { message: () => `expected type and id not to match without error`, pass: true };
+      } else {
+        return { message: () => `expected type and id to match without error`, pass: false };
+      }
     },
   });
+  const expectSuccess = ({ type, id }) => expect.toBeDocumentWithoutError(type, id);
+  const expectError = ({ type, id }) => ({ type, id, error: expect.any(Object) });
+  const expectErrorResult = ({ type, id }, error) => ({ type, id, error });
+  const expectErrorNotFound = obj =>
+    expectErrorResult(obj, createGenericNotFoundError(obj.type, obj.id));
+  const expectErrorConflict = obj => expectErrorResult(obj, createConflictError(obj.type, obj.id));
+  const expectErrorInvalidType = obj =>
+    expectErrorResult(obj, createUnsupportedTypeError(obj.type, obj.id));
+
+  const expectMigrationArgs = (args, contains = true, n = 1) => {
+    const obj = contains ? expect.objectContaining(args) : expect.not.objectContaining(args);
+    expect(migrator.migrateDocument).toHaveBeenNthCalledWith(n, obj);
+  };
 
   beforeEach(() => {
     callAdminCluster = jest.fn();
@@ -338,16 +211,28 @@ describe('SavedObjectsRepository', () => {
       runMigrations: async () => ({ status: 'skipped' }),
     };
 
-    const serializer = new SavedObjectsSerializer(typeRegistry);
-    const allTypes = typeRegistry.getAllTypes().map(type => type.name);
-    const allowedTypes = [...new Set(allTypes.filter(type => !typeRegistry.isHidden(type)))];
+    // create a mock serializer "shim" so we can track function calls, but use the real serializer's implementation
+    serializer = {
+      isRawSavedObject: jest.fn(),
+      rawToSavedObject: jest.fn(),
+      savedObjectToRaw: jest.fn(),
+      generateRawId: jest.fn(),
+      trimIdPrefix: jest.fn(),
+    };
+    const _serializer = new SavedObjectsSerializer(registry);
+    Object.keys(serializer).forEach(key => {
+      serializer[key].mockImplementation((...args) => _serializer[key](...args));
+    });
+
+    const allTypes = registry.getAllTypes().map(type => type.name);
+    const allowedTypes = [...new Set(allTypes.filter(type => !registry.isHidden(type)))];
 
     savedObjectsRepository = new SavedObjectsRepository({
       index: '.kibana-test',
       mappings,
       callCluster: callAdminCluster,
       migrator,
-      typeRegistry,
+      typeRegistry: registry,
       serializer,
       allowedTypes,
     });
@@ -356,2644 +241,2819 @@ describe('SavedObjectsRepository', () => {
     getSearchDslNS.getSearchDsl.mockReset();
   });
 
-  describe('#create', () => {
-    beforeEach(() => {
-      callAdminCluster.mockImplementation((method, params) => ({
-        _id: params.id,
-        ...mockVersionProps,
-      }));
-    });
+  const mockMigrationVersion = { foo: '2.3.4' };
+  const mockMigrateDocument = doc => ({
+    ...doc,
+    attributes: {
+      ...doc.attributes,
+      ...(doc.attributes?.title && { title: `${doc.attributes.title}!!` }),
+    },
+    migrationVersion: mockMigrationVersion,
+    references: [{ name: 'search_0', type: 'search', id: '123' }],
+  });
 
-    it('waits until migrations are complete before proceeding', async () => {
-      migrator.runMigrations = jest.fn(async () => expect(callAdminCluster).not.toHaveBeenCalled());
+  describe('#addToNamespaces', () => {
+    const id = 'some-id';
+    const type = MULTI_NAMESPACE_TYPE;
+    const currentNs1 = 'default';
+    const currentNs2 = 'foo-namespace';
+    const newNs1 = 'bar-namespace';
+    const newNs2 = 'baz-namespace';
+
+    const mockGetResponse = (type, id) => {
+      // mock a document that exists in two namespaces
+      const mockResponse = getMockGetResponse({ type, id });
+      mockResponse._source.namespaces = [currentNs1, currentNs2];
+      callAdminCluster.mockResolvedValueOnce(mockResponse); // this._callCluster('get', ...)
+    };
 
-      await expect(
-        savedObjectsRepository.create(
-          'index-pattern',
-          {
-            title: 'Logstash',
-          },
-          {
-            id: 'logstash-*',
-            namespace: 'foo-namespace',
-          }
-        )
-      ).resolves.toBeDefined();
-      expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
-    });
+    const addToNamespacesSuccess = async (type, id, namespaces, options) => {
+      mockGetResponse(type, id); // this._callCluster('get', ...)
+      callAdminCluster.mockResolvedValue({
+        _id: `${type}:${id}`,
+        ...mockVersionProps,
+        result: 'updated',
+      }); // this._writeToCluster('update', ...)
+      const result = await savedObjectsRepository.addToNamespaces(type, id, namespaces, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(2);
+      return result;
+    };
 
-    it('formats Elasticsearch response', async () => {
-      const response = await savedObjectsRepository.create(
-        'index-pattern',
-        {
-          title: 'Logstash',
-        },
-        {
-          id: 'logstash-*',
-          namespace: 'foo-namespace',
-          references: [
-            {
-              name: 'ref_0',
-              type: 'test',
-              id: '123',
-            },
-          ],
-        }
-      );
+    describe('cluster calls', () => {
+      it(`should use ES get action then update action`, async () => {
+        await addToNamespacesSuccess(type, id, [newNs1, newNs2]);
+        expectClusterCalls('get', 'update');
+      });
 
-      expect(response).toEqual({
-        type: 'index-pattern',
-        id: 'logstash-*',
-        ...mockTimestampFields,
-        version: mockVersion,
-        attributes: {
-          title: 'Logstash',
-        },
-        references: [
-          {
-            name: 'ref_0',
-            type: 'test',
-            id: '123',
-          },
-        ],
+      it(`defaults to the version of the existing document`, async () => {
+        await addToNamespacesSuccess(type, id, [newNs1, newNs2]);
+        const versionProperties = {
+          if_seq_no: mockVersionProps._seq_no,
+          if_primary_term: mockVersionProps._primary_term,
+        };
+        expectClusterCallArgs(versionProperties, 2);
+      });
+
+      it(`accepts version`, async () => {
+        await addToNamespacesSuccess(type, id, [newNs1, newNs2], {
+          version: encodeHitVersion({ _seq_no: 100, _primary_term: 200 }),
+        });
+        expectClusterCallArgs({ if_seq_no: 100, if_primary_term: 200 }, 2);
       });
-    });
 
-    it('should use ES index action', async () => {
-      await savedObjectsRepository.create('index-pattern', {
-        id: 'logstash-*',
-        title: 'Logstash',
+      it(`defaults to a refresh setting of wait_for`, async () => {
+        await addToNamespacesSuccess(type, id, [newNs1, newNs2]);
+        expectClusterCallArgs({ refresh: 'wait_for' }, 2);
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith('index', expect.any(Object));
+      it(`accepts a custom refresh setting`, async () => {
+        const refresh = 'foo';
+        await addToNamespacesSuccess(type, id, [newNs1, newNs2], { refresh });
+        expectClusterCallArgs({ refresh }, 2);
+      });
     });
 
-    it('should use default index', async () => {
-      await savedObjectsRepository.create('index-pattern', {
-        id: 'logstash-*',
-        title: 'Logstash',
+    describe('errors', () => {
+      const expectNotFoundError = async (type, id, namespaces, options) => {
+        await expect(
+          savedObjectsRepository.addToNamespaces(type, id, namespaces, options)
+        ).rejects.toThrowError(createGenericNotFoundError(type, id));
+      };
+      const expectBadRequestError = async (type, id, namespaces, message) => {
+        await expect(
+          savedObjectsRepository.addToNamespaces(type, id, namespaces)
+        ).rejects.toThrowError(createBadRequestError(message));
+      };
+
+      it(`throws when type is invalid`, async () => {
+        await expectNotFoundError('unknownType', id, [newNs1, newNs2]);
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'index',
-        expect.objectContaining({
-          index: '.kibana-test',
-        })
-      );
-    });
+      it(`throws when type is hidden`, async () => {
+        await expectNotFoundError(HIDDEN_TYPE, id, [newNs1, newNs2]);
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
 
-    it('should use custom index', async () => {
-      await savedObjectsRepository.create('baz', {
-        id: 'logstash-*',
-        title: 'Logstash',
+      it(`throws when type is not multi-namespace`, async () => {
+        const test = async type => {
+          const message = `${type} doesn't support multiple namespaces`;
+          await expectBadRequestError(type, id, [newNs1, newNs2], message);
+          expect(callAdminCluster).not.toHaveBeenCalled();
+        };
+        await test('index-pattern');
+        await test(NAMESPACE_AGNOSTIC_TYPE);
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'index',
-        expect.objectContaining({
-          index: 'beats',
-        })
-      );
-    });
+      it(`throws when namespaces is an empty array`, async () => {
+        const test = async namespaces => {
+          const message = 'namespaces must be a non-empty array of strings';
+          await expectBadRequestError(type, id, namespaces, message);
+          expect(callAdminCluster).not.toHaveBeenCalled();
+        };
+        await test([]);
+      });
 
-    it('migrates the doc', async () => {
-      migrator.migrateDocument = doc => {
-        doc.attributes.title = doc.attributes.title + '!!';
-        doc.migrationVersion = { foo: '2.3.4' };
-        doc.references = [{ name: 'search_0', type: 'search', id: '123' }];
-        return doc;
-      };
+      it(`throws when ES is unable to find the document during get`, async () => {
+        callAdminCluster.mockResolvedValue({ found: false }); // this._callCluster('get', ...)
+        await expectNotFoundError(type, id, [newNs1, newNs2]);
+        expectClusterCalls('get');
+      });
 
-      await savedObjectsRepository.create('index-pattern', {
-        id: 'logstash-*',
-        title: 'Logstash',
+      it(`throws when ES is unable to find the index during get`, async () => {
+        callAdminCluster.mockResolvedValue({ status: 404 }); // this._callCluster('get', ...)
+        await expectNotFoundError(type, id, [newNs1, newNs2]);
+        expectClusterCalls('get');
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        body: {
-          'index-pattern': { id: 'logstash-*', title: 'Logstash!!' },
-          migrationVersion: { foo: '2.3.4' },
-          type: 'index-pattern',
-          updated_at: '2017-08-14T15:49:14.886Z',
-          references: [{ name: 'search_0', type: 'search', id: '123' }],
-        },
+      it(`throws when the document exists, but not in this namespace`, async () => {
+        mockGetResponse(type, id); // this._callCluster('get', ...)
+        await expectNotFoundError(type, id, [newNs1, newNs2], {
+          namespace: 'some-other-namespace',
+        });
+        expectClusterCalls('get');
       });
-    });
 
-    it('defaults to a refresh setting of `wait_for`', async () => {
-      await savedObjectsRepository.create('index-pattern', {
-        id: 'logstash-*',
-        title: 'Logstash',
+      it(`throws when ES is unable to find the document during update`, async () => {
+        mockGetResponse(type, id); // this._callCluster('get', ...)
+        callAdminCluster.mockResolvedValue({ status: 404 }); // this._writeToCluster('update', ...)
+        await expectNotFoundError(type, id, [newNs1, newNs2]);
+        expectClusterCalls('get', 'update');
       });
+    });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: 'wait_for',
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        let callAdminClusterCount = 0;
+        migrator.runMigrations = jest.fn(async () =>
+          // runMigrations should resolve before callAdminCluster is initiated
+          expect(callAdminCluster).toHaveBeenCalledTimes(callAdminClusterCount++)
+        );
+        await expect(addToNamespacesSuccess(type, id, [newNs1, newNs2])).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveReturnedTimes(2);
       });
     });
 
-    it('accepts custom refresh settings', async () => {
-      await savedObjectsRepository.create(
-        'index-pattern',
-        {
-          id: 'logstash-*',
-          title: 'Logstash',
-        },
-        {
-          refresh: true,
-        }
-      );
+    describe('returns', () => {
+      it(`returns an empty object on success`, async () => {
+        const result = await addToNamespacesSuccess(type, id, [newNs1, newNs2]);
+        expect(result).toEqual({});
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: true,
+      it(`succeeds when adding existing namespaces`, async () => {
+        const result = await addToNamespacesSuccess(type, id, [currentNs1]);
+        expect(result).toEqual({});
       });
     });
+  });
 
-    it('should use create action if ID defined and overwrite=false', async () => {
-      await savedObjectsRepository.create(
-        'index-pattern',
-        {
-          title: 'Logstash',
-        },
-        {
-          id: 'logstash-*',
-        }
-      );
+  describe('#bulkCreate', () => {
+    const obj1 = {
+      type: 'config',
+      id: '6.0.0-alpha1',
+      attributes: { title: 'Test One' },
+      references: [{ name: 'ref_0', type: 'test', id: '1' }],
+    };
+    const obj2 = {
+      type: 'index-pattern',
+      id: 'logstash-*',
+      attributes: { title: 'Test Two' },
+      references: [{ name: 'ref_0', type: 'test', id: '2' }],
+    };
+    const namespace = 'foo-namespace';
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith('create', expect.any(Object));
-    });
+    const getMockBulkCreateResponse = (objects, namespace) => {
+      return {
+        items: objects.map(({ type, id }) => ({
+          create: {
+            _id: `${namespace ? `${namespace}:` : ''}${type}:${id}`,
+            ...mockVersionProps,
+          },
+        })),
+      };
+    };
 
-    it('allows for id to be provided', async () => {
-      await savedObjectsRepository.create(
-        'index-pattern',
-        {
-          title: 'Logstash',
-        },
-        { id: 'logstash-*' }
-      );
+    const bulkCreateSuccess = async (objects, options) => {
+      const multiNamespaceObjects =
+        options?.overwrite &&
+        objects.filter(({ type, id }) => registry.isMultiNamespace(type) && id);
+      if (multiNamespaceObjects?.length) {
+        const response = getMockMgetResponse(multiNamespaceObjects, options?.namespace);
+        callAdminCluster.mockResolvedValueOnce(response); // this._callCluster('mget', ...)
+      }
+      const response = getMockBulkCreateResponse(objects, options?.namespace);
+      callAdminCluster.mockResolvedValue(response); // this._writeToCluster('bulk', ...)
+      const result = await savedObjectsRepository.bulkCreate(objects, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(multiNamespaceObjects?.length ? 2 : 1);
+      return result;
+    };
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          id: 'index-pattern:logstash-*',
-        })
-      );
+    // bulk create calls have two objects for each source -- the action, and the source
+    const expectClusterCallArgsAction = (
+      objects,
+      { method, _index = expect.any(String), getId = () => expect.any(String) }
+    ) => {
+      const body = [];
+      for (const { type, id } of objects) {
+        body.push({ [method]: { _index, _id: getId(type, id) } });
+        body.push(expect.any(Object));
+      }
+      expectClusterCallArgs({ body });
+    };
+
+    const expectObjArgs = ({ type, attributes, references }, overrides) => [
+      expect.any(Object),
+      expect.objectContaining({
+        [type]: attributes,
+        references,
+        type,
+        ...overrides,
+        ...mockTimestampFields,
+      }),
+    ];
+
+    const expectSuccessResult = obj => ({
+      ...obj,
+      migrationVersion: undefined,
+      version: mockVersion,
+      ...mockTimestampFields,
     });
 
-    it('self-generates an ID', async () => {
-      await savedObjectsRepository.create('index-pattern', {
-        title: 'Logstash',
+    describe('cluster calls', () => {
+      it(`should use the ES bulk action by default`, async () => {
+        await bulkCreateSuccess([obj1, obj2]);
+        expectClusterCalls('bulk');
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          id: expect.objectContaining(/index-pattern:[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}/),
-        })
-      );
-    });
+      it(`should use the ES mget action before bulk action for any types that are multi-namespace, when overwrite=true`, async () => {
+        const objects = [obj1, { ...obj2, type: MULTI_NAMESPACE_TYPE }];
+        await bulkCreateSuccess(objects, { overwrite: true });
+        expectClusterCalls('mget', 'bulk');
+        const docs = [expect.objectContaining({ _id: `${MULTI_NAMESPACE_TYPE}:${obj2.id}` })];
+        expectClusterCallArgs({ body: { docs } }, 1);
+      });
 
-    it('prepends namespace to the id and adds namespace to body when providing namespace for namespaced type', async () => {
-      await savedObjectsRepository.create(
-        'index-pattern',
-        {
-          title: 'Logstash',
-        },
-        {
-          id: 'foo-id',
-          namespace: 'foo-namespace',
-        }
-      );
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          id: `foo-namespace:index-pattern:foo-id`,
-          body: expect.objectContaining({
-            [`index-pattern`]: { title: 'Logstash' },
-            namespace: 'foo-namespace',
-            type: 'index-pattern',
-            updated_at: '2017-08-14T15:49:14.886Z',
-          }),
-        })
-      );
-    });
+      it(`should use the ES create method if ID is undefined and overwrite=true`, async () => {
+        const objects = [obj1, obj2].map(obj => ({ ...obj, id: undefined }));
+        await bulkCreateSuccess(objects, { overwrite: true });
+        expectClusterCallArgsAction(objects, { method: 'create' });
+      });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing no namespace for namespaced type`, async () => {
-      await savedObjectsRepository.create(
-        'index-pattern',
-        {
-          title: 'Logstash',
-        },
-        {
-          id: 'foo-id',
-        }
-      );
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          id: `index-pattern:foo-id`,
-          body: expect.objectContaining({
-            [`index-pattern`]: { title: 'Logstash' },
-            type: 'index-pattern',
-            updated_at: '2017-08-14T15:49:14.886Z',
-          }),
-        })
-      );
-    });
+      it(`should use the ES create method if ID is undefined and overwrite=false`, async () => {
+        const objects = [obj1, obj2].map(obj => ({ ...obj, id: undefined }));
+        await bulkCreateSuccess(objects);
+        expectClusterCallArgsAction(objects, { method: 'create' });
+      });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing namespace for namespace agnostic type`, async () => {
-      await savedObjectsRepository.create(
-        'globaltype',
-        {
-          title: 'Logstash',
-        },
-        {
-          id: 'foo-id',
-          namespace: 'foo-namespace',
-        }
-      );
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          id: `globaltype:foo-id`,
-          body: expect.objectContaining({
-            [`globaltype`]: { title: 'Logstash' },
-            type: 'globaltype',
-            updated_at: '2017-08-14T15:49:14.886Z',
-          }),
-        })
-      );
-    });
-
-    it('defaults to empty references array if none are provided', async () => {
-      await savedObjectsRepository.create(
-        'index-pattern',
-        {
-          title: 'Logstash',
-        },
-        {
-          id: 'logstash-*',
-        }
-      );
+      it(`should use the ES index method if ID is defined and overwrite=true`, async () => {
+        await bulkCreateSuccess([obj1, obj2], { overwrite: true });
+        expectClusterCallArgsAction([obj1, obj2], { method: 'index' });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          body: expect.objectContaining({
-            references: [],
-          }),
-        })
-      );
-    });
-  });
+      it(`should use the ES create method if ID is defined and overwrite=false`, async () => {
+        await bulkCreateSuccess([obj1, obj2]);
+        expectClusterCallArgsAction([obj1, obj2], { method: 'create' });
+      });
 
-  describe('#bulkCreate', () => {
-    it('waits until migrations are complete before proceeding', async () => {
-      migrator.runMigrations = jest.fn(async () => expect(callAdminCluster).not.toHaveBeenCalled());
-      callAdminCluster.mockReturnValue({
-        items: [
-          { create: { type: 'config', id: 'config:one', _primary_term: 1, _seq_no: 1 } },
-          {
-            create: {
-              type: 'index-pattern',
-              id: 'index-pattern:two',
-              _primary_term: 1,
-              _seq_no: 1,
-            },
-          },
-        ],
+      it(`formats the ES request`, async () => {
+        await bulkCreateSuccess([obj1, obj2]);
+        const body = [...expectObjArgs(obj1), ...expectObjArgs(obj2)];
+        expectClusterCallArgs({ body });
       });
 
-      await expect(
-        savedObjectsRepository.bulkCreate([
-          { type: 'config', id: 'one', attributes: { title: 'Test One' } },
-          { type: 'index-pattern', id: 'two', attributes: { title: 'Test Two' } },
-        ])
-      ).resolves.toBeDefined();
+      it(`adds namespace to request body for any types that are single-namespace`, async () => {
+        await bulkCreateSuccess([obj1, obj2], { namespace });
+        const expected = expect.objectContaining({ namespace });
+        const body = [expect.any(Object), expected, expect.any(Object), expected];
+        expectClusterCallArgs({ body });
+      });
 
-      expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
-    });
+      it(`doesn't add namespace to request body for any types that are not single-namespace`, async () => {
+        const objects = [
+          { ...obj1, type: NAMESPACE_AGNOSTIC_TYPE },
+          { ...obj2, type: MULTI_NAMESPACE_TYPE },
+        ];
+        await bulkCreateSuccess(objects, { namespace });
+        const expected = expect.not.objectContaining({ namespace: expect.anything() });
+        const body = [expect.any(Object), expected, expect.any(Object), expected];
+        expectClusterCallArgs({ body });
+      });
 
-    it('formats Elasticsearch request', async () => {
-      callAdminCluster.mockReturnValue({
-        items: [
-          { create: { type: 'config', id: 'config:one', _primary_term: 1, _seq_no: 1 } },
-          { create: { type: 'index-pattern', id: 'config:two', _primary_term: 1, _seq_no: 1 } },
-        ],
+      it(`adds namespaces to request body for any types that are multi-namespace`, async () => {
+        const test = async namespace => {
+          const objects = [obj1, obj2].map(x => ({ ...x, type: MULTI_NAMESPACE_TYPE }));
+          const namespaces = [namespace ?? 'default'];
+          await bulkCreateSuccess(objects, { namespace, overwrite: true });
+          const expected = expect.objectContaining({ namespaces });
+          const body = [expect.any(Object), expected, expect.any(Object), expected];
+          expectClusterCallArgs({ body }, 2);
+          callAdminCluster.mockReset();
+        };
+        await test(undefined);
+        await test(namespace);
       });
 
-      await savedObjectsRepository.bulkCreate([
-        {
-          type: 'config',
-          id: 'one',
-          attributes: { title: 'Test One' },
-          references: [{ name: 'ref_0', type: 'test', id: '1' }],
-        },
-        {
-          type: 'index-pattern',
-          id: 'two',
-          attributes: { title: 'Test Two' },
-          references: [{ name: 'ref_0', type: 'test', id: '2' }],
-        },
-      ]);
+      it(`doesn't add namespaces to request body for any types that are not multi-namespace`, async () => {
+        const test = async namespace => {
+          const objects = [obj1, { ...obj2, type: NAMESPACE_AGNOSTIC_TYPE }];
+          await bulkCreateSuccess(objects, { namespace, overwrite: true });
+          const expected = expect.not.objectContaining({ namespaces: expect.anything() });
+          const body = [expect.any(Object), expected, expect.any(Object), expected];
+          expectClusterCallArgs({ body });
+          callAdminCluster.mockReset();
+        };
+        await test(undefined);
+        await test(namespace);
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      const bulkCalls = callAdminCluster.mock.calls.filter(([path]) => path === 'bulk');
+      it(`defaults to a refresh setting of wait_for`, async () => {
+        await bulkCreateSuccess([obj1, obj2]);
+        expectClusterCallArgs({ refresh: 'wait_for' });
+      });
 
-      expect(bulkCalls.length).toEqual(1);
+      it(`accepts a custom refresh setting`, async () => {
+        const refresh = 'foo';
+        await bulkCreateSuccess([obj1, obj2], { refresh });
+        expectClusterCallArgs({ refresh });
+      });
 
-      expect(bulkCalls[0][1].body).toEqual([
-        { create: { _index: '.kibana-test', _id: 'config:one' } },
-        {
-          type: 'config',
-          ...mockTimestampFields,
-          config: { title: 'Test One' },
-          references: [{ name: 'ref_0', type: 'test', id: '1' }],
-        },
-        { create: { _index: '.kibana-test', _id: 'index-pattern:two' } },
-        {
-          type: 'index-pattern',
-          ...mockTimestampFields,
-          'index-pattern': { title: 'Test Two' },
-          references: [{ name: 'ref_0', type: 'test', id: '2' }],
-        },
-      ]);
-    });
+      it(`should use default index`, async () => {
+        await bulkCreateSuccess([obj1, obj2]);
+        expectClusterCallArgsAction([obj1, obj2], { method: 'create', _index: '.kibana-test' });
+      });
 
-    it('defaults to a refresh setting of `wait_for`', async () => {
-      callAdminCluster.mockReturnValue({
-        items: [{ create: { type: 'config', id: 'config:one', _primary_term: 1, _seq_no: 1 } }],
+      it(`should use custom index`, async () => {
+        await bulkCreateSuccess([obj1, obj2].map(x => ({ ...x, type: CUSTOM_INDEX_TYPE })));
+        expectClusterCallArgsAction([obj1, obj2], { method: 'create', _index: 'custom' });
       });
 
-      await savedObjectsRepository.bulkCreate([
-        {
-          type: 'config',
-          id: 'one',
-          attributes: { title: 'Test One' },
-          references: [{ name: 'ref_0', type: 'test', id: '1' }],
-        },
-      ]);
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        const getId = (type, id) => `${namespace}:${type}:${id}`;
+        await bulkCreateSuccess([obj1, obj2], { namespace });
+        expectClusterCallArgsAction([obj1, obj2], { method: 'create', getId });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        const getId = (type, id) => `${type}:${id}`;
+        await bulkCreateSuccess([obj1, obj2]);
+        expectClusterCallArgsAction([obj1, obj2], { method: 'create', getId });
+      });
 
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: 'wait_for',
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        const getId = (type, id) => `${type}:${id}`;
+        const objects = [
+          { ...obj1, type: NAMESPACE_AGNOSTIC_TYPE },
+          { ...obj2, type: MULTI_NAMESPACE_TYPE },
+        ];
+        await bulkCreateSuccess(objects, { namespace });
+        expectClusterCallArgsAction(objects, { method: 'create', getId });
       });
     });
 
-    it('accepts a custom refresh setting', async () => {
-      callAdminCluster.mockReturnValue({
-        items: [
-          { create: { type: 'config', id: 'config:one', _primary_term: 1, _seq_no: 1 } },
-          { create: { type: 'index-pattern', id: 'config:two', _primary_term: 1, _seq_no: 1 } },
-        ],
-      });
+    describe('errors', () => {
+      const obj3 = {
+        type: 'dashboard',
+        id: 'three',
+        attributes: { title: 'Test Three' },
+        references: [{ name: 'ref_0', type: 'test', id: '2' }],
+      };
 
-      await savedObjectsRepository.bulkCreate(
-        [
-          {
-            type: 'config',
-            id: 'one',
-            attributes: { title: 'Test One' },
-            references: [{ name: 'ref_0', type: 'test', id: '1' }],
-          },
-          {
-            type: 'index-pattern',
-            id: 'two',
-            attributes: { title: 'Test Two' },
-            references: [{ name: 'ref_0', type: 'test', id: '2' }],
-          },
-        ],
-        {
-          refresh: true,
+      const bulkCreateError = async (obj, esError, expectedError) => {
+        const objects = [obj1, obj, obj2];
+        const response = getMockBulkCreateResponse(objects);
+        if (esError) {
+          response.items[1].create = { error: esError };
         }
-      );
-
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+        callAdminCluster.mockResolvedValue(response); // this._writeToCluster('bulk', ...)
+
+        const result = await savedObjectsRepository.bulkCreate(objects);
+        expectClusterCalls('bulk');
+        const objCall = esError ? expectObjArgs(obj) : [];
+        const body = [...expectObjArgs(obj1), ...objCall, ...expectObjArgs(obj2)];
+        expectClusterCallArgs({ body });
+        expect(result).toEqual({
+          saved_objects: [expectSuccess(obj1), expectedError, expectSuccess(obj2)],
+        });
+      };
 
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: true,
+      it(`returns error when type is invalid`, async () => {
+        const obj = { ...obj3, type: 'unknownType' };
+        await bulkCreateError(obj, undefined, expectErrorInvalidType(obj));
       });
-    });
 
-    it('migrates the docs', async () => {
-      callAdminCluster.mockReturnValue({
-        items: [
-          {
-            create: {
-              error: false,
-              _id: '1',
-              _seq_no: 1,
-              _primary_term: 1,
-            },
-          },
-          {
-            create: {
-              error: false,
-              _id: '2',
-              _seq_no: 1,
-              _primary_term: 1,
-            },
-          },
-        ],
+      it(`returns error when type is hidden`, async () => {
+        const obj = { ...obj3, type: HIDDEN_TYPE };
+        await bulkCreateError(obj, undefined, expectErrorInvalidType(obj));
       });
 
-      migrator.migrateDocument = doc => {
-        doc.attributes.title = doc.attributes.title + '!!';
-        doc.migrationVersion = { foo: '2.3.4' };
-        doc.references = [{ name: 'search_0', type: 'search', id: '123' }];
-        return doc;
-      };
-
-      const bulkCreateResp = await savedObjectsRepository.bulkCreate([
-        { type: 'config', id: 'one', attributes: { title: 'Test One' } },
-        { type: 'index-pattern', id: 'two', attributes: { title: 'Test Two' } },
-      ]);
-
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'bulk',
-        expect.objectContaining({
-          body: [
-            { create: { _index: '.kibana-test', _id: 'config:one' } },
-            {
-              type: 'config',
-              ...mockTimestampFields,
-              config: { title: 'Test One!!' },
-              migrationVersion: { foo: '2.3.4' },
-              references: [{ name: 'search_0', type: 'search', id: '123' }],
-            },
-            { create: { _index: '.kibana-test', _id: 'index-pattern:two' } },
+      it(`returns error when there is a conflict with an existing multi-namespace saved object (get)`, async () => {
+        const obj = { ...obj3, type: MULTI_NAMESPACE_TYPE };
+        const response1 = {
+          status: 200,
+          docs: [
             {
-              type: 'index-pattern',
-              ...mockTimestampFields,
-              'index-pattern': { title: 'Test Two!!' },
-              migrationVersion: { foo: '2.3.4' },
-              references: [{ name: 'search_0', type: 'search', id: '123' }],
+              found: true,
+              _source: {
+                type: obj.type,
+                namespaces: ['bar-namespace'],
+              },
             },
           ],
-        })
-      );
-
-      expect(bulkCreateResp).toEqual({
-        saved_objects: [
-          {
-            id: 'one',
-            type: 'config',
-            version: mockVersion,
-            updated_at: mockTimestamp,
-            attributes: {
-              title: 'Test One!!',
-            },
-            references: [{ name: 'search_0', type: 'search', id: '123' }],
-          },
-          {
-            id: 'two',
-            type: 'index-pattern',
-            version: mockVersion,
-            updated_at: mockTimestamp,
-            attributes: {
-              title: 'Test Two!!',
-            },
-            references: [{ name: 'search_0', type: 'search', id: '123' }],
-          },
-        ],
+        };
+        callAdminCluster.mockResolvedValueOnce(response1); // this._callCluster('mget', ...)
+        const response2 = getMockBulkCreateResponse([obj1, obj2]);
+        callAdminCluster.mockResolvedValue(response2); // this._writeToCluster('bulk', ...)
+
+        const options = { overwrite: true };
+        const result = await savedObjectsRepository.bulkCreate([obj1, obj, obj2], options);
+        expectClusterCalls('mget', 'bulk');
+        const body1 = { docs: [expect.objectContaining({ _id: `${obj.type}:${obj.id}` })] };
+        expectClusterCallArgs({ body: body1 }, 1);
+        const body2 = [...expectObjArgs(obj1), ...expectObjArgs(obj2)];
+        expectClusterCallArgs({ body: body2 }, 2);
+        expect(result).toEqual({
+          saved_objects: [expectSuccess(obj1), expectErrorConflict(obj), expectSuccess(obj2)],
+        });
       });
-    });
 
-    it('should overwrite objects if overwrite is truthy', async () => {
-      callAdminCluster.mockReturnValue({
-        items: [{ create: { type: 'foo', id: 'bar', _primary_term: 1, _seq_no: 1 } }],
+      it(`returns error when there is a version conflict (bulk)`, async () => {
+        const esError = { type: 'version_conflict_engine_exception' };
+        await bulkCreateError(obj3, esError, expectErrorConflict(obj3));
       });
 
-      await savedObjectsRepository.bulkCreate([{ type: 'foo', id: 'bar', attributes: {} }], {
-        overwrite: false,
+      it(`returns error when document is missing`, async () => {
+        const esError = { type: 'document_missing_exception' };
+        await bulkCreateError(obj3, esError, expectErrorNotFound(obj3));
       });
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'bulk',
-        expect.objectContaining({
-          body: [
-            // uses create because overwriting is not allowed
-            { create: { _index: '.kibana-test', _id: 'foo:bar' } },
-            { type: 'foo', ...mockTimestampFields, foo: {}, references: [] },
-          ],
-        })
-      );
-
-      callAdminCluster.mockReset();
 
-      callAdminCluster.mockReturnValue({
-        items: [{ create: { type: 'foo', id: 'bar', _primary_term: 1, _seq_no: 1 } }],
+      it(`returns error reason for other errors`, async () => {
+        const esError = { reason: 'some_other_error' };
+        await bulkCreateError(obj3, esError, expectErrorResult(obj3, { message: esError.reason }));
       });
 
-      await savedObjectsRepository.bulkCreate([{ type: 'foo', id: 'bar', attributes: {} }], {
-        overwrite: true,
+      it(`returns error string for other errors if no reason is defined`, async () => {
+        const esError = { foo: 'some_other_error' };
+        const expectedError = expectErrorResult(obj3, { message: JSON.stringify(esError) });
+        await bulkCreateError(obj3, esError, expectedError);
       });
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'bulk',
-        expect.objectContaining({
-          body: [
-            // uses index because overwriting is allowed
-            { index: { _index: '.kibana-test', _id: 'foo:bar' } },
-            { type: 'foo', ...mockTimestampFields, foo: {}, references: [] },
-          ],
-        })
-      );
     });
 
-    it('mockReturnValue document errors', async () => {
-      callAdminCluster.mockResolvedValue({
-        errors: false,
-        items: [
-          {
-            create: {
-              _id: 'config:one',
-              error: {
-                reason: 'type[config] missing',
-              },
-            },
-          },
-          {
-            create: {
-              _id: 'index-pattern:two',
-              ...mockVersionProps,
-            },
-          },
-        ],
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        migrator.runMigrations = jest.fn(async () =>
+          expect(callAdminCluster).not.toHaveBeenCalled()
+        );
+        await expect(bulkCreateSuccess([obj1, obj2])).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
       });
 
-      const response = await savedObjectsRepository.bulkCreate([
-        { type: 'config', id: 'one', attributes: { title: 'Test One' } },
-        { type: 'index-pattern', id: 'two', attributes: { title: 'Test Two' } },
-      ]);
+      it(`migrates the docs and serializes the migrated docs`, async () => {
+        migrator.migrateDocument.mockImplementation(mockMigrateDocument);
+        await bulkCreateSuccess([obj1, obj2]);
+        const docs = [obj1, obj2].map(x => ({ ...x, ...mockTimestampFields }));
+        expectMigrationArgs(docs[0], true, 1);
+        expectMigrationArgs(docs[1], true, 2);
 
-      expect(response).toEqual({
-        saved_objects: [
-          {
-            id: 'one',
-            type: 'config',
-            error: { message: 'type[config] missing' },
-          },
-          {
-            id: 'two',
-            type: 'index-pattern',
-            version: mockVersion,
-            ...mockTimestampFields,
-            attributes: { title: 'Test Two' },
-            references: [],
-          },
-        ],
+        const migratedDocs = docs.map(x => migrator.migrateDocument(x));
+        expect(serializer.savedObjectToRaw).toHaveBeenNthCalledWith(1, migratedDocs[0]);
+        expect(serializer.savedObjectToRaw).toHaveBeenNthCalledWith(2, migratedDocs[1]);
       });
-    });
 
-    it('formats Elasticsearch response', async () => {
-      callAdminCluster.mockResolvedValue({
-        errors: false,
-        items: [
-          {
-            create: {
-              _id: 'config:one',
-              ...mockVersionProps,
-            },
-          },
-          {
-            create: {
-              _id: 'index-pattern:two',
-              ...mockVersionProps,
-            },
-          },
-        ],
+      it(`adds namespace to body when providing namespace for single-namespace type`, async () => {
+        await bulkCreateSuccess([obj1, obj2], { namespace });
+        expectMigrationArgs({ namespace }, true, 1);
+        expectMigrationArgs({ namespace }, true, 2);
       });
 
-      const response = await savedObjectsRepository.bulkCreate(
-        [
-          { type: 'config', id: 'one', attributes: { title: 'Test One' } },
-          { type: 'index-pattern', id: 'two', attributes: { title: 'Test Two' } },
-        ],
-        {
-          namespace: 'foo-namespace',
-        }
-      );
+      it(`doesn't add namespace to body when providing no namespace for single-namespace type`, async () => {
+        await bulkCreateSuccess([obj1, obj2]);
+        expectMigrationArgs({ namespace: expect.anything() }, false, 1);
+        expectMigrationArgs({ namespace: expect.anything() }, false, 2);
+      });
 
-      expect(response).toEqual({
-        saved_objects: [
-          {
-            id: 'one',
-            type: 'config',
-            version: mockVersion,
-            ...mockTimestampFields,
-            attributes: { title: 'Test One' },
-            references: [],
-          },
-          {
-            id: 'two',
-            type: 'index-pattern',
-            version: mockVersion,
-            ...mockTimestampFields,
-            attributes: { title: 'Test Two' },
-            references: [],
-          },
-        ],
+      it(`doesn't add namespace to body when not using single-namespace type`, async () => {
+        const objects = [
+          { ...obj1, type: NAMESPACE_AGNOSTIC_TYPE },
+          { ...obj2, type: MULTI_NAMESPACE_TYPE },
+        ];
+        await bulkCreateSuccess(objects, { namespace });
+        expectMigrationArgs({ namespace: expect.anything() }, false, 1);
+        expectMigrationArgs({ namespace: expect.anything() }, false, 2);
       });
-    });
 
-    it('prepends namespace to the id and adds namespace to body when providing namespace for namespaced type', async () => {
-      callAdminCluster.mockReturnValue({
-        items: [
-          {
-            create: {
-              _id: 'foo-namespace:config:one',
-              _index: '.kibana-test',
-              _primary_term: 1,
-              _seq_no: 2,
-            },
-          },
-          {
-            create: {
-              _id: 'foo-namespace:index-pattern:two',
-              _primary_term: 1,
-              _seq_no: 2,
-            },
-          },
-        ],
+      it(`adds namespaces to body when providing namespace for multi-namespace type`, async () => {
+        const objects = [obj1, obj2].map(obj => ({ ...obj, type: MULTI_NAMESPACE_TYPE }));
+        await bulkCreateSuccess(objects, { namespace });
+        expectMigrationArgs({ namespaces: [namespace] }, true, 1);
+        expectMigrationArgs({ namespaces: [namespace] }, true, 2);
       });
-      await savedObjectsRepository.bulkCreate(
-        [
-          { type: 'config', id: 'one', attributes: { title: 'Test One' } },
-          { type: 'index-pattern', id: 'two', attributes: { title: 'Test Two' } },
-        ],
-        {
-          namespace: 'foo-namespace',
-        }
-      );
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'bulk',
-        expect.objectContaining({
-          body: [
-            { create: { _index: '.kibana-test', _id: 'foo-namespace:config:one' } },
-            {
-              namespace: 'foo-namespace',
-              type: 'config',
-              ...mockTimestampFields,
-              config: { title: 'Test One' },
-              references: [],
-            },
-            { create: { _index: '.kibana-test', _id: 'foo-namespace:index-pattern:two' } },
-            {
-              namespace: 'foo-namespace',
-              type: 'index-pattern',
-              ...mockTimestampFields,
-              'index-pattern': { title: 'Test Two' },
-              references: [],
-            },
-          ],
-        })
-      );
-    });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing no namespace for namespaced type`, async () => {
-      callAdminCluster.mockResolvedValue({
-        errors: false,
-        items: [
-          {
-            create: {
-              _id: 'config:one',
-              ...mockVersionProps,
-            },
-          },
-          {
-            create: {
-              _id: 'index-pattern:two',
-              ...mockVersionProps,
-            },
-          },
-        ],
+      it(`adds default namespaces to body when providing no namespace for multi-namespace type`, async () => {
+        const objects = [obj1, obj2].map(obj => ({ ...obj, type: MULTI_NAMESPACE_TYPE }));
+        await bulkCreateSuccess(objects);
+        expectMigrationArgs({ namespaces: ['default'] }, true, 1);
+        expectMigrationArgs({ namespaces: ['default'] }, true, 2);
       });
-      await savedObjectsRepository.bulkCreate([
-        { type: 'config', id: 'one', attributes: { title: 'Test One' } },
-        { type: 'index-pattern', id: 'two', attributes: { title: 'Test Two' } },
-      ]);
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'bulk',
-        expect.objectContaining({
-          body: [
-            { create: { _id: 'config:one', _index: '.kibana-test' } },
-            {
-              type: 'config',
-              ...mockTimestampFields,
-              config: { title: 'Test One' },
-              references: [],
-            },
-            { create: { _id: 'index-pattern:two', _index: '.kibana-test' } },
-            {
-              type: 'index-pattern',
-              ...mockTimestampFields,
-              'index-pattern': { title: 'Test Two' },
-              references: [],
-            },
-          ],
-        })
-      );
-    });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing namespace for namespace agnostic type`, async () => {
-      callAdminCluster.mockReturnValue({
-        items: [{ create: { _type: '_doc', _id: 'globaltype:one', _primary_term: 1, _seq_no: 2 } }],
+      it(`doesn't add namespaces to body when not using multi-namespace type`, async () => {
+        const objects = [obj1, { ...obj2, type: NAMESPACE_AGNOSTIC_TYPE }];
+        await bulkCreateSuccess(objects);
+        expectMigrationArgs({ namespaces: expect.anything() }, false, 1);
+        expectMigrationArgs({ namespaces: expect.anything() }, false, 2);
       });
-      await savedObjectsRepository.bulkCreate(
-        [{ type: 'globaltype', id: 'one', attributes: { title: 'Test One' } }],
-        {
-          namespace: 'foo-namespace',
-        }
-      );
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'bulk',
-        expect.objectContaining({
-          body: [
-            { create: { _id: 'globaltype:one', _index: '.kibana-test' } },
-            {
-              type: 'globaltype',
-              ...mockTimestampFields,
-              globaltype: { title: 'Test One' },
-              references: [],
-            },
-          ],
-        })
-      );
     });
 
-    it('should return objects in the same order regardless of type', () => {});
-  });
+    describe('returns', () => {
+      it(`formats the ES response`, async () => {
+        const result = await bulkCreateSuccess([obj1, obj2]);
+        expect(result).toEqual({
+          saved_objects: [obj1, obj2].map(x => expectSuccessResult(x)),
+        });
+      });
 
-  describe('#delete', () => {
-    it('waits until migrations are complete before proceeding', async () => {
-      migrator.runMigrations = jest.fn(async () => expect(callAdminCluster).not.toHaveBeenCalled());
-      callAdminCluster.mockReturnValue({ result: 'deleted' });
-      await expect(
-        savedObjectsRepository.delete('index-pattern', 'logstash-*', {
-          namespace: 'foo-namespace',
-        })
-      ).resolves.toBeDefined();
-
-      expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
+      it(`should return objects in the same order regardless of type`, async () => {
+        // TODO
+      });
+
+      it(`handles a mix of successful creates and errors`, async () => {
+        const obj = {
+          type: 'unknownType',
+          id: 'three',
+        };
+        const objects = [obj1, obj, obj2];
+        const response = getMockBulkCreateResponse(objects);
+        callAdminCluster.mockResolvedValue(response); // this._writeToCluster('bulk', ...)
+        const result = await savedObjectsRepository.bulkCreate(objects);
+        expect(callAdminCluster).toHaveBeenCalledTimes(1);
+        expect(result).toEqual({
+          saved_objects: [expectSuccessResult(obj1), expectError(obj), expectSuccessResult(obj2)],
+        });
+      });
     });
+  });
 
-    it('throws notFound when ES is unable to find the document', async () => {
-      expect.assertions(1);
+  describe('#bulkGet', () => {
+    const obj1 = {
+      type: 'config',
+      id: '6.0.0-alpha1',
+      attributes: { title: 'Testing' },
+      references: [
+        {
+          name: 'ref_0',
+          type: 'test',
+          id: '1',
+        },
+      ],
+    };
+    const obj2 = {
+      type: 'index-pattern',
+      id: 'logstash-*',
+      attributes: { title: 'Testing' },
+      references: [
+        {
+          name: 'ref_0',
+          type: 'test',
+          id: '2',
+        },
+      ],
+    };
+    const namespace = 'foo-namespace';
 
-      callAdminCluster.mockResolvedValue({ result: 'not_found' });
+    const bulkGet = async (objects, options) =>
+      savedObjectsRepository.bulkGet(
+        objects.map(({ type, id }) => ({ type, id })), // bulkGet only uses type and id
+        options
+      );
+    const bulkGetSuccess = async (objects, options) => {
+      const response = getMockMgetResponse(objects, options?.namespace);
+      callAdminCluster.mockReturnValue(response);
+      const result = await bulkGet(objects, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      return result;
+    };
 
-      try {
-        await savedObjectsRepository.delete('index-pattern', 'logstash-*');
-      } catch (e) {
-        expect(e.output.statusCode).toEqual(404);
-      }
-    });
+    const _expectClusterCallArgs = (
+      objects,
+      { _index = expect.any(String), getId = () => expect.any(String) }
+    ) => {
+      expectClusterCallArgs({
+        body: {
+          docs: objects.map(({ type, id }) =>
+            expect.objectContaining({
+              _index,
+              _id: getId(type, id),
+            })
+          ),
+        },
+      });
+    };
 
-    it(`prepends namespace to the id when providing namespace for namespaced type`, async () => {
-      callAdminCluster.mockReturnValue({ result: 'deleted' });
-      await savedObjectsRepository.delete('index-pattern', 'logstash-*', {
-        namespace: 'foo-namespace',
+    describe('cluster calls', () => {
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        const getId = (type, id) => `${namespace}:${type}:${id}`;
+        await bulkGetSuccess([obj1, obj2], { namespace });
+        _expectClusterCallArgs([obj1, obj2], { getId });
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith('delete', {
-        id: 'foo-namespace:index-pattern:logstash-*',
-        refresh: 'wait_for',
-        index: '.kibana-test',
-        ignore: [404],
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        const getId = (type, id) => `${type}:${id}`;
+        await bulkGetSuccess([obj1, obj2]);
+        _expectClusterCallArgs([obj1, obj2], { getId });
       });
-    });
 
-    it(`doesn't prepend namespace to the id when providing no namespace for namespaced type`, async () => {
-      callAdminCluster.mockReturnValue({ result: 'deleted' });
-      await savedObjectsRepository.delete('index-pattern', 'logstash-*');
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        const getId = (type, id) => `${type}:${id}`;
+        let objects = [obj1, obj2].map(obj => ({ ...obj, type: NAMESPACE_AGNOSTIC_TYPE }));
+        await bulkGetSuccess(objects, { namespace });
+        _expectClusterCallArgs(objects, { getId });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith('delete', {
-        id: 'index-pattern:logstash-*',
-        refresh: 'wait_for',
-        index: '.kibana-test',
-        ignore: [404],
+        callAdminCluster.mockReset();
+        objects = [obj1, obj2].map(obj => ({ ...obj, type: MULTI_NAMESPACE_TYPE }));
+        await bulkGetSuccess(objects, { namespace });
+        _expectClusterCallArgs(objects, { getId });
       });
     });
 
-    it(`doesn't prepend namespace to the id when providing namespace for namespace agnostic type`, async () => {
-      callAdminCluster.mockReturnValue({ result: 'deleted' });
-      await savedObjectsRepository.delete('globaltype', 'logstash-*', {
-        namespace: 'foo-namespace',
-      });
+    describe('errors', () => {
+      const bulkGetErrorInvalidType = async ([obj1, obj, obj2]) => {
+        const response = getMockMgetResponse([obj1, obj2]);
+        callAdminCluster.mockResolvedValue(response);
+        const result = await bulkGet([obj1, obj, obj2]);
+        expectClusterCalls('mget');
+        expect(result).toEqual({
+          saved_objects: [expectSuccess(obj1), expectErrorInvalidType(obj), expectSuccess(obj2)],
+        });
+      };
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith('delete', {
-        id: 'globaltype:logstash-*',
-        refresh: 'wait_for',
-        index: '.kibana-test',
-        ignore: [404],
-      });
-    });
+      const bulkGetErrorNotFound = async ([obj1, obj, obj2], options, response) => {
+        callAdminCluster.mockResolvedValue(response);
+        const result = await bulkGet([obj1, obj, obj2], options);
+        expectClusterCalls('mget');
+        expect(result).toEqual({
+          saved_objects: [expectSuccess(obj1), expectErrorNotFound(obj), expectSuccess(obj2)],
+        });
+      };
 
-    it('defaults to a refresh setting of `wait_for`', async () => {
-      callAdminCluster.mockReturnValue({ result: 'deleted' });
-      await savedObjectsRepository.delete('globaltype', 'logstash-*');
+      it(`returns error when type is invalid`, async () => {
+        const obj = { type: 'unknownType', id: 'three' };
+        await bulkGetErrorInvalidType([obj1, obj, obj2]);
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: 'wait_for',
+      it(`returns error when type is hidden`, async () => {
+        const obj = { type: HIDDEN_TYPE, id: 'three' };
+        await bulkGetErrorInvalidType([obj1, obj, obj2]);
       });
-    });
 
-    it(`accepts a custom refresh setting`, async () => {
-      callAdminCluster.mockReturnValue({ result: 'deleted' });
-      await savedObjectsRepository.delete('globaltype', 'logstash-*', {
-        refresh: false,
+      it(`returns error when document is not found`, async () => {
+        const obj = { type: 'dashboard', id: 'three', found: false };
+        const response = getMockMgetResponse([obj1, obj, obj2]);
+        await bulkGetErrorNotFound([obj1, obj, obj2], undefined, response);
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: false,
+      it(`handles missing ids gracefully`, async () => {
+        const obj = { type: 'dashboard', id: undefined, found: false };
+        const response = getMockMgetResponse([obj1, obj, obj2]);
+        await bulkGetErrorNotFound([obj1, obj, obj2], undefined, response);
       });
-    });
-  });
 
-  describe('#deleteByNamespace', () => {
-    it('requires namespace to be defined', async () => {
-      callAdminCluster.mockReturnValue(deleteByQueryResults);
-      expect(savedObjectsRepository.deleteByNamespace()).rejects.toThrowErrorMatchingSnapshot();
-      expect(callAdminCluster).not.toHaveBeenCalled();
+      it(`returns error when type is multi-namespace and the document exists, but not in this namespace`, async () => {
+        const obj = { type: MULTI_NAMESPACE_TYPE, id: 'three' };
+        const response = getMockMgetResponse([obj1, obj, obj2]);
+        response.docs[1].namespaces = ['bar-namespace'];
+        await bulkGetErrorNotFound([obj1, obj, obj2], { namespace }, response);
+      });
     });
 
-    it('requires namespace to be a string', async () => {
-      callAdminCluster.mockReturnValue(deleteByQueryResults);
-      expect(
-        savedObjectsRepository.deleteByNamespace(['namespace-1', 'namespace-2'])
-      ).rejects.toThrowErrorMatchingSnapshot();
-      expect(callAdminCluster).not.toHaveBeenCalled();
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        migrator.runMigrations = jest.fn(async () =>
+          expect(callAdminCluster).not.toHaveBeenCalled()
+        );
+        await expect(bulkGetSuccess([obj1, obj2])).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
+      });
     });
 
-    it('constructs a deleteByQuery call using all types that are namespace aware', async () => {
-      callAdminCluster.mockReturnValue(deleteByQueryResults);
-      const result = await savedObjectsRepository.deleteByNamespace('my-namespace');
-
-      expect(result).toEqual(deleteByQueryResults);
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-
-      expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledWith(mappings, typeRegistry, {
-        namespace: 'my-namespace',
-        type: ['config', 'baz', 'index-pattern', 'dashboard'],
+    describe('returns', () => {
+      const expectSuccessResult = ({ type, id }, doc) => ({
+        type,
+        id,
+        ...(doc._source.namespaces && { namespaces: doc._source.namespaces }),
+        ...(doc._source.updated_at && { updated_at: doc._source.updated_at }),
+        version: encodeHitVersion(doc),
+        attributes: doc._source[type],
+        references: doc._source.references || [],
+        migrationVersion: doc._source.migrationVersion,
       });
 
-      expect(callAdminCluster).toHaveBeenCalledWith('deleteByQuery', {
-        body: { conflicts: 'proceed' },
-        ignore: [404],
-        index: ['.kibana-test', 'beats'],
-        refresh: 'wait_for',
+      it(`returns early for empty objects argument`, async () => {
+        const result = await bulkGet([]);
+        expect(result).toEqual({ saved_objects: [] });
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
-    });
-
-    it('defaults to a refresh setting of `wait_for`', async () => {
-      callAdminCluster.mockReturnValue(deleteByQueryResults);
-      await savedObjectsRepository.deleteByNamespace('my-namespace');
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: 'wait_for',
+      it(`formats the ES response`, async () => {
+        const response = getMockMgetResponse([obj1, obj2]);
+        callAdminCluster.mockResolvedValue(response);
+        const result = await bulkGet([obj1, obj2]);
+        expect(callAdminCluster).toHaveBeenCalledTimes(1);
+        expect(result).toEqual({
+          saved_objects: [
+            expectSuccessResult(obj1, response.docs[0]),
+            expectSuccessResult(obj2, response.docs[1]),
+          ],
+        });
       });
-    });
 
-    it('accepts a custom refresh setting', async () => {
-      callAdminCluster.mockReturnValue(deleteByQueryResults);
-      await savedObjectsRepository.deleteByNamespace('my-namespace', { refresh: true });
+      it(`handles a mix of successful gets and errors`, async () => {
+        const response = getMockMgetResponse([obj1, obj2]);
+        callAdminCluster.mockResolvedValue(response);
+        const obj = { type: 'unknownType', id: 'three' };
+        const result = await bulkGet([obj1, obj, obj2]);
+        expect(callAdminCluster).toHaveBeenCalledTimes(1);
+        expect(result).toEqual({
+          saved_objects: [
+            expectSuccessResult(obj1, response.docs[0]),
+            expectError(obj),
+            expectSuccessResult(obj2, response.docs[1]),
+          ],
+        });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: true,
+      it(`includes namespaces property for multi-namespace documents`, async () => {
+        const obj = { type: MULTI_NAMESPACE_TYPE, id: 'three' };
+        const result = await bulkGetSuccess([obj1, obj]);
+        expect(result).toEqual({
+          saved_objects: [
+            expect.not.objectContaining({ namespaces: expect.anything() }),
+            expect.objectContaining({ namespaces: expect.any(Array) }),
+          ],
+        });
       });
     });
   });
 
-  describe('#find', () => {
-    it('waits until migrations are complete before proceeding', async () => {
-      migrator.runMigrations = jest.fn(async () => expect(callAdminCluster).not.toHaveBeenCalled());
-
-      callAdminCluster.mockReturnValue(noNamespaceSearchResults);
-      await expect(savedObjectsRepository.find({ type: 'foo' })).resolves.toBeDefined();
-
-      expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
-    });
-
-    it('requires type to be defined', async () => {
-      await expect(savedObjectsRepository.find({})).rejects.toThrow(/options\.type must be/);
-      expect(callAdminCluster).not.toHaveBeenCalled();
+  describe('#bulkUpdate', () => {
+    const obj1 = {
+      type: 'config',
+      id: '6.0.0-alpha1',
+      attributes: { title: 'Test One' },
+    };
+    const obj2 = {
+      type: 'index-pattern',
+      id: 'logstash-*',
+      attributes: { title: 'Test Two' },
+    };
+    const references = [{ name: 'ref_0', type: 'test', id: '1' }];
+    const namespace = 'foo-namespace';
+
+    const getMockBulkUpdateResponse = (objects, options) => ({
+      items: objects.map(({ type, id }) => ({
+        update: {
+          _id: `${
+            registry.isSingleNamespace(type) && options?.namespace ? `${options?.namespace}:` : ''
+          }${type}:${id}`,
+          ...mockVersionProps,
+          result: 'updated',
+        },
+      })),
     });
 
-    it('requires searchFields be an array if defined', async () => {
-      callAdminCluster.mockReturnValue(noNamespaceSearchResults);
-      try {
-        await savedObjectsRepository.find({ type: 'foo', searchFields: 'string' });
-        throw new Error('expected find() to reject');
-      } catch (error) {
-        expect(callAdminCluster).not.toHaveBeenCalled();
-        expect(error.message).toMatch('must be an array');
+    const bulkUpdateSuccess = async (objects, options) => {
+      const multiNamespaceObjects = objects.filter(({ type }) => registry.isMultiNamespace(type));
+      if (multiNamespaceObjects?.length) {
+        const response = getMockMgetResponse(multiNamespaceObjects, options?.namespace);
+        callAdminCluster.mockResolvedValueOnce(response); // this._callCluster('mget', ...)
       }
-    });
+      const response = getMockBulkUpdateResponse(objects, options?.namespace);
+      callAdminCluster.mockResolvedValue(response); // this._writeToCluster('bulk', ...)
+      const result = await savedObjectsRepository.bulkUpdate(objects, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(multiNamespaceObjects?.length ? 2 : 1);
+      return result;
+    };
 
-    it('requires fields be an array if defined', async () => {
-      callAdminCluster.mockReturnValue(noNamespaceSearchResults);
-      try {
-        await savedObjectsRepository.find({ type: 'foo', fields: 'string' });
-        throw new Error('expected find() to reject');
-      } catch (error) {
-        expect(callAdminCluster).not.toHaveBeenCalled();
-        expect(error.message).toMatch('must be an array');
+    // bulk create calls have two objects for each source -- the action, and the source
+    const expectClusterCallArgsAction = (
+      objects,
+      { method, _index = expect.any(String), getId = () => expect.any(String), overrides },
+      n
+    ) => {
+      const body = [];
+      for (const { type, id } of objects) {
+        body.push({
+          [method]: {
+            _index,
+            _id: getId(type, id),
+            ...overrides,
+          },
+        });
+        body.push(expect.any(Object));
       }
-    });
-
-    it('passes mappings, schema, search, defaultSearchOperator, searchFields, type, sortField, sortOrder and hasReference to getSearchDsl', async () => {
-      callAdminCluster.mockReturnValue(namespacedSearchResults);
-      const relevantOpts = {
-        namespace: 'foo-namespace',
-        search: 'foo*',
-        searchFields: ['foo'],
-        type: ['bar'],
-        sortField: 'name',
-        sortOrder: 'desc',
-        defaultSearchOperator: 'AND',
-        hasReference: {
-          type: 'foo',
-          id: '1',
-        },
-        kueryNode: undefined,
-      };
+      expectClusterCallArgs({ body }, n);
+    };
 
-      await savedObjectsRepository.find(relevantOpts);
-      expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledTimes(1);
-      expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledWith(
-        mappings,
-        typeRegistry,
-        relevantOpts
-      );
-    });
+    const expectObjArgs = ({ type, attributes }) => [
+      expect.any(Object),
+      {
+        doc: expect.objectContaining({
+          [type]: attributes,
+          ...mockTimestampFields,
+        }),
+      },
+    ];
 
-    it('accepts KQL filter and passes keuryNode to getSearchDsl', async () => {
-      callAdminCluster.mockReturnValue(namespacedSearchResults);
-      const findOpts = {
-        namespace: 'foo-namespace',
-        search: 'foo*',
-        searchFields: ['foo'],
-        type: ['dashboard'],
-        sortField: 'name',
-        sortOrder: 'desc',
-        defaultSearchOperator: 'AND',
-        hasReference: {
-          type: 'foo',
-          id: '1',
-        },
-        indexPattern: undefined,
-        filter: 'dashboard.attributes.otherField: *',
+    describe('cluster calls', () => {
+      it(`should use the ES bulk action by default`, async () => {
+        await bulkUpdateSuccess([obj1, obj2]);
+        expectClusterCalls('bulk');
+      });
+
+      it(`should use the ES mget action before bulk action for any types that are multi-namespace`, async () => {
+        const objects = [obj1, { ...obj2, type: MULTI_NAMESPACE_TYPE }];
+        await bulkUpdateSuccess(objects);
+        expectClusterCalls('mget', 'bulk');
+        const docs = [expect.objectContaining({ _id: `${MULTI_NAMESPACE_TYPE}:${obj2.id}` })];
+        expectClusterCallArgs({ body: { docs } }, 1);
+      });
+
+      it(`formats the ES request`, async () => {
+        await bulkUpdateSuccess([obj1, obj2]);
+        const body = [...expectObjArgs(obj1), ...expectObjArgs(obj2)];
+        expectClusterCallArgs({ body });
+      });
+
+      it(`formats the ES request for any types that are multi-namespace`, async () => {
+        const _obj2 = { ...obj2, type: MULTI_NAMESPACE_TYPE };
+        await bulkUpdateSuccess([obj1, _obj2]);
+        const body = [...expectObjArgs(obj1), ...expectObjArgs(_obj2)];
+        expectClusterCallArgs({ body }, 2);
+      });
+
+      it(`doesnt call Elasticsearch if there are no valid objects to update`, async () => {
+        const objects = [obj1, obj2].map(x => ({ ...x, type: 'unknownType' }));
+        await savedObjectsRepository.bulkUpdate(objects);
+        expect(callAdminCluster).toHaveBeenCalledTimes(0);
+      });
+
+      it(`defaults to no references`, async () => {
+        await bulkUpdateSuccess([obj1, obj2]);
+        const expected = { doc: expect.not.objectContaining({ references: expect.anything() }) };
+        const body = [expect.any(Object), expected, expect.any(Object), expected];
+        expectClusterCallArgs({ body });
+      });
+
+      it(`accepts custom references array`, async () => {
+        const test = async references => {
+          const objects = [obj1, obj2].map(obj => ({ ...obj, references }));
+          await bulkUpdateSuccess(objects);
+          const expected = { doc: expect.objectContaining({ references }) };
+          const body = [expect.any(Object), expected, expect.any(Object), expected];
+          expectClusterCallArgs({ body });
+          callAdminCluster.mockReset();
+        };
+        await test(references);
+        await test(['string']);
+        await test([]);
+      });
+
+      it(`doesn't accept custom references if not an array`, async () => {
+        const test = async references => {
+          const objects = [obj1, obj2].map(obj => ({ ...obj, references }));
+          await bulkUpdateSuccess(objects);
+          const expected = { doc: expect.not.objectContaining({ references: expect.anything() }) };
+          const body = [expect.any(Object), expected, expect.any(Object), expected];
+          expectClusterCallArgs({ body });
+          callAdminCluster.mockReset();
+        };
+        await test('string');
+        await test(123);
+        await test(true);
+        await test(null);
+      });
+
+      it(`defaults to a refresh setting of wait_for`, async () => {
+        await bulkUpdateSuccess([obj1, obj2]);
+        expectClusterCallArgs({ refresh: 'wait_for' });
+      });
+
+      it(`accepts a custom refresh setting`, async () => {
+        const refresh = 'foo';
+        await bulkUpdateSuccess([obj1, obj2], { refresh });
+        expectClusterCallArgs({ refresh });
+      });
+
+      it(`defaults to the version of the existing document for multi-namespace types`, async () => {
+        // only multi-namespace documents are obtained using a pre-flight mget request
+        const objects = [
+          { ...obj1, type: MULTI_NAMESPACE_TYPE },
+          { ...obj2, type: MULTI_NAMESPACE_TYPE },
+        ];
+        await bulkUpdateSuccess(objects);
+        const overrides = {
+          if_seq_no: mockVersionProps._seq_no,
+          if_primary_term: mockVersionProps._primary_term,
+        };
+        expectClusterCallArgsAction(objects, { method: 'update', overrides }, 2);
+      });
+
+      it(`defaults to no version for types that are not multi-namespace`, async () => {
+        const objects = [obj1, { ...obj2, type: NAMESPACE_AGNOSTIC_TYPE }];
+        await bulkUpdateSuccess(objects);
+        expectClusterCallArgsAction(objects, { method: 'update' });
+      });
+
+      it(`accepts version`, async () => {
+        const version = encodeHitVersion({ _seq_no: 100, _primary_term: 200 });
+        // test with both non-multi-namespace and multi-namespace types
+        const objects = [
+          { ...obj1, version },
+          { ...obj2, type: MULTI_NAMESPACE_TYPE, version },
+        ];
+        await bulkUpdateSuccess(objects);
+        const overrides = { if_seq_no: 100, if_primary_term: 200 };
+        expectClusterCallArgsAction(objects, { method: 'update', overrides }, 2);
+      });
+
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        const getId = (type, id) => `${namespace}:${type}:${id}`;
+        await bulkUpdateSuccess([obj1, obj2], { namespace });
+        expectClusterCallArgsAction([obj1, obj2], { method: 'update', getId });
+      });
+
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        const getId = (type, id) => `${type}:${id}`;
+        await bulkUpdateSuccess([obj1, obj2]);
+        expectClusterCallArgsAction([obj1, obj2], { method: 'update', getId });
+      });
+
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        const getId = (type, id) => `${type}:${id}`;
+        const objects1 = [{ ...obj1, type: NAMESPACE_AGNOSTIC_TYPE }];
+        await bulkUpdateSuccess(objects1, { namespace });
+        expectClusterCallArgsAction(objects1, { method: 'update', getId });
+        callAdminCluster.mockReset();
+        const overrides = {
+          // bulkUpdate uses a preflight `get` request for multi-namespace saved objects, and specifies that version on `update`
+          // we aren't testing for this here, but we need to include Jest assertions so this test doesn't fail
+          if_primary_term: expect.any(Number),
+          if_seq_no: expect.any(Number),
+        };
+        const objects2 = [{ ...obj2, type: MULTI_NAMESPACE_TYPE }];
+        await bulkUpdateSuccess(objects2, { namespace });
+        expectClusterCallArgsAction(objects2, { method: 'update', getId, overrides }, 2);
+      });
+    });
+
+    describe('errors', () => {
+      const obj = {
+        type: 'dashboard',
+        id: 'three',
       };
 
-      await savedObjectsRepository.find(findOpts);
-      expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledTimes(1);
-      const { kueryNode } = getSearchDslNS.getSearchDsl.mock.calls[0][2];
-      expect(kueryNode).toMatchInlineSnapshot(`
-        Object {
-          "arguments": Array [
-            Object {
-              "type": "literal",
-              "value": "dashboard.otherField",
-            },
-            Object {
-              "type": "wildcard",
-              "value": "@kuery-wildcard@",
-            },
-            Object {
-              "type": "literal",
-              "value": false,
-            },
-          ],
-          "function": "is",
-          "type": "function",
+      const bulkUpdateError = async (obj, esError, expectedError) => {
+        const objects = [obj1, obj, obj2];
+        const mockResponse = getMockBulkUpdateResponse(objects);
+        if (esError) {
+          mockResponse.items[1].update = { error: esError };
         }
-      `);
-    });
+        callAdminCluster.mockResolvedValue(mockResponse); // this._writeToCluster('bulk', ...)
+
+        const result = await savedObjectsRepository.bulkUpdate(objects);
+        expectClusterCalls('bulk');
+        const objCall = esError ? expectObjArgs(obj) : [];
+        const body = [...expectObjArgs(obj1), ...objCall, ...expectObjArgs(obj2)];
+        expectClusterCallArgs({ body });
+        expect(result).toEqual({
+          saved_objects: [expectSuccess(obj1), expectedError, expectSuccess(obj2)],
+        });
+      };
 
-    it('KQL filter syntax errors rejects with bad request', async () => {
-      callAdminCluster.mockReturnValue(namespacedSearchResults);
-      const findOpts = {
-        namespace: 'foo-namespace',
-        search: 'foo*',
-        searchFields: ['foo'],
-        type: ['dashboard'],
-        sortField: 'name',
-        sortOrder: 'desc',
-        defaultSearchOperator: 'AND',
-        hasReference: {
-          type: 'foo',
-          id: '1',
-        },
-        indexPattern: undefined,
-        filter: 'dashboard.attributes.otherField:<',
+      const bulkUpdateMultiError = async ([obj1, _obj, obj2], options, mgetResponse) => {
+        callAdminCluster.mockResolvedValueOnce(mgetResponse); // this._callCluster('mget', ...)
+        const bulkResponse = getMockBulkUpdateResponse([obj1, obj2], namespace);
+        callAdminCluster.mockResolvedValue(bulkResponse); // this._writeToCluster('bulk', ...)
+
+        const result = await savedObjectsRepository.bulkUpdate([obj1, _obj, obj2], options);
+        expectClusterCalls('mget', 'bulk');
+        const body = [...expectObjArgs(obj1), ...expectObjArgs(obj2)];
+        expectClusterCallArgs({ body }, 2);
+        expect(result).toEqual({
+          saved_objects: [expectSuccess(obj1), expectErrorNotFound(_obj), expectSuccess(obj2)],
+        });
       };
 
-      await expect(savedObjectsRepository.find(findOpts)).rejects.toMatchInlineSnapshot(`
-        [Error: KQLSyntaxError: Expected "(", "{", value, whitespace but "<" found.
-        dashboard.attributes.otherField:<
-        --------------------------------^: Bad Request]
-      `);
-      expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledTimes(0);
-    });
+      it(`returns error when type is invalid`, async () => {
+        const _obj = { ...obj, type: 'unknownType' };
+        await bulkUpdateError(_obj, undefined, expectErrorNotFound(_obj));
+      });
 
-    it('merges output of getSearchDsl into es request body', async () => {
-      callAdminCluster.mockReturnValue(noNamespaceSearchResults);
-      getSearchDslNS.getSearchDsl.mockReturnValue({ query: 1, aggregations: 2 });
-      await savedObjectsRepository.find({ type: 'foo' });
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        'search',
-        expect.objectContaining({
-          body: expect.objectContaining({
-            query: 1,
-            aggregations: 2,
-          }),
-        })
-      );
-    });
+      it(`returns error when type is hidden`, async () => {
+        const _obj = { ...obj, type: HIDDEN_TYPE };
+        await bulkUpdateError(_obj, undefined, expectErrorNotFound(_obj));
+      });
 
-    it('formats Elasticsearch response when there is no namespace', async () => {
-      callAdminCluster.mockReturnValue(noNamespaceSearchResults);
-      const count = noNamespaceSearchResults.hits.hits.length;
+      it(`returns error when ES is unable to find the document (mget)`, async () => {
+        const _obj = { ...obj, type: MULTI_NAMESPACE_TYPE, found: false };
+        const mgetResponse = getMockMgetResponse([_obj]);
+        await bulkUpdateMultiError([obj1, _obj, obj2], undefined, mgetResponse);
+      });
 
-      const response = await savedObjectsRepository.find({ type: 'foo' });
+      it(`returns error when ES is unable to find the index (mget)`, async () => {
+        const _obj = { ...obj, type: MULTI_NAMESPACE_TYPE };
+        const mgetResponse = { status: 404 };
+        await bulkUpdateMultiError([obj1, _obj, obj2], { namespace }, mgetResponse);
+      });
 
-      expect(response.total).toBe(count);
-      expect(response.saved_objects).toHaveLength(count);
+      it(`returns error when there is a conflict with an existing multi-namespace saved object (mget)`, async () => {
+        const _obj = { ...obj, type: MULTI_NAMESPACE_TYPE };
+        const mgetResponse = getMockMgetResponse([_obj], 'bar-namespace');
+        await bulkUpdateMultiError([obj1, _obj, obj2], { namespace }, mgetResponse);
+      });
 
-      noNamespaceSearchResults.hits.hits.forEach((doc, i) => {
-        expect(response.saved_objects[i]).toEqual({
-          id: doc._id.replace(/(index-pattern|config|globaltype)\:/, ''),
-          type: doc._source.type,
-          ...mockTimestampFields,
-          version: mockVersion,
-          attributes: doc._source[doc._source.type],
-          references: [],
-        });
+      it(`returns error when there is a version conflict (bulk)`, async () => {
+        const esError = { type: 'version_conflict_engine_exception' };
+        await bulkUpdateError(obj, esError, expectErrorConflict(obj));
       });
-    });
 
-    it('formats Elasticsearch response when there is a namespace', async () => {
-      callAdminCluster.mockReturnValue(namespacedSearchResults);
-      const count = namespacedSearchResults.hits.hits.length;
+      it(`returns error when document is missing (bulk)`, async () => {
+        const esError = { type: 'document_missing_exception' };
+        await bulkUpdateError(obj, esError, expectErrorNotFound(obj));
+      });
 
-      const response = await savedObjectsRepository.find({
-        type: 'foo',
-        namespace: 'foo-namespace',
+      it(`returns error reason for other errors (bulk)`, async () => {
+        const esError = { reason: 'some_other_error' };
+        await bulkUpdateError(obj, esError, expectErrorResult(obj, { message: esError.reason }));
       });
 
-      expect(response.total).toBe(count);
-      expect(response.saved_objects).toHaveLength(count);
+      it(`returns error string for other errors if no reason is defined (bulk)`, async () => {
+        const esError = { foo: 'some_other_error' };
+        const expectedError = expectErrorResult(obj, { message: JSON.stringify(esError) });
+        await bulkUpdateError(obj, esError, expectedError);
+      });
+    });
 
-      namespacedSearchResults.hits.hits.forEach((doc, i) => {
-        expect(response.saved_objects[i]).toEqual({
-          id: doc._id.replace(/(foo-namespace\:)?(index-pattern|config|globaltype)\:/, ''),
-          type: doc._source.type,
-          ...mockTimestampFields,
-          version: mockVersion,
-          attributes: doc._source[doc._source.type],
-          references: [],
-        });
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        migrator.runMigrations = jest.fn(async () =>
+          expect(callAdminCluster).not.toHaveBeenCalled()
+        );
+        await expect(bulkUpdateSuccess([obj1, obj2])).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveReturnedTimes(1);
       });
     });
 
-    it('accepts per_page/page', async () => {
-      callAdminCluster.mockReturnValue(noNamespaceSearchResults);
-      await savedObjectsRepository.find({ type: 'foo', perPage: 10, page: 6 });
+    describe('returns', () => {
+      const expectSuccessResult = ({ type, id, attributes, references }) => ({
+        type,
+        id,
+        attributes,
+        references,
+        version: mockVersion,
+        ...mockTimestampFields,
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          size: 10,
-          from: 50,
-        })
-      );
-    });
+      it(`formats the ES response`, async () => {
+        const response = await bulkUpdateSuccess([obj1, obj2]);
+        expect(response).toEqual({
+          saved_objects: [obj1, obj2].map(expectSuccessResult),
+        });
+      });
 
-    it('can filter by fields', async () => {
-      callAdminCluster.mockReturnValue(noNamespaceSearchResults);
-      await savedObjectsRepository.find({ type: 'foo', fields: ['title'] });
+      it(`includes references`, async () => {
+        const objects = [obj1, obj2].map(obj => ({ ...obj, references }));
+        const response = await bulkUpdateSuccess(objects);
+        expect(response).toEqual({
+          saved_objects: objects.map(expectSuccessResult),
+        });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          _source: [
-            'foo.title',
-            'namespace',
-            'type',
-            'references',
-            'migrationVersion',
-            'updated_at',
-            'title',
+      it(`handles a mix of successful updates and errors`, async () => {
+        const obj = {
+          type: 'unknownType',
+          id: 'three',
+        };
+        const objects = [obj1, obj, obj2];
+        const mockResponse = getMockBulkUpdateResponse(objects);
+        callAdminCluster.mockResolvedValue(mockResponse); // this._writeToCluster('bulk', ...)
+        const result = await savedObjectsRepository.bulkUpdate(objects);
+        expect(callAdminCluster).toHaveBeenCalledTimes(1);
+        expect(result).toEqual({
+          saved_objects: [expectSuccessResult(obj1), expectError(obj), expectSuccessResult(obj2)],
+        });
+      });
+
+      it(`includes namespaces property for multi-namespace documents`, async () => {
+        const obj = { type: MULTI_NAMESPACE_TYPE, id: 'three' };
+        const result = await bulkUpdateSuccess([obj1, obj]);
+        expect(result).toEqual({
+          saved_objects: [
+            expect.not.objectContaining({ namespaces: expect.anything() }),
+            expect.objectContaining({ namespaces: expect.any(Array) }),
           ],
-        })
-      );
+        });
+      });
     });
+  });
 
-    it('should set rest_total_hits_as_int to true on a request', async () => {
-      callAdminCluster.mockReturnValue(noNamespaceSearchResults);
-      await savedObjectsRepository.find({ type: 'foo' });
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toHaveProperty('rest_total_hits_as_int', true);
+  describe('#create', () => {
+    beforeEach(() => {
+      callAdminCluster.mockImplementation((method, params) => ({
+        _id: params.id,
+        ...mockVersionProps,
+      }));
     });
-  });
 
-  describe('#get', () => {
-    const noNamespaceResult = {
-      _id: 'index-pattern:logstash-*',
-      ...mockVersionProps,
-      _source: {
-        type: 'index-pattern',
-        specialProperty: 'specialValue',
-        ...mockTimestampFields,
-        'index-pattern': {
-          title: 'Testing',
-        },
-      },
-    };
-    const namespacedResult = {
-      _id: 'foo-namespace:index-pattern:logstash-*',
-      ...mockVersionProps,
-      _source: {
-        namespace: 'foo-namespace',
-        type: 'index-pattern',
-        specialProperty: 'specialValue',
-        ...mockTimestampFields,
-        'index-pattern': {
-          title: 'Testing',
-        },
+    const type = 'index-pattern';
+    const attributes = { title: 'Logstash' };
+    const id = 'logstash-*';
+    const namespace = 'foo-namespace';
+    const references = [
+      {
+        name: 'ref_0',
+        type: 'test',
+        id: '123',
       },
-    };
+    ];
 
-    it('waits until migrations are complete before proceeding', async () => {
-      migrator.runMigrations = jest.fn(async () => expect(callAdminCluster).not.toHaveBeenCalled());
+    const createSuccess = async (type, attributes, options) => {
+      const result = await savedObjectsRepository.create(type, attributes, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(
+        registry.isMultiNamespace(type) && options.overwrite ? 2 : 1
+      );
+      return result;
+    };
 
-      callAdminCluster.mockResolvedValue(noNamespaceResult);
-      await expect(
-        savedObjectsRepository.get('index-pattern', 'logstash-*')
-      ).resolves.toBeDefined();
+    describe('cluster calls', () => {
+      it(`should use the ES create action if ID is undefined and overwrite=true`, async () => {
+        await createSuccess(type, attributes, { overwrite: true });
+        expectClusterCalls('create');
+      });
 
-      expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
-    });
+      it(`should use the ES create action if ID is undefined and overwrite=false`, async () => {
+        await createSuccess(type, attributes);
+        expectClusterCalls('create');
+      });
 
-    it('formats Elasticsearch response when there is no namespace', async () => {
-      callAdminCluster.mockResolvedValue(noNamespaceResult);
-      const response = await savedObjectsRepository.get('index-pattern', 'logstash-*');
-      expect(response).toEqual({
-        id: 'logstash-*',
-        type: 'index-pattern',
-        updated_at: mockTimestamp,
-        version: mockVersion,
-        attributes: {
-          title: 'Testing',
-        },
-        references: [],
+      it(`should use the ES index action if ID is defined and overwrite=true`, async () => {
+        await createSuccess(type, attributes, { id, overwrite: true });
+        expectClusterCalls('index');
       });
-    });
 
-    it('formats Elasticsearch response when there are namespaces', async () => {
-      callAdminCluster.mockResolvedValue(namespacedResult);
-      const response = await savedObjectsRepository.get('index-pattern', 'logstash-*');
-      expect(response).toEqual({
-        id: 'logstash-*',
-        type: 'index-pattern',
-        updated_at: mockTimestamp,
-        version: mockVersion,
-        attributes: {
-          title: 'Testing',
-        },
-        references: [],
+      it(`should use the ES create action if ID is defined and overwrite=false`, async () => {
+        await createSuccess(type, attributes, { id });
+        expectClusterCalls('create');
       });
-    });
 
-    it('prepends namespace and type to the id when providing namespace for namespaced type', async () => {
-      callAdminCluster.mockResolvedValue(namespacedResult);
-      await savedObjectsRepository.get('index-pattern', 'logstash-*', {
-        namespace: 'foo-namespace',
+      it(`should use the ES get action then index action if type is multi-namespace, ID is defined, and overwrite=true`, async () => {
+        await createSuccess(MULTI_NAMESPACE_TYPE, attributes, { id, overwrite: true });
+        expectClusterCalls('get', 'index');
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          id: 'foo-namespace:index-pattern:logstash-*',
-        })
-      );
-    });
+      it(`defaults to empty references array`, async () => {
+        await createSuccess(type, attributes, { id });
+        expectClusterCallArgs({
+          body: expect.objectContaining({ references: [] }),
+        });
+      });
 
-    it(`only prepends type to the id when providing no namespace for namespaced type`, async () => {
-      callAdminCluster.mockResolvedValue(noNamespaceResult);
-      await savedObjectsRepository.get('index-pattern', 'logstash-*');
+      it(`accepts custom references array`, async () => {
+        const test = async references => {
+          await createSuccess(type, attributes, { id, references });
+          expectClusterCallArgs({
+            body: expect.objectContaining({ references }),
+          });
+          callAdminCluster.mockReset();
+        };
+        await test(references);
+        await test(['string']);
+        await test([]);
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          id: 'index-pattern:logstash-*',
-        })
-      );
-    });
+      it(`doesn't accept custom references if not an array`, async () => {
+        const test = async references => {
+          await createSuccess(type, attributes, { id, references });
+          expectClusterCallArgs({
+            body: expect.not.objectContaining({ references: expect.anything() }),
+          });
+          callAdminCluster.mockReset();
+        };
+        await test('string');
+        await test(123);
+        await test(true);
+        await test(null);
+      });
 
-    it(`doesn't prepend namespace to the id when providing namespace for namespace agnostic type`, async () => {
-      callAdminCluster.mockResolvedValue(namespacedResult);
-      await savedObjectsRepository.get('globaltype', 'logstash-*', {
-        namespace: 'foo-namespace',
+      it(`defaults to a refresh setting of wait_for`, async () => {
+        await createSuccess(type, attributes);
+        expectClusterCallArgs({ refresh: 'wait_for' });
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          id: 'globaltype:logstash-*',
-        })
-      );
-    });
-  });
+      it(`accepts a custom refresh setting`, async () => {
+        const refresh = 'foo';
+        await createSuccess(type, attributes, { refresh });
+        expectClusterCallArgs({ refresh });
+      });
 
-  describe('#bulkGet', () => {
-    it('waits until migrations are complete before proceeding', async () => {
-      migrator.runMigrations = jest.fn(async () => expect(callAdminCluster).not.toHaveBeenCalled());
-
-      callAdminCluster.mockReturnValue({ docs: [] });
-      await expect(
-        savedObjectsRepository.bulkGet([
-          { id: 'one', type: 'config' },
-          { id: 'two', type: 'index-pattern' },
-          { id: 'three', type: 'globaltype' },
-        ])
-      ).resolves.toBeDefined();
-
-      expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
-    });
+      it(`should use default index`, async () => {
+        await createSuccess(type, attributes, { id });
+        expectClusterCallArgs({ index: '.kibana-test' });
+      });
 
-    it('prepends type to id when getting objects when there is no namespace', async () => {
-      callAdminCluster.mockReturnValue({ docs: [] });
+      it(`should use custom index`, async () => {
+        await createSuccess(CUSTOM_INDEX_TYPE, attributes, { id });
+        expectClusterCallArgs({ index: 'custom' });
+      });
 
-      await savedObjectsRepository.bulkGet([
-        { id: 'one', type: 'config' },
-        { id: 'two', type: 'index-pattern' },
-        { id: 'three', type: 'globaltype' },
-      ]);
+      it(`self-generates an id if none is provided`, async () => {
+        await createSuccess(type, attributes);
+        expectClusterCallArgs({
+          id: expect.objectContaining(/index-pattern:[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}/),
+        });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          body: {
-            docs: [
-              { _id: 'config:one', _index: '.kibana-test' },
-              { _id: 'index-pattern:two', _index: '.kibana-test' },
-              { _id: 'globaltype:three', _index: '.kibana-test' },
-            ],
-          },
-        })
-      );
-    });
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        await createSuccess(type, attributes, { id, namespace });
+        expectClusterCallArgs({ id: `${namespace}:${type}:${id}` });
+      });
 
-    it('prepends namespace and type appropriately to id when getting objects when there is a namespace', async () => {
-      callAdminCluster.mockReturnValue({ docs: [] });
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        await createSuccess(type, attributes, { id });
+        expectClusterCallArgs({ id: `${type}:${id}` });
+      });
 
-      await savedObjectsRepository.bulkGet(
-        [
-          { id: 'one', type: 'config' },
-          { id: 'two', type: 'index-pattern' },
-          { id: 'three', type: 'globaltype' },
-        ],
-        {
-          namespace: 'foo-namespace',
-        }
-      );
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        await createSuccess(NAMESPACE_AGNOSTIC_TYPE, attributes, { id, namespace });
+        expectClusterCallArgs({ id: `${NAMESPACE_AGNOSTIC_TYPE}:${id}` });
+        callAdminCluster.mockReset();
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          body: {
-            docs: [
-              { _id: 'foo-namespace:config:one', _index: '.kibana-test' },
-              { _id: 'foo-namespace:index-pattern:two', _index: '.kibana-test' },
-              { _id: 'globaltype:three', _index: '.kibana-test' },
-            ],
-          },
-        })
-      );
+        await createSuccess(MULTI_NAMESPACE_TYPE, attributes, { id, namespace });
+        expectClusterCallArgs({ id: `${MULTI_NAMESPACE_TYPE}:${id}` });
+      });
     });
 
-    it('mockReturnValue early for empty objects argument', async () => {
-      callAdminCluster.mockReturnValue({ docs: [] });
+    describe('errors', () => {
+      it(`throws when type is invalid`, async () => {
+        await expect(savedObjectsRepository.create('unknownType', attributes)).rejects.toThrowError(
+          createUnsupportedTypeError('unknownType')
+        );
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
 
-      const response = await savedObjectsRepository.bulkGet([]);
+      it(`throws when type is hidden`, async () => {
+        await expect(savedObjectsRepository.create(HIDDEN_TYPE, attributes)).rejects.toThrowError(
+          createUnsupportedTypeError(HIDDEN_TYPE)
+        );
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
 
-      expect(response.saved_objects).toHaveLength(0);
-      expect(callAdminCluster).not.toHaveBeenCalled();
+      it(`throws when there is a conflict with an existing multi-namespace saved object (get)`, async () => {
+        const response = getMockGetResponse({
+          type: MULTI_NAMESPACE_TYPE,
+          id,
+          namespace: 'bar-namespace',
+        });
+        callAdminCluster.mockResolvedValue(response); // this._callCluster('get', ...)
+        await expect(
+          savedObjectsRepository.create(MULTI_NAMESPACE_TYPE, attributes, {
+            id,
+            overwrite: true,
+            namespace,
+          })
+        ).rejects.toThrowError(createConflictError(MULTI_NAMESPACE_TYPE, id));
+        expectClusterCalls('get');
+      });
+
+      it(`throws when automatic index creation fails`, async () => {
+        // TODO
+      });
+
+      it(`throws when an unexpected failure occurs`, async () => {
+        // TODO
+      });
     });
 
-    it('handles missing ids gracefully', async () => {
-      callAdminCluster.mockResolvedValue({
-        docs: [
-          {
-            _id: 'config:good',
-            found: true,
-            ...mockVersionProps,
-            _source: { ...mockTimestampFields, config: { title: 'Test' } },
-          },
-          {
-            _id: 'config:bad',
-            found: false,
-          },
-        ],
+    describe('migration', () => {
+      beforeEach(() => {
+        migrator.migrateDocument.mockImplementation(mockMigrateDocument);
       });
 
-      const { saved_objects: savedObjects } = await savedObjectsRepository.bulkGet([
-        { id: 'good', type: 'config' },
-        { type: 'config' },
-      ]);
+      it(`waits until migrations are complete before proceeding`, async () => {
+        migrator.runMigrations = jest.fn(async () =>
+          expect(callAdminCluster).not.toHaveBeenCalled()
+        );
+        await expect(createSuccess(type, attributes, { id, namespace })).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
+      });
 
-      expect(savedObjects[1]).toEqual({
-        type: 'config',
-        error: { statusCode: 404, message: 'Not found' },
+      it(`migrates a document and serializes the migrated doc`, async () => {
+        const migrationVersion = mockMigrationVersion;
+        await createSuccess(type, attributes, { id, references, migrationVersion });
+        const doc = { type, id, attributes, references, migrationVersion, ...mockTimestampFields };
+        expectMigrationArgs(doc);
+
+        const migratedDoc = migrator.migrateDocument(doc);
+        expect(serializer.savedObjectToRaw).toHaveBeenLastCalledWith(migratedDoc);
       });
-    });
 
-    it('reports error on missed objects', async () => {
-      callAdminCluster.mockResolvedValue({
-        docs: [
-          {
-            _id: 'config:good',
-            found: true,
-            ...mockVersionProps,
-            _source: { ...mockTimestampFields, config: { title: 'Test' } },
-          },
-          {
-            _id: 'config:bad',
-            found: false,
-          },
-        ],
+      it(`adds namespace to body when providing namespace for single-namespace type`, async () => {
+        await createSuccess(type, attributes, { id, namespace });
+        expectMigrationArgs({ namespace });
       });
 
-      const { saved_objects: savedObjects } = await savedObjectsRepository.bulkGet([
-        { id: 'good', type: 'config' },
-        { id: 'bad', type: 'config' },
-      ]);
+      it(`doesn't add namespace to body when providing no namespace for single-namespace type`, async () => {
+        await createSuccess(type, attributes, { id });
+        expectMigrationArgs({ namespace: expect.anything() }, false);
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`doesn't add namespace to body when not using single-namespace type`, async () => {
+        await createSuccess(NAMESPACE_AGNOSTIC_TYPE, attributes, { id, namespace });
+        expectMigrationArgs({ namespace: expect.anything() }, false, 1);
 
-      expect(savedObjects).toHaveLength(2);
-      expect(savedObjects[0]).toEqual({
-        id: 'good',
-        type: 'config',
-        ...mockTimestampFields,
-        version: mockVersion,
-        attributes: { title: 'Test' },
-        references: [],
+        callAdminCluster.mockReset();
+        await createSuccess(MULTI_NAMESPACE_TYPE, attributes, { id });
+        expectMigrationArgs({ namespace: expect.anything() }, false, 2);
       });
-      expect(savedObjects[1]).toEqual({
-        id: 'bad',
-        type: 'config',
-        error: { statusCode: 404, message: 'Not found' },
+
+      it(`adds namespaces to body when providing namespace for multi-namespace type`, async () => {
+        await createSuccess(MULTI_NAMESPACE_TYPE, attributes, { id, namespace });
+        expectMigrationArgs({ namespaces: [namespace] });
       });
-    });
 
-    it('returns errors when requesting unsupported types', async () => {
-      callAdminCluster.mockResolvedValue({
-        docs: [
-          {
-            _id: 'one',
-            found: true,
-            ...mockVersionProps,
-            _source: { ...mockTimestampFields, config: { title: 'Test1' } },
-          },
-          {
-            _id: 'three',
-            found: true,
-            ...mockVersionProps,
-            _source: { ...mockTimestampFields, config: { title: 'Test3' } },
-          },
-          {
-            _id: 'five',
-            found: true,
-            ...mockVersionProps,
-            _source: { ...mockTimestampFields, config: { title: 'Test5' } },
-          },
-        ],
+      it(`adds default namespaces to body when providing no namespace for multi-namespace type`, async () => {
+        await createSuccess(MULTI_NAMESPACE_TYPE, attributes, { id });
+        expectMigrationArgs({ namespaces: ['default'] });
       });
 
-      const { saved_objects: savedObjects } = await savedObjectsRepository.bulkGet([
-        { id: 'one', type: 'config' },
-        { id: 'two', type: 'invalidtype' },
-        { id: 'three', type: 'config' },
-        { id: 'four', type: 'invalidtype' },
-        { id: 'five', type: 'config' },
-      ]);
+      it(`doesn't add namespaces to body when not using multi-namespace type`, async () => {
+        await createSuccess(type, attributes, { id });
+        expectMigrationArgs({ namespaces: expect.anything() }, false, 1);
 
-      expect(savedObjects).toEqual([
-        {
-          attributes: { title: 'Test1' },
-          id: 'one',
-          ...mockTimestampFields,
-          references: [],
-          type: 'config',
-          version: mockVersion,
-          migrationVersion: undefined,
-        },
-        {
-          attributes: { title: 'Test3' },
-          id: 'three',
-          ...mockTimestampFields,
-          references: [],
-          type: 'config',
-          version: mockVersion,
-          migrationVersion: undefined,
-        },
-        {
-          attributes: { title: 'Test5' },
-          id: 'five',
+        callAdminCluster.mockReset();
+        await createSuccess(NAMESPACE_AGNOSTIC_TYPE, attributes, { id });
+        expectMigrationArgs({ namespaces: expect.anything() }, false, 2);
+      });
+    });
+
+    describe('returns', () => {
+      it(`formats the ES response`, async () => {
+        const result = await createSuccess(type, attributes, { id, namespace, references });
+        expect(result).toEqual({
+          type,
+          id,
           ...mockTimestampFields,
-          references: [],
-          type: 'config',
           version: mockVersion,
-          migrationVersion: undefined,
-        },
-        {
-          error: {
-            error: 'Bad Request',
-            message: "Unsupported saved object type: 'invalidtype': Bad Request",
-            statusCode: 400,
-          },
-          id: 'two',
-          type: 'invalidtype',
-        },
-        {
-          error: {
-            error: 'Bad Request',
-            message: "Unsupported saved object type: 'invalidtype': Bad Request",
-            statusCode: 400,
-          },
-          id: 'four',
-          type: 'invalidtype',
-        },
-      ]);
+          attributes,
+          references,
+        });
+      });
     });
   });
 
-  describe('#update', () => {
-    const id = 'logstash-*';
+  describe('#delete', () => {
     const type = 'index-pattern';
-    const attributes = { title: 'Testing' };
+    const id = 'logstash-*';
+    const namespace = 'foo-namespace';
 
-    beforeEach(() => {
-      callAdminCluster.mockResolvedValue({
-        _id: `${type}:${id}`,
-        ...mockVersionProps,
-        result: 'updated',
+    const deleteSuccess = async (type, id, options) => {
+      if (registry.isMultiNamespace(type)) {
+        const mockGetResponse = getMockGetResponse({ type, id, namespace: options?.namespace });
+        callAdminCluster.mockResolvedValueOnce(mockGetResponse); // this._callCluster('get', ...)
+      }
+      callAdminCluster.mockResolvedValue({ result: 'deleted' }); // this._writeToCluster('delete', ...)
+      const result = await savedObjectsRepository.delete(type, id, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(registry.isMultiNamespace(type) ? 2 : 1);
+      return result;
+    };
+
+    describe('cluster calls', () => {
+      it(`should use the ES delete action when not using a multi-namespace type`, async () => {
+        await deleteSuccess(type, id);
+        expectClusterCalls('delete');
       });
-    });
 
-    it('waits until migrations are complete before proceeding', async () => {
-      migrator.runMigrations = jest.fn(async () => expect(callAdminCluster).not.toHaveBeenCalled());
+      it(`should use ES get action then delete action when using a multi-namespace type with no namespaces remaining`, async () => {
+        await deleteSuccess(MULTI_NAMESPACE_TYPE, id);
+        expectClusterCalls('get', 'delete');
+      });
 
-      await expect(
-        savedObjectsRepository.update('index-pattern', 'logstash-*', attributes, {
-          namespace: 'foo-namespace',
-        })
-      ).resolves.toBeDefined();
+      it(`should use ES get action then update action when using a multi-namespace type with one or more namespaces remaining`, async () => {
+        const mockResponse = getMockGetResponse({ type: MULTI_NAMESPACE_TYPE, id });
+        mockResponse._source.namespaces = ['default', 'some-other-nameespace'];
+        callAdminCluster
+          .mockResolvedValueOnce(mockResponse) // this._callCluster('get', ...)
+          .mockResolvedValue({ result: 'updated' }); // this._writeToCluster('update', ...)
+        await savedObjectsRepository.delete(MULTI_NAMESPACE_TYPE, id);
+        expectClusterCalls('get', 'update');
+      });
 
-      expect(migrator.runMigrations).toHaveReturnedTimes(1);
-    });
+      it(`includes the version of the existing document when type is multi-namespace`, async () => {
+        await deleteSuccess(MULTI_NAMESPACE_TYPE, id);
+        const versionProperties = {
+          if_seq_no: mockVersionProps._seq_no,
+          if_primary_term: mockVersionProps._primary_term,
+        };
+        expectClusterCallArgs(versionProperties, 2);
+      });
 
-    it('mockReturnValue current ES document _seq_no and _primary_term encoded as version', async () => {
-      const response = await savedObjectsRepository.update(
-        'index-pattern',
-        'logstash-*',
-        attributes,
-        {
-          namespace: 'foo-namespace',
-          references: [
-            {
-              name: 'ref_0',
-              type: 'test',
-              id: '1',
-            },
-          ],
-        }
-      );
-      expect(response).toEqual({
-        id,
-        type,
-        ...mockTimestampFields,
-        version: mockVersion,
-        attributes,
-        references: [
-          {
-            name: 'ref_0',
-            type: 'test',
-            id: '1',
-          },
-        ],
+      it(`defaults to a refresh setting of wait_for`, async () => {
+        await deleteSuccess(type, id);
+        expectClusterCallArgs({ refresh: 'wait_for' });
       });
-    });
 
-    it('accepts version', async () => {
-      await savedObjectsRepository.update(
-        type,
-        id,
-        { title: 'Testing' },
-        {
-          version: encodeHitVersion({
-            _seq_no: 100,
-            _primary_term: 200,
-          }),
-        }
-      );
+      it(`accepts a custom refresh setting`, async () => {
+        const refresh = 'foo';
+        await deleteSuccess(type, id, { refresh });
+        expectClusterCallArgs({ refresh });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          if_seq_no: 100,
-          if_primary_term: 200,
-        })
-      );
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        await deleteSuccess(type, id, { namespace });
+        expectClusterCallArgs({ id: `${namespace}:${type}:${id}` });
+      });
+
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        await deleteSuccess(type, id);
+        expectClusterCallArgs({ id: `${type}:${id}` });
+      });
+
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        await deleteSuccess(NAMESPACE_AGNOSTIC_TYPE, id, { namespace });
+        expectClusterCallArgs({ id: `${NAMESPACE_AGNOSTIC_TYPE}:${id}` });
+
+        callAdminCluster.mockReset();
+        await deleteSuccess(MULTI_NAMESPACE_TYPE, id, { namespace });
+        expectClusterCallArgs({ id: `${MULTI_NAMESPACE_TYPE}:${id}` });
+      });
     });
 
-    it('does not pass references if omitted', async () => {
-      await savedObjectsRepository.update(type, id, { title: 'Testing' });
+    describe('errors', () => {
+      const expectNotFoundError = async (type, id, options) => {
+        await expect(savedObjectsRepository.delete(type, id, options)).rejects.toThrowError(
+          createGenericNotFoundError(type, id)
+        );
+      };
+
+      it(`throws when type is invalid`, async () => {
+        await expectNotFoundError('unknownType', id);
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
+
+      it(`throws when type is hidden`, async () => {
+        await expectNotFoundError(HIDDEN_TYPE, id);
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
+
+      it(`throws when ES is unable to find the document during get`, async () => {
+        callAdminCluster.mockResolvedValue({ found: false }); // this._callCluster('get', ...)
+        await expectNotFoundError(MULTI_NAMESPACE_TYPE, id);
+        expectClusterCalls('get');
+      });
+
+      it(`throws when ES is unable to find the index during get`, async () => {
+        callAdminCluster.mockResolvedValue({ status: 404 }); // this._callCluster('get', ...)
+        await expectNotFoundError(MULTI_NAMESPACE_TYPE, id);
+        expectClusterCalls('get');
+      });
+
+      it(`throws when the type is multi-namespace and the document exists, but not in this namespace`, async () => {
+        const response = getMockGetResponse({ type: MULTI_NAMESPACE_TYPE, id, namespace });
+        callAdminCluster.mockResolvedValue(response); // this._callCluster('get', ...)
+        await expectNotFoundError(MULTI_NAMESPACE_TYPE, id, { namespace: 'bar-namespace' });
+        expectClusterCalls('get');
+      });
+
+      it(`throws when ES is unable to find the document during update`, async () => {
+        const mockResponse = getMockGetResponse({ type: MULTI_NAMESPACE_TYPE, id });
+        mockResponse._source.namespaces = ['default', 'some-other-nameespace'];
+        callAdminCluster
+          .mockResolvedValueOnce(mockResponse) // this._callCluster('get', ...)
+          .mockResolvedValue({ status: 404 }); // this._writeToCluster('update', ...)
+        await expectNotFoundError(MULTI_NAMESPACE_TYPE, id);
+        expectClusterCalls('get', 'update');
+      });
+
+      it(`throws when ES is unable to find the document during delete`, async () => {
+        callAdminCluster.mockResolvedValue({ result: 'not_found' }); // this._writeToCluster('delete', ...)
+        await expectNotFoundError(type, id);
+        expectClusterCalls('delete');
+      });
+
+      it(`throws when ES is unable to find the index during delete`, async () => {
+        callAdminCluster.mockResolvedValue({ error: { type: 'index_not_found_exception' } }); // this._writeToCluster('delete', ...)
+        await expectNotFoundError(type, id);
+        expectClusterCalls('delete');
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).not.toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          body: {
-            doc: expect.objectContaining({
-              references: [],
-            }),
-          },
-        })
-      );
+      it(`throws when ES returns an unexpected response`, async () => {
+        callAdminCluster.mockResolvedValue({ result: 'something unexpected' }); // this._writeToCluster('delete', ...)
+        await expect(savedObjectsRepository.delete(type, id)).rejects.toThrowError(
+          'Unexpected Elasticsearch DELETE response'
+        );
+        expectClusterCalls('delete');
+      });
     });
 
-    it('passes references if they are provided', async () => {
-      await savedObjectsRepository.update(type, id, { title: 'Testing' }, { references: ['foo'] });
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        let callAdminClusterCount = 0;
+        migrator.runMigrations = jest.fn(async () =>
+          // runMigrations should resolve before callAdminCluster is initiated
+          expect(callAdminCluster).toHaveBeenCalledTimes(callAdminClusterCount++)
+        );
+        await expect(deleteSuccess(type, id)).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
+      });
+    });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          body: {
-            doc: expect.objectContaining({
-              references: ['foo'],
-            }),
-          },
-        })
-      );
+    describe('returns', () => {
+      it(`returns an empty object on success`, async () => {
+        const result = await deleteSuccess(type, id);
+        expect(result).toEqual({});
+      });
     });
+  });
 
-    it('passes empty references array if empty references array is provided', async () => {
-      await savedObjectsRepository.update(type, id, { title: 'Testing' }, { references: [] });
+  describe('#deleteByNamespace', () => {
+    const namespace = 'foo-namespace';
+    const mockUpdateResults = {
+      took: 15,
+      timed_out: false,
+      total: 3,
+      updated: 2,
+      deleted: 1,
+      batches: 1,
+      version_conflicts: 0,
+      noops: 0,
+      retries: { bulk: 0, search: 0 },
+      throttled_millis: 0,
+      requests_per_second: -1.0,
+      throttled_until_millis: 0,
+      failures: [],
+    };
 
+    const deleteByNamespaceSuccess = async (namespace, options) => {
+      callAdminCluster.mockResolvedValue(mockUpdateResults);
+      const result = await savedObjectsRepository.deleteByNamespace(namespace, options);
+      expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledTimes(1);
       expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          body: {
-            doc: expect.objectContaining({
-              references: [],
-            }),
-          },
-        })
-      );
-    });
+      return result;
+    };
 
-    it(`prepends namespace to the id but doesn't add namespace to body when providing namespace for namespaced type`, async () => {
-      await savedObjectsRepository.update(
-        'index-pattern',
-        'logstash-*',
-        {
-          title: 'Testing',
-        },
-        {
-          namespace: 'foo-namespace',
-          references: [
-            {
-              name: 'ref_0',
-              type: 'test',
-              id: '1',
-            },
-          ],
-        }
-      );
+    describe('cluster calls', () => {
+      it(`should use the ES updateByQuery action`, async () => {
+        await deleteByNamespaceSuccess(namespace);
+        expectClusterCalls('updateByQuery');
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith('update', {
-        id: 'foo-namespace:index-pattern:logstash-*',
-        body: {
-          doc: {
-            updated_at: mockTimestamp,
-            'index-pattern': { title: 'Testing' },
-            references: [
-              {
-                name: 'ref_0',
-                type: 'test',
-                id: '1',
-              },
-            ],
-          },
-        },
-        ignore: [404],
-        refresh: 'wait_for',
-        index: '.kibana-test',
+      it(`defaults to a refresh setting of wait_for`, async () => {
+        await deleteByNamespaceSuccess(namespace);
+        expectClusterCallArgs({ refresh: 'wait_for' });
       });
-    });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing no namespace for namespaced type`, async () => {
-      await savedObjectsRepository.update(
-        'index-pattern',
-        'logstash-*',
-        {
-          title: 'Testing',
-        },
-        {
-          references: [
-            {
-              name: 'ref_0',
-              type: 'test',
-              id: '1',
-            },
-          ],
-        }
-      );
+      it(`accepts a custom refresh setting`, async () => {
+        const refresh = 'foo';
+        await deleteByNamespaceSuccess(namespace, { refresh });
+        expectClusterCallArgs({ refresh });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith('update', {
-        id: 'index-pattern:logstash-*',
-        body: {
-          doc: {
-            updated_at: mockTimestamp,
-            'index-pattern': { title: 'Testing' },
-            references: [
-              {
-                name: 'ref_0',
-                type: 'test',
-                id: '1',
-              },
-            ],
-          },
-        },
-        ignore: [404],
-        refresh: 'wait_for',
-        index: '.kibana-test',
+      it(`should use all indices for types that are not namespace-agnostic`, async () => {
+        await deleteByNamespaceSuccess(namespace);
+        expectClusterCallArgs({ index: ['.kibana-test', 'custom'] }, 1);
       });
     });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing namespace for namespace agnostic type`, async () => {
-      await savedObjectsRepository.update(
-        'globaltype',
-        'foo',
-        {
-          name: 'bar',
-        },
-        {
-          namespace: 'foo-namespace',
-          references: [
-            {
-              name: 'ref_0',
-              type: 'test',
-              id: '1',
-            },
-          ],
-        }
-      );
-
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster).toHaveBeenCalledWith('update', {
-        id: 'globaltype:foo',
-        body: {
-          doc: {
-            updated_at: mockTimestamp,
-            globaltype: { name: 'bar' },
-            references: [
-              {
-                name: 'ref_0',
-                type: 'test',
-                id: '1',
-              },
-            ],
-          },
-        },
-        ignore: [404],
-        refresh: 'wait_for',
-        index: '.kibana-test',
+    describe('errors', () => {
+      it(`throws when namespace is not a string`, async () => {
+        const test = async namespace => {
+          await expect(savedObjectsRepository.deleteByNamespace(namespace)).rejects.toThrowError(
+            `namespace is required, and must be a string`
+          );
+          expect(callAdminCluster).not.toHaveBeenCalled();
+        };
+        await test(undefined);
+        await test(['namespace']);
+        await test(123);
+        await test(true);
       });
     });
 
-    it('defaults to a refresh setting of `wait_for`', async () => {
-      await savedObjectsRepository.update('globaltype', 'foo', {
-        name: 'bar',
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        migrator.runMigrations = jest.fn(async () =>
+          expect(callAdminCluster).not.toHaveBeenCalled()
+        );
+        await expect(deleteByNamespaceSuccess(namespace)).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
       });
+    });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: 'wait_for',
+    describe('returns', () => {
+      it(`returns the query results on success`, async () => {
+        const result = await deleteByNamespaceSuccess(namespace);
+        expect(result).toEqual(mockUpdateResults);
       });
     });
 
-    it('accepts a custom refresh setting', async () => {
-      await savedObjectsRepository.update(
-        'globaltype',
-        'foo',
-        {
-          name: 'bar',
-        },
-        {
-          refresh: true,
-          namespace: 'foo-namespace',
-        }
-      );
-
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: true,
+    describe('search dsl', () => {
+      it(`constructs a query using all multi-namespace types, and another using all single-namespace types`, async () => {
+        await deleteByNamespaceSuccess(namespace);
+        const allTypes = registry.getAllTypes().map(type => type.name);
+        expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledWith(mappings, registry, {
+          namespace,
+          type: allTypes.filter(type => !registry.isNamespaceAgnostic(type)),
+        });
       });
     });
   });
 
-  describe('#bulkUpdate', () => {
-    const { generateSavedObject, reset } = (() => {
-      let count = 0;
+  describe('#find', () => {
+    const generateSearchResults = namespace => {
       return {
-        generateSavedObject(overrides) {
-          count++;
-          return _.merge(
+        hits: {
+          total: 4,
+          hits: [
             {
-              type: 'index-pattern',
-              id: `logstash-${count}`,
-              attributes: { title: `Testing ${count}` },
-              references: [
-                {
-                  name: 'ref_0',
-                  type: 'test',
-                  id: '1',
+              _index: '.kibana',
+              _id: `${namespace ? `${namespace}:` : ''}index-pattern:logstash-*`,
+              _score: 1,
+              ...mockVersionProps,
+              _source: {
+                namespace,
+                type: 'index-pattern',
+                ...mockTimestampFields,
+                'index-pattern': {
+                  title: 'logstash-*',
+                  timeFieldName: '@timestamp',
+                  notExpandable: true,
                 },
-              ],
+              },
             },
-            overrides
-          );
-        },
-        reset() {
-          count = 0;
+            {
+              _index: '.kibana',
+              _id: `${namespace ? `${namespace}:` : ''}config:6.0.0-alpha1`,
+              _score: 1,
+              ...mockVersionProps,
+              _source: {
+                namespace,
+                type: 'config',
+                ...mockTimestampFields,
+                config: {
+                  buildNum: 8467,
+                  defaultIndex: 'logstash-*',
+                },
+              },
+            },
+            {
+              _index: '.kibana',
+              _id: `${namespace ? `${namespace}:` : ''}index-pattern:stocks-*`,
+              _score: 1,
+              ...mockVersionProps,
+              _source: {
+                namespace,
+                type: 'index-pattern',
+                ...mockTimestampFields,
+                'index-pattern': {
+                  title: 'stocks-*',
+                  timeFieldName: '@timestamp',
+                  notExpandable: true,
+                },
+              },
+            },
+            {
+              _index: '.kibana',
+              _id: `${NAMESPACE_AGNOSTIC_TYPE}:something`,
+              _score: 1,
+              ...mockVersionProps,
+              _source: {
+                type: NAMESPACE_AGNOSTIC_TYPE,
+                ...mockTimestampFields,
+                [NAMESPACE_AGNOSTIC_TYPE]: {
+                  name: 'bar',
+                },
+              },
+            },
+          ],
         },
       };
-    })();
+    };
 
-    beforeEach(() => {
-      reset();
-    });
+    const type = 'index-pattern';
+    const namespace = 'foo-namespace';
 
-    const mockValidResponse = objects =>
-      callAdminCluster.mockReturnValue({
-        items: objects.map(items => ({
-          update: {
-            _id: `${items.type}:${items.id}`,
-            ...mockVersionProps,
-            result: 'updated',
-          },
-        })),
+    const findSuccess = async (options, namespace) => {
+      callAdminCluster.mockResolvedValue(generateSearchResults(namespace));
+      const result = await savedObjectsRepository.find(options);
+      expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      return result;
+    };
+
+    describe('cluster calls', () => {
+      it(`should use the ES search action`, async () => {
+        await findSuccess({ type });
+        expectClusterCalls('search');
+      });
+
+      it(`merges output of getSearchDsl into es request body`, async () => {
+        const query = { query: 1, aggregations: 2 };
+        getSearchDslNS.getSearchDsl.mockReturnValue(query);
+        await findSuccess({ type });
+        expectClusterCallArgs({ body: expect.objectContaining({ ...query }) });
       });
 
-    it('waits until migrations are complete before proceeding', async () => {
-      const objects = [generateSavedObject(), generateSavedObject()];
+      it(`accepts per_page/page`, async () => {
+        await findSuccess({ type, perPage: 10, page: 6 });
+        expectClusterCallArgs({
+          size: 10,
+          from: 50,
+        });
+      });
 
-      migrator.runMigrations = jest.fn(async () => expect(callAdminCluster).not.toHaveBeenCalled());
+      it(`can filter by fields`, async () => {
+        await findSuccess({ type, fields: ['title'] });
+        expectClusterCallArgs({
+          _source: [
+            `${type}.title`,
+            'namespace',
+            'namespaces',
+            'type',
+            'references',
+            'migrationVersion',
+            'updated_at',
+            'title',
+          ],
+        });
+      });
 
-      mockValidResponse(objects);
+      it(`should set rest_total_hits_as_int to true on a request`, async () => {
+        await findSuccess({ type });
+        expectClusterCallArgs({ rest_total_hits_as_int: true });
+      });
 
-      await expect(
-        savedObjectsRepository.bulkUpdate([generateSavedObject()])
-      ).resolves.toBeDefined();
+      it(`should not make a cluster call when attempting to find only invalid or hidden types`, async () => {
+        const test = async types => {
+          await savedObjectsRepository.find({ type: types });
+          expect(callAdminCluster).not.toHaveBeenCalled();
+        };
 
-      expect(migrator.runMigrations).toHaveReturnedTimes(1);
+        await test('unknownType');
+        await test(HIDDEN_TYPE);
+        await test(['unknownType', HIDDEN_TYPE]);
+      });
     });
 
-    it('returns current ES document, _seq_no and _primary_term encoded as version', async () => {
-      const objects = [generateSavedObject(), generateSavedObject()];
-
-      mockValidResponse(objects);
+    describe('errors', () => {
+      it(`throws when type is not defined`, async () => {
+        await expect(savedObjectsRepository.find({})).rejects.toThrowError(
+          'options.type must be a string or an array of strings'
+        );
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
 
-      const response = await savedObjectsRepository.bulkUpdate(objects);
+      it(`throws when searchFields is defined but not an array`, async () => {
+        await expect(
+          savedObjectsRepository.find({ type, searchFields: 'string' })
+        ).rejects.toThrowError('options.searchFields must be an array');
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
 
-      expect(response.saved_objects[0]).toMatchObject({
-        ..._.pick(objects[0], 'id', 'type', 'attributes'),
-        version: mockVersion,
-        references: objects[0].references,
+      it(`throws when fields is defined but not an array`, async () => {
+        await expect(savedObjectsRepository.find({ type, fields: 'string' })).rejects.toThrowError(
+          'options.fields must be an array'
+        );
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
-      expect(response.saved_objects[1]).toMatchObject({
-        ..._.pick(objects[1], 'id', 'type', 'attributes'),
-        version: mockVersion,
-        references: objects[1].references,
+
+      it(`throws when KQL filter syntax is invalid`, async () => {
+        const findOpts = {
+          namespace,
+          search: 'foo*',
+          searchFields: ['foo'],
+          type: ['dashboard'],
+          sortField: 'name',
+          sortOrder: 'desc',
+          defaultSearchOperator: 'AND',
+          hasReference: {
+            type: 'foo',
+            id: '1',
+          },
+          indexPattern: undefined,
+          filter: 'dashboard.attributes.otherField:<',
+        };
+
+        await expect(savedObjectsRepository.find(findOpts)).rejects.toMatchInlineSnapshot(`
+                          [Error: KQLSyntaxError: Expected "(", "{", value, whitespace but "<" found.
+                          dashboard.attributes.otherField:<
+                          --------------------------------^: Bad Request]
+                      `);
+        expect(getSearchDslNS.getSearchDsl).not.toHaveBeenCalled();
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
     });
 
-    it('handles a mix of succesfull updates and errors', async () => {
-      const objects = [
-        generateSavedObject(),
-        {
-          type: 'invalid-type',
-          id: 'invalid',
-          attributes: { title: 'invalid' },
-        },
-        generateSavedObject(),
-        generateSavedObject({
-          id: 'version_clash',
-        }),
-      ];
-
-      callAdminCluster.mockReturnValue({
-        items: objects
-          // remove invalid from mocks
-          .filter(item => item.id !== 'invalid')
-          .map(items => {
-            switch (items.id) {
-              case 'version_clash':
-                return {
-                  update: {
-                    _id: `${items.type}:${items.id}`,
-                    error: {
-                      type: 'version_conflict_engine_exception',
-                    },
-                  },
-                };
-              default:
-                return {
-                  update: {
-                    _id: `${items.type}:${items.id}`,
-                    ...mockVersionProps,
-                    result: 'updated',
-                  },
-                };
-            }
-          }),
-      });
-
-      const {
-        saved_objects: [firstUpdatedObject, invalidType, secondUpdatedObject, versionClashObject],
-      } = await savedObjectsRepository.bulkUpdate(objects);
-
-      expect(firstUpdatedObject).toMatchObject({
-        ..._.pick(objects[0], 'id', 'type', 'attributes', 'references'),
-        version: mockVersion,
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        migrator.runMigrations = jest.fn(async () =>
+          expect(callAdminCluster).not.toHaveBeenCalled()
+        );
+        await expect(findSuccess({ type })).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
       });
+    });
 
-      expect(invalidType).toMatchObject({
-        ..._.pick(objects[1], 'id', 'type'),
-        error: SavedObjectsErrorHelpers.createGenericNotFoundError('invalid-type', 'invalid').output
-          .payload,
-      });
+    describe('returns', () => {
+      it(`formats the ES response when there is no namespace`, async () => {
+        const noNamespaceSearchResults = generateSearchResults();
+        callAdminCluster.mockReturnValue(noNamespaceSearchResults);
+        const count = noNamespaceSearchResults.hits.hits.length;
 
-      expect(secondUpdatedObject).toMatchObject({
-        ..._.pick(objects[2], 'id', 'type', 'attributes', 'references'),
-        version: mockVersion,
-      });
+        const response = await savedObjectsRepository.find({ type });
+
+        expect(response.total).toBe(count);
+        expect(response.saved_objects).toHaveLength(count);
 
-      expect(versionClashObject).toMatchObject({
-        ..._.pick(objects[3], 'id', 'type'),
-        error: { statusCode: 409, message: 'version conflict, document already exists' },
+        noNamespaceSearchResults.hits.hits.forEach((doc, i) => {
+          expect(response.saved_objects[i]).toEqual({
+            id: doc._id.replace(/(index-pattern|config|globalType)\:/, ''),
+            type: doc._source.type,
+            ...mockTimestampFields,
+            version: mockVersion,
+            attributes: doc._source[doc._source.type],
+            references: [],
+          });
+        });
       });
-    });
 
-    it('doesnt call Elasticsearch if there are no valid objects to update', async () => {
-      const objects = [
-        {
-          type: 'invalid-type',
-          id: 'invalid',
-          attributes: { title: 'invalid' },
-        },
-        {
-          type: 'invalid-type',
-          id: 'invalid 2',
-          attributes: { title: 'invalid' },
-        },
-      ];
+      it(`formats the ES response when there is a namespace`, async () => {
+        const namespacedSearchResults = generateSearchResults(namespace);
+        callAdminCluster.mockReturnValue(namespacedSearchResults);
+        const count = namespacedSearchResults.hits.hits.length;
 
-      const {
-        saved_objects: [invalidType, invalidType2],
-      } = await savedObjectsRepository.bulkUpdate(objects);
+        const response = await savedObjectsRepository.find({ type, namespace });
 
-      expect(callAdminCluster).not.toHaveBeenCalled();
+        expect(response.total).toBe(count);
+        expect(response.saved_objects).toHaveLength(count);
 
-      expect(invalidType).toMatchObject({
-        ..._.pick(objects[0], 'id', 'type'),
-        error: SavedObjectsErrorHelpers.createGenericNotFoundError('invalid-type', 'invalid').output
-          .payload,
+        namespacedSearchResults.hits.hits.forEach((doc, i) => {
+          expect(response.saved_objects[i]).toEqual({
+            id: doc._id.replace(/(foo-namespace\:)?(index-pattern|config|globalType)\:/, ''),
+            type: doc._source.type,
+            ...mockTimestampFields,
+            version: mockVersion,
+            attributes: doc._source[doc._source.type],
+            references: [],
+          });
+        });
       });
 
-      expect(invalidType2).toMatchObject({
-        ..._.pick(objects[1], 'id', 'type'),
-        error: SavedObjectsErrorHelpers.createGenericNotFoundError('invalid-type', 'invalid 2')
-          .output.payload,
+      it(`should return empty results when attempting to find only invalid or hidden types`, async () => {
+        const test = async types => {
+          const result = await savedObjectsRepository.find({ type: types });
+          expect(result).toEqual(expect.objectContaining({ saved_objects: [] }));
+        };
+
+        await test('unknownType');
+        await test(HIDDEN_TYPE);
+        await test(['unknownType', HIDDEN_TYPE]);
       });
     });
 
-    it('accepts version', async () => {
-      const objects = [
-        generateSavedObject({
-          version: encodeHitVersion({
-            _seq_no: 100,
-            _primary_term: 200,
-          }),
-        }),
-        generateSavedObject({
-          version: encodeHitVersion({
-            _seq_no: 300,
-            _primary_term: 400,
-          }),
-        }),
-      ];
+    describe('search dsl', () => {
+      it(`passes mappings, registry, search, defaultSearchOperator, searchFields, type, sortField, sortOrder and hasReference to getSearchDsl`, async () => {
+        const relevantOpts = {
+          namespace,
+          search: 'foo*',
+          searchFields: ['foo'],
+          type: [type],
+          sortField: 'name',
+          sortOrder: 'desc',
+          defaultSearchOperator: 'AND',
+          hasReference: {
+            type: 'foo',
+            id: '1',
+          },
+          kueryNode: undefined,
+        };
 
-      mockValidResponse(objects);
+        await findSuccess(relevantOpts, namespace);
+        expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledWith(mappings, registry, relevantOpts);
+      });
+
+      it(`accepts KQL filter and passes kueryNode to getSearchDsl`, async () => {
+        const findOpts = {
+          namespace,
+          search: 'foo*',
+          searchFields: ['foo'],
+          type: ['dashboard'],
+          sortField: 'name',
+          sortOrder: 'desc',
+          defaultSearchOperator: 'AND',
+          hasReference: {
+            type: 'foo',
+            id: '1',
+          },
+          indexPattern: undefined,
+          filter: 'dashboard.attributes.otherField: *',
+        };
+
+        await findSuccess(findOpts, namespace);
+        const { kueryNode } = getSearchDslNS.getSearchDsl.mock.calls[0][2];
+        expect(kueryNode).toMatchInlineSnapshot(`
+          Object {
+            "arguments": Array [
+              Object {
+                "type": "literal",
+                "value": "dashboard.otherField",
+              },
+              Object {
+                "type": "wildcard",
+                "value": "@kuery-wildcard@",
+              },
+              Object {
+                "type": "literal",
+                "value": false,
+              },
+            ],
+            "function": "is",
+            "type": "function",
+          }
+        `);
+      });
 
-      await savedObjectsRepository.bulkUpdate(objects);
+      it(`supports multiple types`, async () => {
+        const types = ['config', 'index-pattern'];
+        await findSuccess({ type: types });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+        expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledWith(
+          mappings,
+          registry,
+          expect.objectContaining({
+            type: types,
+          })
+        );
+      });
 
-      const [
-        ,
-        {
-          body: [{ update: firstUpdate }, , { update: secondUpdate }],
-        },
-      ] = callAdminCluster.mock.calls[0];
+      it(`filters out invalid types`, async () => {
+        const types = ['config', 'unknownType', 'index-pattern'];
+        await findSuccess({ type: types });
 
-      expect(firstUpdate).toMatchObject({
-        if_seq_no: 100,
-        if_primary_term: 200,
+        expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledWith(
+          mappings,
+          registry,
+          expect.objectContaining({
+            type: ['config', 'index-pattern'],
+          })
+        );
       });
 
-      expect(secondUpdate).toMatchObject({
-        if_seq_no: 300,
-        if_primary_term: 400,
+      it(`filters out hidden types`, async () => {
+        const types = ['config', HIDDEN_TYPE, 'index-pattern'];
+        await findSuccess({ type: types });
+
+        expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledWith(
+          mappings,
+          registry,
+          expect.objectContaining({
+            type: ['config', 'index-pattern'],
+          })
+        );
       });
     });
+  });
 
-    it('does not pass references if omitted', async () => {
-      const objects = [
-        {
-          type: 'index-pattern',
-          id: `logstash-no-ref`,
-          attributes: { title: `Testing no-ref` },
-        },
-      ];
+  describe('#get', () => {
+    const type = 'index-pattern';
+    const id = 'logstash-*';
+    const namespace = 'foo-namespace';
+
+    const getSuccess = async (type, id, options) => {
+      const response = getMockGetResponse({ type, id, namespace: options?.namespace });
+      callAdminCluster.mockResolvedValue(response);
+      const result = await savedObjectsRepository.get(type, id, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      return result;
+    };
 
-      mockValidResponse(objects);
+    describe('cluster calls', () => {
+      it(`should use the ES get action`, async () => {
+        await getSuccess(type, id);
+        expectClusterCalls('get');
+      });
 
-      await savedObjectsRepository.bulkUpdate(objects);
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        await getSuccess(type, id, { namespace });
+        expectClusterCallArgs({ id: `${namespace}:${type}:${id}` });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        await getSuccess(type, id);
+        expectClusterCallArgs({ id: `${type}:${id}` });
+      });
 
-      const [
-        ,
-        {
-          body: [, { doc: firstDoc }],
-        },
-      ] = callAdminCluster.mock.calls[0];
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        await getSuccess(NAMESPACE_AGNOSTIC_TYPE, id, { namespace });
+        expectClusterCallArgs({ id: `${NAMESPACE_AGNOSTIC_TYPE}:${id}` });
 
-      expect(firstDoc).not.toMatchObject({
-        references: [],
+        callAdminCluster.mockReset();
+        await getSuccess(MULTI_NAMESPACE_TYPE, id, { namespace });
+        expectClusterCallArgs({ id: `${MULTI_NAMESPACE_TYPE}:${id}` });
       });
     });
 
-    it('passes references if they are provided', async () => {
-      const objects = [
-        generateSavedObject({
-          references: [
-            {
-              name: 'ref_0',
-              type: 'test',
-              id: '1',
-            },
-          ],
-        }),
-      ];
+    describe('errors', () => {
+      const expectNotFoundError = async (type, id, options) => {
+        await expect(savedObjectsRepository.get(type, id, options)).rejects.toThrowError(
+          createGenericNotFoundError(type, id)
+        );
+      };
 
-      mockValidResponse(objects);
+      it(`throws when type is invalid`, async () => {
+        await expectNotFoundError('unknownType', id);
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
 
-      await savedObjectsRepository.bulkUpdate(objects);
+      it(`throws when type is hidden`, async () => {
+        await expectNotFoundError(HIDDEN_TYPE, id);
+        expect(callAdminCluster).not.toHaveBeenCalled();
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`throws when ES is unable to find the document during get`, async () => {
+        callAdminCluster.mockResolvedValue({ found: false });
+        await expectNotFoundError(type, id);
+        expectClusterCalls('get');
+      });
 
-      const [
-        ,
-        {
-          body: [, { doc }],
-        },
-      ] = callAdminCluster.mock.calls[0];
+      it(`throws when ES is unable to find the index during get`, async () => {
+        callAdminCluster.mockResolvedValue({ status: 404 });
+        await expectNotFoundError(type, id);
+        expectClusterCalls('get');
+      });
 
-      expect(doc).toMatchObject({
-        references: [
-          {
-            name: 'ref_0',
-            type: 'test',
-            id: '1',
-          },
-        ],
+      it(`throws when type is multi-namespace and the document exists, but not in this namespace`, async () => {
+        const response = getMockGetResponse({ type: MULTI_NAMESPACE_TYPE, id, namespace });
+        callAdminCluster.mockResolvedValue(response);
+        await expectNotFoundError(MULTI_NAMESPACE_TYPE, id, { namespace: 'bar-namespace' });
+        expectClusterCalls('get');
       });
     });
 
-    it('passes empty references array if empty references array is provided', async () => {
-      const objects = [
-        {
-          type: 'index-pattern',
-          id: `logstash-no-ref`,
-          attributes: { title: `Testing no-ref` },
-          references: [],
-        },
-      ];
-
-      mockValidResponse(objects);
-
-      await savedObjectsRepository.bulkUpdate(objects);
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        migrator.runMigrations = jest.fn(async () =>
+          expect(callAdminCluster).not.toHaveBeenCalled()
+        );
+        await expect(getSuccess(type, id)).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
+      });
+    });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+    describe('returns', () => {
+      it(`formats the ES response`, async () => {
+        const result = await getSuccess(type, id);
+        expect(result).toEqual({
+          id,
+          type,
+          updated_at: mockTimestamp,
+          version: mockVersion,
+          attributes: {
+            title: 'Testing',
+          },
+          references: [],
+        });
+      });
 
-      const [
-        ,
-        {
-          body: [, { doc }],
-        },
-      ] = callAdminCluster.mock.calls[0];
+      it(`includes namespaces if type is multi-namespace`, async () => {
+        const result = await getSuccess(MULTI_NAMESPACE_TYPE, id);
+        expect(result).toMatchObject({
+          namespaces: expect.any(Array),
+        });
+      });
 
-      expect(doc).toMatchObject({
-        references: [],
+      it(`doesn't include namespaces if type is not multi-namespace`, async () => {
+        const result = await getSuccess(type, id);
+        expect(result).not.toMatchObject({
+          namespaces: expect.anything(),
+        });
       });
     });
+  });
 
-    it('defaults to a refresh setting of `wait_for`', async () => {
-      const objects = [
-        {
-          type: 'index-pattern',
-          id: `logstash-no-ref`,
-          attributes: { title: `Testing no-ref` },
-          references: [],
+  describe('#incrementCounter', () => {
+    const type = 'config';
+    const id = 'one';
+    const field = 'buildNum';
+    const namespace = 'foo-namespace';
+
+    const incrementCounterSuccess = async (type, id, field, options) => {
+      const isMultiNamespace = registry.isMultiNamespace(type);
+      if (isMultiNamespace) {
+        const response = getMockGetResponse({ type, id, namespace: options?.namespace });
+        callAdminCluster.mockResolvedValueOnce(response); // this._callCluster('get', ...)
+      }
+      callAdminCluster.mockImplementation((method, params) => ({
+        _id: params.id,
+        ...mockVersionProps,
+        _index: '.kibana',
+        get: {
+          found: true,
+          _source: {
+            type,
+            ...mockTimestampFields,
+            [type]: {
+              [field]: 8468,
+              defaultIndex: 'logstash-*',
+            },
+          },
         },
-      ];
-
-      mockValidResponse(objects);
+      }));
+      const result = await savedObjectsRepository.incrementCounter(type, id, field, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(isMultiNamespace ? 2 : 1);
+      return result;
+    };
 
-      await savedObjectsRepository.bulkUpdate(objects);
+    describe('cluster calls', () => {
+      it(`should use the ES update action if type is not multi-namespace`, async () => {
+        await incrementCounterSuccess(type, id, field, { namespace });
+        expectClusterCalls('update');
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`should use the ES get action then update action if type is multi-namespace, ID is defined, and overwrite=true`, async () => {
+        await incrementCounterSuccess(MULTI_NAMESPACE_TYPE, id, field, { namespace });
+        expectClusterCalls('get', 'update');
+      });
 
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({ refresh: 'wait_for' });
-    });
+      it(`defaults to a refresh setting of wait_for`, async () => {
+        await incrementCounterSuccess(type, id, field, { namespace });
+        expectClusterCallArgs({ refresh: 'wait_for' });
+      });
 
-    it('accepts a custom refresh setting', async () => {
-      const objects = [
-        {
-          type: 'index-pattern',
-          id: `logstash-no-ref`,
-          attributes: { title: `Testing no-ref` },
-          references: [],
-        },
-      ];
+      it(`accepts a custom refresh setting`, async () => {
+        const refresh = 'foo';
+        await incrementCounterSuccess(type, id, field, { namespace, refresh });
+        expectClusterCallArgs({ refresh });
+      });
 
-      mockValidResponse(objects);
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        await incrementCounterSuccess(type, id, field, { namespace });
+        expectClusterCallArgs({ id: `${namespace}:${type}:${id}` });
+      });
 
-      await savedObjectsRepository.bulkUpdate(objects, { refresh: true });
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        await incrementCounterSuccess(type, id, field);
+        expectClusterCallArgs({ id: `${type}:${id}` });
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        await incrementCounterSuccess(NAMESPACE_AGNOSTIC_TYPE, id, field, { namespace });
+        expectClusterCallArgs({ id: `${NAMESPACE_AGNOSTIC_TYPE}:${id}` });
 
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({ refresh: true });
+        callAdminCluster.mockReset();
+        await incrementCounterSuccess(MULTI_NAMESPACE_TYPE, id, field, { namespace });
+        expectClusterCallArgs({ id: `${MULTI_NAMESPACE_TYPE}:${id}` });
+      });
     });
 
-    it(`prepends namespace to the id but doesn't add namespace to body when providing namespace for namespaced type`, async () => {
-      const objects = [generateSavedObject(), generateSavedObject()];
+    describe('errors', () => {
+      const expectUnsupportedTypeError = async (type, id, field) => {
+        await expect(savedObjectsRepository.incrementCounter(type, id, field)).rejects.toThrowError(
+          createUnsupportedTypeError(type)
+        );
+      };
 
-      mockValidResponse(objects);
+      it(`throws when type is not a string`, async () => {
+        const test = async type => {
+          await expect(
+            savedObjectsRepository.incrementCounter(type, id, field)
+          ).rejects.toThrowError(`"type" argument must be a string`);
+          expect(callAdminCluster).not.toHaveBeenCalled();
+        };
 
-      await savedObjectsRepository.bulkUpdate(objects, {
-        namespace: 'foo-namespace',
+        await test(null);
+        await test(42);
+        await test(false);
+        await test({});
       });
 
-      const [
-        ,
-        {
-          body: [
-            { update: firstUpdate },
-            { doc: firstUpdateDoc },
-            { update: secondUpdate },
-            { doc: secondUpdateDoc },
-          ],
-        },
-      ] = callAdminCluster.mock.calls[0];
+      it(`throws when counterFieldName is not a string`, async () => {
+        const test = async field => {
+          await expect(
+            savedObjectsRepository.incrementCounter(type, id, field)
+          ).rejects.toThrowError(`"counterFieldName" argument must be a string`);
+          expect(callAdminCluster).not.toHaveBeenCalled();
+        };
 
-      expect(firstUpdate).toMatchObject({
-        _id: 'foo-namespace:index-pattern:logstash-1',
-        _index: '.kibana-test',
+        await test(null);
+        await test(42);
+        await test(false);
+        await test({});
       });
 
-      expect(firstUpdateDoc).toMatchObject({
-        updated_at: mockTimestamp,
-        'index-pattern': { title: 'Testing 1' },
-        references: [
-          {
-            name: 'ref_0',
-            type: 'test',
-            id: '1',
-          },
-        ],
+      it(`throws when type is invalid`, async () => {
+        await expectUnsupportedTypeError('unknownType', id, field);
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
 
-      expect(secondUpdate).toMatchObject({
-        _id: 'foo-namespace:index-pattern:logstash-2',
-        _index: '.kibana-test',
+      it(`throws when type is hidden`, async () => {
+        await expectUnsupportedTypeError(HIDDEN_TYPE, id, field);
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
 
-      expect(secondUpdateDoc).toMatchObject({
-        updated_at: mockTimestamp,
-        'index-pattern': { title: 'Testing 2' },
-        references: [
-          {
-            name: 'ref_0',
-            type: 'test',
-            id: '1',
-          },
-        ],
+      it(`throws when there is a conflict with an existing multi-namespace saved object (get)`, async () => {
+        const response = getMockGetResponse({
+          type: MULTI_NAMESPACE_TYPE,
+          id,
+          namespace: 'bar-namespace',
+        });
+        callAdminCluster.mockResolvedValue(response); // this._callCluster('get', ...)
+        await expect(
+          savedObjectsRepository.incrementCounter(MULTI_NAMESPACE_TYPE, id, field, { namespace })
+        ).rejects.toThrowError(createConflictError(MULTI_NAMESPACE_TYPE, id));
+        expectClusterCalls('get');
       });
     });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing no namespace for namespaced type`, async () => {
-      const objects = [generateSavedObject(), generateSavedObject()];
-
-      mockValidResponse(objects);
+    describe('migration', () => {
+      beforeEach(() => {
+        migrator.migrateDocument.mockImplementation(mockMigrateDocument);
+      });
 
-      await savedObjectsRepository.bulkUpdate(objects);
+      it(`waits until migrations are complete before proceeding`, async () => {
+        migrator.runMigrations = jest.fn(async () =>
+          expect(callAdminCluster).not.toHaveBeenCalled()
+        );
+        await expect(
+          incrementCounterSuccess(type, id, field, { namespace })
+        ).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveBeenCalledTimes(1);
+      });
 
-      const [
-        ,
-        {
-          body: [
-            { update: firstUpdate },
-            { doc: firstUpdateDoc },
-            { update: secondUpdate },
-            { doc: secondUpdateDoc },
-          ],
-        },
-      ] = callAdminCluster.mock.calls[0];
+      it(`migrates a document and serializes the migrated doc`, async () => {
+        const migrationVersion = mockMigrationVersion;
+        await incrementCounterSuccess(type, id, field, { migrationVersion });
+        const attributes = { buildNum: 1 }; // this is added by the incrementCounter function
+        const doc = { type, id, attributes, migrationVersion, ...mockTimestampFields };
+        expectMigrationArgs(doc);
 
-      expect(firstUpdate).toMatchObject({
-        _id: 'index-pattern:logstash-1',
-        _index: '.kibana-test',
+        const migratedDoc = migrator.migrateDocument(doc);
+        expect(serializer.savedObjectToRaw).toHaveBeenLastCalledWith(migratedDoc);
       });
+    });
 
-      expect(firstUpdateDoc).toMatchObject({
-        updated_at: mockTimestamp,
-        'index-pattern': { title: 'Testing 1' },
-        references: [
-          {
-            name: 'ref_0',
-            type: 'test',
-            id: '1',
+    describe('returns', () => {
+      it(`formats the ES response`, async () => {
+        callAdminCluster.mockImplementation((method, params) => ({
+          _id: params.id,
+          ...mockVersionProps,
+          _index: '.kibana',
+          get: {
+            found: true,
+            _source: {
+              type: 'config',
+              ...mockTimestampFields,
+              config: {
+                buildNum: 8468,
+                defaultIndex: 'logstash-*',
+              },
+            },
           },
-        ],
-      });
-
-      expect(secondUpdate).toMatchObject({
-        _id: 'index-pattern:logstash-2',
-        _index: '.kibana-test',
-      });
+        }));
 
-      expect(secondUpdateDoc).toMatchObject({
-        updated_at: mockTimestamp,
-        'index-pattern': { title: 'Testing 2' },
-        references: [
+        const response = await savedObjectsRepository.incrementCounter(
+          'config',
+          '6.0.0-alpha1',
+          'buildNum',
           {
-            name: 'ref_0',
-            type: 'test',
-            id: '1',
+            namespace: 'foo-namespace',
+          }
+        );
+
+        expect(response).toEqual({
+          type: 'config',
+          id: '6.0.0-alpha1',
+          ...mockTimestampFields,
+          version: mockVersion,
+          attributes: {
+            buildNum: 8468,
+            defaultIndex: 'logstash-*',
           },
-        ],
+        });
       });
     });
+  });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing namespace for namespace agnostic type`, async () => {
-      const objects = [
-        generateSavedObject({
-          type: 'globaltype',
-          id: 'foo',
-          namespace: 'foo-namespace',
-        }),
-      ];
+  describe('#deleteFromNamespaces', () => {
+    const id = 'some-id';
+    const type = MULTI_NAMESPACE_TYPE;
+    const namespace1 = 'default';
+    const namespace2 = 'foo-namespace';
+    const namespace3 = 'bar-namespace';
+
+    const mockGetResponse = (type, id, namespaces) => {
+      // mock a document that exists in two namespaces
+      const mockResponse = getMockGetResponse({ type, id });
+      mockResponse._source.namespaces = namespaces;
+      callAdminCluster.mockResolvedValueOnce(mockResponse); // this._callCluster('get', ...)
+    };
+
+    const deleteFromNamespacesSuccess = async (
+      type,
+      id,
+      namespaces,
+      currentNamespaces,
+      options
+    ) => {
+      mockGetResponse(type, id, currentNamespaces); // this._callCluster('get', ...)
+      const isDelete = currentNamespaces.every(namespace => namespaces.includes(namespace));
+      callAdminCluster.mockResolvedValue({
+        _id: `${type}:${id}`,
+        ...mockVersionProps,
+        result: isDelete ? 'deleted' : 'updated',
+      }); // this._writeToCluster('delete', ...) *or* this._writeToCluster('update', ...)
+      const result = await savedObjectsRepository.deleteFromNamespaces(
+        type,
+        id,
+        namespaces,
+        options
+      );
+      expect(callAdminCluster).toHaveBeenCalledTimes(2);
+      return result;
+    };
 
-      mockValidResponse(objects);
+    describe('cluster calls', () => {
+      describe('delete action', () => {
+        const deleteFromNamespacesSuccessDelete = async (expectFn, options, _type = type) => {
+          const test = async namespaces => {
+            await deleteFromNamespacesSuccess(_type, id, namespaces, namespaces, options);
+            expectFn();
+            callAdminCluster.mockReset();
+          };
+          await test([namespace1]);
+          await test([namespace1, namespace2]);
+        };
+
+        it(`should use ES get action then delete action if the object has no namespaces remaining`, async () => {
+          const expectFn = () => expectClusterCalls('get', 'delete');
+          await deleteFromNamespacesSuccessDelete(expectFn);
+        });
 
-      await savedObjectsRepository.bulkUpdate(objects);
+        it(`formats the ES requests`, async () => {
+          const expectFn = () => {
+            expectClusterCallArgs({ id: `${type}:${id}` }, 1);
+            const versionProperties = {
+              if_seq_no: mockVersionProps._seq_no,
+              if_primary_term: mockVersionProps._primary_term,
+            };
+            expectClusterCallArgs({ id: `${type}:${id}`, ...versionProperties }, 2);
+          };
+          await deleteFromNamespacesSuccessDelete(expectFn);
+        });
 
-      const [
-        ,
-        {
-          body: [{ update }, { doc }],
-        },
-      ] = callAdminCluster.mock.calls[0];
+        it(`defaults to a refresh setting of wait_for`, async () => {
+          await deleteFromNamespacesSuccessDelete(() =>
+            expectClusterCallArgs({ refresh: 'wait_for' }, 2)
+          );
+        });
 
-      expect(update).toMatchObject({
-        _id: 'globaltype:foo',
-        _index: '.kibana-test',
-      });
+        it(`accepts a custom refresh setting`, async () => {
+          const refresh = 'foo';
+          const expectFn = () => expectClusterCallArgs({ refresh }, 2);
+          await deleteFromNamespacesSuccessDelete(expectFn, { refresh });
+        });
 
-      expect(doc).toMatchObject({
-        updated_at: mockTimestamp,
-        globaltype: { title: 'Testing 1' },
-        references: [
-          {
-            name: 'ref_0',
-            type: 'test',
-            id: '1',
-          },
-        ],
+        it(`should use default index`, async () => {
+          const expectFn = () => expectClusterCallArgs({ index: '.kibana-test' }, 2);
+          await deleteFromNamespacesSuccessDelete(expectFn);
+        });
+
+        it(`should use custom index`, async () => {
+          const expectFn = () => expectClusterCallArgs({ index: 'custom' }, 2);
+          await deleteFromNamespacesSuccessDelete(expectFn, {}, MULTI_NAMESPACE_CUSTOM_INDEX_TYPE);
+        });
       });
-    });
-  });
 
-  describe('#incrementCounter', () => {
-    beforeEach(() => {
-      callAdminCluster.mockImplementation((method, params) => ({
-        _id: params.id,
-        ...mockVersionProps,
-        _index: '.kibana',
-        get: {
-          found: true,
-          _source: {
-            type: 'config',
-            ...mockTimestampFields,
-            config: {
-              buildNum: 8468,
-              defaultIndex: 'logstash-*',
-            },
-          },
-        },
-      }));
-    });
+      describe('update action', () => {
+        const deleteFromNamespacesSuccessUpdate = async (expectFn, options, _type = type) => {
+          const test = async remaining => {
+            const currentNamespaces = [namespace1].concat(remaining);
+            await deleteFromNamespacesSuccess(_type, id, [namespace1], currentNamespaces, options);
+            expectFn();
+            callAdminCluster.mockReset();
+          };
+          await test([namespace2]);
+          await test([namespace2, namespace3]);
+        };
+
+        it(`should use ES get action then update action if the object has one or more namespaces remaining`, async () => {
+          await deleteFromNamespacesSuccessUpdate(() => expectClusterCalls('get', 'update'));
+        });
 
-    it('formats Elasticsearch response', async () => {
-      callAdminCluster.mockImplementation((method, params) => ({
-        _id: params.id,
-        ...mockVersionProps,
-        _index: '.kibana',
-        get: {
-          found: true,
-          _source: {
-            type: 'config',
-            ...mockTimestampFields,
-            config: {
-              buildNum: 8468,
-              defaultIndex: 'logstash-*',
-            },
-          },
-        },
-      }));
+        it(`formats the ES requests`, async () => {
+          let ctr = 0;
+          const expectFn = () => {
+            expectClusterCallArgs({ id: `${type}:${id}` }, 1);
+            const namespaces = ctr++ === 0 ? [namespace2] : [namespace2, namespace3];
+            const versionProperties = {
+              if_seq_no: mockVersionProps._seq_no,
+              if_primary_term: mockVersionProps._primary_term,
+            };
+            expectClusterCallArgs(
+              {
+                id: `${type}:${id}`,
+                ...versionProperties,
+                body: { doc: { ...mockTimestampFields, namespaces } },
+              },
+              2
+            );
+          };
+          await deleteFromNamespacesSuccessUpdate(expectFn);
+        });
 
-      const response = await savedObjectsRepository.incrementCounter(
-        'config',
-        '6.0.0-alpha1',
-        'buildNum',
-        {
-          namespace: 'foo-namespace',
-        }
-      );
+        it(`defaults to a refresh setting of wait_for`, async () => {
+          const expectFn = () => expectClusterCallArgs({ refresh: 'wait_for' }, 2);
+          await deleteFromNamespacesSuccessUpdate(expectFn);
+        });
 
-      expect(response).toEqual({
-        type: 'config',
-        id: '6.0.0-alpha1',
-        ...mockTimestampFields,
-        version: mockVersion,
-        attributes: {
-          buildNum: 8468,
-          defaultIndex: 'logstash-*',
-        },
+        it(`accepts a custom refresh setting`, async () => {
+          const refresh = 'foo';
+          const expectFn = () => expectClusterCallArgs({ refresh }, 2);
+          await deleteFromNamespacesSuccessUpdate(expectFn, { refresh });
+        });
+
+        it(`should use default index`, async () => {
+          const expectFn = () => expectClusterCallArgs({ index: '.kibana-test' }, 2);
+          await deleteFromNamespacesSuccessUpdate(expectFn);
+        });
+
+        it(`should use custom index`, async () => {
+          const expectFn = () => expectClusterCallArgs({ index: 'custom' }, 2);
+          await deleteFromNamespacesSuccessUpdate(expectFn, {}, MULTI_NAMESPACE_CUSTOM_INDEX_TYPE);
+        });
       });
     });
 
-    it('migrates the doc if an upsert is required', async () => {
-      migrator.migrateDocument = doc => {
-        doc.attributes.buildNum = 42;
-        doc.migrationVersion = { foo: '2.3.4' };
-        doc.references = [{ name: 'search_0', type: 'search', id: '123' }];
-        return doc;
+    describe('errors', () => {
+      const expectNotFoundError = async (type, id, namespaces, options) => {
+        await expect(
+          savedObjectsRepository.deleteFromNamespaces(type, id, namespaces, options)
+        ).rejects.toThrowError(createGenericNotFoundError(type, id));
+      };
+      const expectBadRequestError = async (type, id, namespaces, message) => {
+        await expect(
+          savedObjectsRepository.deleteFromNamespaces(type, id, namespaces)
+        ).rejects.toThrowError(createBadRequestError(message));
       };
 
-      await savedObjectsRepository.incrementCounter('config', 'doesnotexist', 'buildNum', {
-        namespace: 'foo-namespace',
+      it(`throws when type is invalid`, async () => {
+        await expectNotFoundError('unknownType', id, [namespace1, namespace2]);
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        body: {
-          upsert: {
-            config: { buildNum: 42 },
-            migrationVersion: { foo: '2.3.4' },
-            type: 'config',
-            ...mockTimestampFields,
-            references: [{ name: 'search_0', type: 'search', id: '123' }],
-          },
-        },
+      it(`throws when type is hidden`, async () => {
+        await expectNotFoundError(HIDDEN_TYPE, id, [namespace1, namespace2]);
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
-    });
 
-    it('defaults to a refresh setting of `wait_for`', async () => {
-      await savedObjectsRepository.incrementCounter('config', 'doesnotexist', 'buildNum', {
-        namespace: 'foo-namespace',
+      it(`throws when type is not namespace-agnostic`, async () => {
+        const test = async type => {
+          const message = `${type} doesn't support multiple namespaces`;
+          await expectBadRequestError(type, id, [namespace1, namespace2], message);
+          expect(callAdminCluster).not.toHaveBeenCalled();
+        };
+        await test('index-pattern');
+        await test(NAMESPACE_AGNOSTIC_TYPE);
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: 'wait_for',
+      it(`throws when namespaces is an empty array`, async () => {
+        const test = async namespaces => {
+          const message = 'namespaces must be a non-empty array of strings';
+          await expectBadRequestError(type, id, namespaces, message);
+          expect(callAdminCluster).not.toHaveBeenCalled();
+        };
+        await test([]);
       });
-    });
 
-    it('accepts a custom refresh setting', async () => {
-      await savedObjectsRepository.incrementCounter('config', 'doesnotexist', 'buildNum', {
-        namespace: 'foo-namespace',
-        refresh: true,
+      it(`throws when ES is unable to find the document during get`, async () => {
+        callAdminCluster.mockResolvedValue({ found: false }); // this._callCluster('get', ...)
+        await expectNotFoundError(type, id, [namespace1, namespace2]);
+        expectClusterCalls('get');
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
-      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
-        refresh: true,
+      it(`throws when ES is unable to find the index during get`, async () => {
+        callAdminCluster.mockResolvedValue({ status: 404 }); // this._callCluster('get', ...)
+        await expectNotFoundError(type, id, [namespace1, namespace2]);
+        expectClusterCalls('get');
       });
-    });
 
-    it(`prepends namespace to the id but doesn't add namespace to body when providing namespace for namespaced type`, async () => {
-      await savedObjectsRepository.incrementCounter('config', '6.0.0-alpha1', 'buildNum', {
-        namespace: 'foo-namespace',
+      it(`throws when the document exists, but not in this namespace`, async () => {
+        mockGetResponse(type, id, [namespace1]); // this._callCluster('get', ...)
+        await expectNotFoundError(type, id, [namespace1], { namespace: 'some-other-namespace' });
+        expectClusterCalls('get');
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`throws when ES is unable to find the document during delete`, async () => {
+        mockGetResponse(type, id, [namespace1]); // this._callCluster('get', ...)
+        callAdminCluster.mockResolvedValue({ result: 'not_found' }); // this._writeToCluster('delete', ...)
+        await expectNotFoundError(type, id, [namespace1]);
+        expectClusterCalls('get', 'delete');
+      });
+
+      it(`throws when ES is unable to find the index during delete`, async () => {
+        mockGetResponse(type, id, [namespace1]); // this._callCluster('get', ...)
+        callAdminCluster.mockResolvedValue({ error: { type: 'index_not_found_exception' } }); // this._writeToCluster('delete', ...)
+        await expectNotFoundError(type, id, [namespace1]);
+        expectClusterCalls('get', 'delete');
+      });
+
+      it(`throws when ES returns an unexpected response`, async () => {
+        mockGetResponse(type, id, [namespace1]); // this._callCluster('get', ...)
+        callAdminCluster.mockResolvedValue({ result: 'something unexpected' }); // this._writeToCluster('delete', ...)
+        await expect(
+          savedObjectsRepository.deleteFromNamespaces(type, id, [namespace1])
+        ).rejects.toThrowError('Unexpected Elasticsearch DELETE response');
+        expectClusterCalls('get', 'delete');
+      });
+
+      it(`throws when ES is unable to find the document during update`, async () => {
+        mockGetResponse(type, id, [namespace1, namespace2]); // this._callCluster('get', ...)
+        callAdminCluster.mockResolvedValue({ status: 404 }); // this._writeToCluster('update', ...)
+        await expectNotFoundError(type, id, [namespace1]);
+        expectClusterCalls('get', 'update');
+      });
+    });
 
-      const requestDoc = callAdminCluster.mock.calls[0][1];
-      expect(requestDoc.id).toBe('foo-namespace:config:6.0.0-alpha1');
-      expect(requestDoc.body.script.params.type).toBe('config');
-      expect(requestDoc.body.upsert.type).toBe('config');
-      expect(requestDoc).toHaveProperty('body.upsert.config');
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        let callAdminClusterCount = 0;
+        migrator.runMigrations = jest.fn(async () =>
+          // runMigrations should resolve before callAdminCluster is initiated
+          expect(callAdminCluster).toHaveBeenCalledTimes(callAdminClusterCount++)
+        );
+        await expect(
+          deleteFromNamespacesSuccess(type, id, [namespace1], [namespace1])
+        ).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveReturnedTimes(2);
+      });
     });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing no namespace for namespaced type`, async () => {
-      await savedObjectsRepository.incrementCounter('config', '6.0.0-alpha1', 'buildNum');
+    describe('returns', () => {
+      it(`returns an empty object on success (delete)`, async () => {
+        const test = async namespaces => {
+          const result = await deleteFromNamespacesSuccess(type, id, namespaces, namespaces);
+          expect(result).toEqual({});
+          callAdminCluster.mockReset();
+        };
+        await test([namespace1]);
+        await test([namespace1, namespace2]);
+      });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`returns an empty object on success (update)`, async () => {
+        const test = async remaining => {
+          const currentNamespaces = [namespace1].concat(remaining);
+          const result = await deleteFromNamespacesSuccess(
+            type,
+            id,
+            [namespace1],
+            currentNamespaces
+          );
+          expect(result).toEqual({});
+          callAdminCluster.mockReset();
+        };
+        await test([namespace2]);
+        await test([namespace2, namespace3]);
+      });
 
-      const requestDoc = callAdminCluster.mock.calls[0][1];
-      expect(requestDoc.id).toBe('config:6.0.0-alpha1');
-      expect(requestDoc.body.script.params.type).toBe('config');
-      expect(requestDoc.body.upsert.type).toBe('config');
-      expect(requestDoc).toHaveProperty('body.upsert.config');
+      it(`succeeds when the document doesn't exist in all of the targeted namespaces`, async () => {
+        const namespaces = [namespace2];
+        const currentNamespaces = [namespace1];
+        const result = await deleteFromNamespacesSuccess(type, id, namespaces, currentNamespaces);
+        expect(result).toEqual({});
+      });
     });
+  });
 
-    it(`doesn't prepend namespace to the id or add namespace property when providing namespace for namespace agnostic type`, async () => {
-      callAdminCluster.mockImplementation((method, params) => ({
-        _id: params.id,
+  describe('#update', () => {
+    const id = 'logstash-*';
+    const type = 'index-pattern';
+    const attributes = { title: 'Testing' };
+    const namespace = 'foo-namespace';
+    const references = [
+      {
+        name: 'ref_0',
+        type: 'test',
+        id: '1',
+      },
+    ];
+
+    const updateSuccess = async (type, id, attributes, options) => {
+      if (registry.isMultiNamespace(type)) {
+        const mockGetResponse = getMockGetResponse({ type, id, namespace: options?.namespace });
+        callAdminCluster.mockResolvedValueOnce(mockGetResponse); // this._callCluster('get', ...)
+      }
+      callAdminCluster.mockResolvedValue({
+        _id: `${type}:${id}`,
         ...mockVersionProps,
-        _index: '.kibana',
-        get: {
-          found: true,
-          _source: {
-            type: 'globaltype',
-            ...mockTimestampFields,
-            globaltype: {
-              counter: 1,
-            },
-          },
-        },
-      }));
+        result: 'updated',
+        ...(registry.isMultiNamespace(type) && {
+          // don't need the rest of the source for test purposes, just the namespaces attribute
+          get: { _source: { namespaces: [options?.namespace ?? 'default'] } },
+        }),
+      }); // this._writeToCluster('update', ...)
+      const result = await savedObjectsRepository.update(type, id, attributes, options);
+      expect(callAdminCluster).toHaveBeenCalledTimes(registry.isMultiNamespace(type) ? 2 : 1);
+      return result;
+    };
 
-      await savedObjectsRepository.incrementCounter('globaltype', 'foo', 'counter', {
-        namespace: 'foo-namespace',
+    describe('cluster calls', () => {
+      it(`should use the ES get action then update action when type is multi-namespace`, async () => {
+        await updateSuccess(MULTI_NAMESPACE_TYPE, id, attributes);
+        expectClusterCalls('get', 'update');
       });
 
-      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      it(`should use the ES update action when type is not multi-namespace`, async () => {
+        await updateSuccess(type, id, attributes);
+        expectClusterCalls('update');
+      });
 
-      const requestDoc = callAdminCluster.mock.calls[0][1];
-      expect(requestDoc.id).toBe('globaltype:foo');
-      expect(requestDoc.body.script.params.type).toBe('globaltype');
-      expect(requestDoc.body.upsert.type).toBe('globaltype');
-      expect(requestDoc).toHaveProperty('body.upsert.globaltype');
-    });
+      it(`defaults to no references array`, async () => {
+        await updateSuccess(type, id, attributes);
+        expectClusterCallArgs({
+          body: { doc: expect.not.objectContaining({ references: expect.anything() }) },
+        });
+      });
 
-    it('should assert that the "type" and "counterFieldName" arguments are strings', () => {
-      expect.assertions(6);
-
-      expect(
-        savedObjectsRepository.incrementCounter(null, '6.0.0-alpha1', 'buildNum', {
-          namespace: 'foo-namespace',
-        })
-      ).rejects.toEqual(new Error('"type" argument must be a string'));
-
-      expect(
-        savedObjectsRepository.incrementCounter(42, '6.0.0-alpha1', 'buildNum', {
-          namespace: 'foo-namespace',
-        })
-      ).rejects.toEqual(new Error('"type" argument must be a string'));
-
-      expect(
-        savedObjectsRepository.incrementCounter({}, '6.0.0-alpha1', 'buildNum', {
-          namespace: 'foo-namespace',
-        })
-      ).rejects.toEqual(new Error('"type" argument must be a string'));
-
-      expect(
-        savedObjectsRepository.incrementCounter('config', '6.0.0-alpha1', null, {
-          namespace: 'foo-namespace',
-        })
-      ).rejects.toEqual(new Error('"counterFieldName" argument must be a string'));
-
-      expect(
-        savedObjectsRepository.incrementCounter('config', '6.0.0-alpha1', 42, {
-          namespace: 'foo-namespace',
-        })
-      ).rejects.toEqual(new Error('"counterFieldName" argument must be a string'));
-
-      expect(
-        savedObjectsRepository.incrementCounter(
-          'config',
-          '6.0.0-alpha1',
-          {},
-          {
-            namespace: 'foo-namespace',
-          }
-        )
-      ).rejects.toEqual(new Error('"counterFieldName" argument must be a string'));
-    });
-  });
+      it(`accepts custom references array`, async () => {
+        const test = async references => {
+          await updateSuccess(type, id, attributes, { references });
+          expectClusterCallArgs({
+            body: { doc: expect.objectContaining({ references }) },
+          });
+          callAdminCluster.mockReset();
+        };
+        await test(references);
+        await test(['string']);
+        await test([]);
+      });
+
+      it(`doesn't accept custom references if not an array`, async () => {
+        const test = async references => {
+          await updateSuccess(type, id, attributes, { references });
+          expectClusterCallArgs({
+            body: { doc: expect.not.objectContaining({ references: expect.anything() }) },
+          });
+          callAdminCluster.mockReset();
+        };
+        await test('string');
+        await test(123);
+        await test(true);
+        await test(null);
+      });
+
+      it(`defaults to a refresh setting of wait_for`, async () => {
+        await updateSuccess(type, id, { foo: 'bar' });
+        expectClusterCallArgs({ refresh: 'wait_for' });
+      });
+
+      it(`accepts a custom refresh setting`, async () => {
+        const refresh = 'foo';
+        await updateSuccess(type, id, { foo: 'bar' }, { refresh });
+        expectClusterCallArgs({ refresh });
+      });
+
+      it(`defaults to the version of the existing document when type is multi-namespace`, async () => {
+        await updateSuccess(MULTI_NAMESPACE_TYPE, id, attributes, { references });
+        const versionProperties = {
+          if_seq_no: mockVersionProps._seq_no,
+          if_primary_term: mockVersionProps._primary_term,
+        };
+        expectClusterCallArgs(versionProperties, 2);
+      });
+
+      it(`accepts version`, async () => {
+        await updateSuccess(type, id, attributes, {
+          version: encodeHitVersion({ _seq_no: 100, _primary_term: 200 }),
+        });
+        expectClusterCallArgs({ if_seq_no: 100, if_primary_term: 200 });
+      });
 
-  describe('types on custom index', () => {
-    it("should error when attempting to 'update' an unsupported type", async () => {
-      await expect(
-        savedObjectsRepository.update('hiddenType', 'bogus', { title: 'some title' })
-      ).rejects.toEqual(new Error('Saved object [hiddenType/bogus] not found'));
-    });
-  });
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        await updateSuccess(type, id, attributes, { namespace });
+        expectClusterCallArgs({ id: expect.stringMatching(`${namespace}:${type}:${id}`) });
+      });
 
-  describe('unsupported types', () => {
-    it("should error when attempting to 'update' an unsupported type", async () => {
-      await expect(
-        savedObjectsRepository.update('hiddenType', 'bogus', { title: 'some title' })
-      ).rejects.toEqual(new Error('Saved object [hiddenType/bogus] not found'));
-    });
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        await updateSuccess(type, id, attributes, { references });
+        expectClusterCallArgs({ id: expect.stringMatching(`${type}:${id}`) });
+      });
 
-    it("should error when attempting to 'get' an unsupported type", async () => {
-      await expect(savedObjectsRepository.get('hiddenType')).rejects.toEqual(
-        new Error('Not Found')
-      );
-    });
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        await updateSuccess(NAMESPACE_AGNOSTIC_TYPE, id, attributes, { namespace });
+        expectClusterCallArgs({ id: expect.stringMatching(`${NAMESPACE_AGNOSTIC_TYPE}:${id}`) });
 
-    it("should return an error object when attempting to 'create' an unsupported type", async () => {
-      await expect(
-        savedObjectsRepository.create('hiddenType', { title: 'some title' })
-      ).rejects.toEqual(new Error("Unsupported saved object type: 'hiddenType': Bad Request"));
-    });
+        callAdminCluster.mockReset();
+        await updateSuccess(MULTI_NAMESPACE_TYPE, id, attributes, { namespace });
+        expectClusterCallArgs({ id: expect.stringMatching(`${MULTI_NAMESPACE_TYPE}:${id}`) }, 2);
+      });
 
-    it("should not return hidden saved ojects when attempting to 'find' support and unsupported types", async () => {
-      callAdminCluster.mockReturnValue({
-        hits: {
-          total: 1,
-          hits: [
-            {
-              _id: 'one',
-              _source: {
-                updated_at: mockTimestamp,
-                type: 'config',
-              },
-              references: [],
-            },
-          ],
-        },
+      it(`includes _sourceIncludes when type is multi-namespace`, async () => {
+        await updateSuccess(MULTI_NAMESPACE_TYPE, id, attributes);
+        expectClusterCallArgs({ _sourceIncludes: ['namespaces'] }, 2);
       });
-      const results = await savedObjectsRepository.find({ type: ['hiddenType', 'config'] });
-      expect(results).toEqual({
-        total: 1,
-        saved_objects: [
-          {
-            id: 'one',
-            references: [],
-            type: 'config',
-            updated_at: mockTimestamp,
-          },
-        ],
-        page: 1,
-        per_page: 20,
+
+      it(`doesn't include _sourceIncludes when type is not multi-namespace`, async () => {
+        await updateSuccess(type, id, attributes);
+        expect(callAdminCluster).toHaveBeenLastCalledWith(
+          expect.any(String),
+          expect.not.objectContaining({
+            _sourceIncludes: expect.anything(),
+          })
+        );
       });
     });
 
-    it("should return empty results when attempting to 'find' an unsupported type", async () => {
-      callAdminCluster.mockReturnValue({
-        hits: {
-          total: 0,
-          hits: [],
-        },
+    describe('errors', () => {
+      const expectNotFoundError = async (type, id) => {
+        await expect(savedObjectsRepository.update(type, id)).rejects.toThrowError(
+          createGenericNotFoundError(type, id)
+        );
+      };
+
+      it(`throws when type is invalid`, async () => {
+        await expectNotFoundError('unknownType', id);
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
-      const results = await savedObjectsRepository.find({ type: 'hiddenType' });
-      expect(results).toEqual({
-        total: 0,
-        saved_objects: [],
-        page: 1,
-        per_page: 20,
+
+      it(`throws when type is hidden`, async () => {
+        await expectNotFoundError(HIDDEN_TYPE, id);
+        expect(callAdminCluster).not.toHaveBeenCalled();
       });
-    });
 
-    it("should return empty results when attempting to 'find' more than one unsupported types", async () => {
-      const findParams = { type: ['hiddenType', 'hiddenType2'] };
-      callAdminCluster.mockReturnValue({
-        status: 200,
-        hits: {
-          total: 0,
-          hits: [],
-        },
+      it(`throws when ES is unable to find the document during get`, async () => {
+        callAdminCluster.mockResolvedValue({ found: false }); // this._callCluster('get', ...)
+        await expectNotFoundError(MULTI_NAMESPACE_TYPE, id);
+        expectClusterCalls('get');
       });
-      const results = await savedObjectsRepository.find(findParams);
-      expect(results).toEqual({
-        total: 0,
-        saved_objects: [],
-        page: 1,
-        per_page: 20,
+
+      it(`throws when ES is unable to find the index during get`, async () => {
+        callAdminCluster.mockResolvedValue({ status: 404 }); // this._callCluster('get', ...)
+        await expectNotFoundError(MULTI_NAMESPACE_TYPE, id);
+        expectClusterCalls('get');
       });
-    });
 
-    it("should error when attempting to 'delete' hidden types", async () => {
-      await expect(savedObjectsRepository.delete('hiddenType')).rejects.toEqual(
-        new Error('Not Found')
-      );
+      it(`throws when type is multi-namespace and the document exists, but not in this namespace`, async () => {
+        const response = getMockGetResponse({ type: MULTI_NAMESPACE_TYPE, id, namespace });
+        callAdminCluster.mockResolvedValue(response); // this._callCluster('get', ...)
+        await expectNotFoundError(MULTI_NAMESPACE_TYPE, id, { namespace: 'bar-namespace' });
+        expectClusterCalls('get');
+      });
+
+      it(`throws when ES is unable to find the document during update`, async () => {
+        callAdminCluster.mockResolvedValue({ status: 404 }); // this._writeToCluster('update', ...)
+        await expectNotFoundError(type, id);
+        expectClusterCalls('update');
+      });
     });
 
-    it("should error when attempting to 'bulkCreate' an unsupported type", async () => {
-      callAdminCluster.mockReturnValue({
-        items: [
-          {
-            index: {
-              _id: 'one',
-              _seq_no: 1,
-              _primary_term: 1,
-              _type: 'config',
-              attributes: {
-                title: 'Test One',
-              },
-            },
-          },
-        ],
-      });
-      const results = await savedObjectsRepository.bulkCreate([
-        { type: 'config', id: 'one', attributes: { title: 'Test One' } },
-        { type: 'hiddenType', id: 'two', attributes: { title: 'Test Two' } },
-      ]);
-      expect(results).toEqual({
-        saved_objects: [
-          {
-            type: 'config',
-            id: 'one',
-            attributes: { title: 'Test One' },
-            references: [],
-            version: 'WzEsMV0=',
-            updated_at: mockTimestamp,
-          },
-          {
-            error: {
-              error: 'Bad Request',
-              message: "Unsupported saved object type: 'hiddenType': Bad Request",
-              statusCode: 400,
-            },
-            id: 'two',
-            type: 'hiddenType',
-          },
-        ],
+    describe('migration', () => {
+      it(`waits until migrations are complete before proceeding`, async () => {
+        let callAdminClusterCount = 0;
+        migrator.runMigrations = jest.fn(async () =>
+          // runMigrations should resolve before callAdminCluster is initiated
+          expect(callAdminCluster).toHaveBeenCalledTimes(callAdminClusterCount++)
+        );
+        await expect(updateSuccess(type, id, attributes)).resolves.toBeDefined();
+        expect(migrator.runMigrations).toHaveReturnedTimes(1);
       });
     });
 
-    it("should error when attempting to 'incrementCounter' for an unsupported type", async () => {
-      await expect(
-        savedObjectsRepository.incrementCounter('hiddenType', 'doesntmatter', 'fieldArg')
-      ).rejects.toEqual(new Error("Unsupported saved object type: 'hiddenType': Bad Request"));
+    describe('returns', () => {
+      it(`returns _seq_no and _primary_term encoded as version`, async () => {
+        const result = await updateSuccess(type, id, attributes, {
+          namespace,
+          references,
+        });
+        expect(result).toEqual({
+          id,
+          type,
+          ...mockTimestampFields,
+          version: mockVersion,
+          attributes,
+          references,
+        });
+      });
+
+      it(`includes namespaces if type is multi-namespace`, async () => {
+        const result = await updateSuccess(MULTI_NAMESPACE_TYPE, id, attributes);
+        expect(result).toMatchObject({
+          namespaces: expect.any(Array),
+        });
+      });
+
+      it(`doesn't include namespaces if type is not multi-namespace`, async () => {
+        const result = await updateSuccess(type, id, attributes);
+        expect(result).not.toMatchObject({
+          namespaces: expect.anything(),
+        });
+      });
     });
   });
 });
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index 72a7867854b60..5f17c11792763 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -45,6 +45,8 @@ import {
   SavedObjectsBulkUpdateObject,
   SavedObjectsBulkUpdateOptions,
   SavedObjectsDeleteOptions,
+  SavedObjectsAddToNamespacesOptions,
+  SavedObjectsDeleteFromNamespacesOptions,
 } from '../saved_objects_client';
 import {
   SavedObject,
@@ -60,20 +62,12 @@ import { validateConvertFilterToKueryNode } from './filter_utils';
 // so any breaking changes to this repository are considered breaking changes to the SavedObjectsClient.
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type Left<T> = {
-  tag: 'Left';
-  error: T;
-};
+type Left = { tag: 'Left'; error: Record<string, any> };
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type Right<T> = {
-  tag: 'Right';
-  value: T;
-};
-
-type Either<L, R> = Left<L> | Right<R>;
-const isLeft = <L, R>(either: Either<L, R>): either is Left<L> => {
-  return either.tag === 'Left';
-};
+type Right = { tag: 'Right'; value: Record<string, any> };
+type Either = Left | Right;
+const isLeft = (either: Either): either is Left => either.tag === 'Left';
+const isRight = (either: Either): either is Right => either.tag === 'Right';
 
 export interface SavedObjectsRepositoryOptions {
   index: string;
@@ -220,8 +214,8 @@ export class SavedObjectsRepository {
     const {
       id,
       migrationVersion,
-      overwrite = false,
       namespace,
+      overwrite = false,
       references = [],
       refresh = DEFAULT_REFRESH_SETTING,
     } = options;
@@ -230,22 +224,36 @@ export class SavedObjectsRepository {
       throw SavedObjectsErrorHelpers.createUnsupportedTypeError(type);
     }
 
-    const method = id && !overwrite ? 'create' : 'index';
     const time = this._getCurrentTime();
+    let savedObjectNamespace;
+    let savedObjectNamespaces: string[] | undefined;
+
+    if (this._registry.isSingleNamespace(type) && namespace) {
+      savedObjectNamespace = namespace;
+    } else if (this._registry.isMultiNamespace(type)) {
+      if (id && overwrite) {
+        // we will overwrite a multi-namespace saved object if it exists; if that happens, ensure we preserve its included namespaces
+        savedObjectNamespaces = await this.preflightGetNamespaces(type, id, namespace);
+      } else {
+        savedObjectNamespaces = getSavedObjectNamespaces(namespace);
+      }
+    }
 
     try {
       const migrated = this._migrator.migrateDocument({
         id,
         type,
-        namespace,
+        ...(savedObjectNamespace && { namespace: savedObjectNamespace }),
+        ...(savedObjectNamespaces && { namespaces: savedObjectNamespaces }),
         attributes,
         migrationVersion,
         updated_at: time,
-        references,
+        ...(Array.isArray(references) && { references }),
       });
 
       const raw = this._serializer.savedObjectToRaw(migrated as SavedObjectSanitizedDoc);
 
+      const method = id && overwrite ? 'index' : 'create';
       const response = await this._writeToCluster(method, {
         id: raw._id,
         index: this.getIndexForType(type),
@@ -282,10 +290,9 @@ export class SavedObjectsRepository {
   ): Promise<SavedObjectsBulkResponse<T>> {
     const { namespace, overwrite = false, refresh = DEFAULT_REFRESH_SETTING } = options;
     const time = this._getCurrentTime();
-    const bulkCreateParams: object[] = [];
 
-    let requestIndexCounter = 0;
-    const expectedResults: Array<Either<any, any>> = objects.map(object => {
+    let bulkGetRequestIndexCounter = 0;
+    const expectedResults: Either[] = objects.map(object => {
       if (!this._allowedTypes.includes(object.type)) {
         return {
           tag: 'Left' as 'Left',
@@ -297,9 +304,73 @@ export class SavedObjectsRepository {
         };
       }
 
-      const method = object.id && !overwrite ? 'create' : 'index';
+      const method = object.id && overwrite ? 'index' : 'create';
+      const requiresNamespacesCheck =
+        method === 'index' && this._registry.isMultiNamespace(object.type);
+
+      return {
+        tag: 'Right' as 'Right',
+        value: {
+          method,
+          object,
+          ...(requiresNamespacesCheck && { esRequestIndex: bulkGetRequestIndexCounter++ }),
+        },
+      };
+    });
+
+    const bulkGetDocs = expectedResults
+      .filter(isRight)
+      .filter(({ value }) => value.esRequestIndex !== undefined)
+      .map(({ value: { object: { type, id } } }) => ({
+        _id: this._serializer.generateRawId(namespace, type, id),
+        _index: this.getIndexForType(type),
+        _source: ['type', 'namespaces'],
+      }));
+    const bulkGetResponse = bulkGetDocs.length
+      ? await this._callCluster('mget', {
+          body: {
+            docs: bulkGetDocs,
+          },
+          ignore: [404],
+        })
+      : undefined;
+
+    let bulkRequestIndexCounter = 0;
+    const bulkCreateParams: object[] = [];
+    const expectedBulkResults: Either[] = expectedResults.map(expectedBulkGetResult => {
+      if (isLeft(expectedBulkGetResult)) {
+        return expectedBulkGetResult;
+      }
+
+      let savedObjectNamespace;
+      let savedObjectNamespaces;
+      const { esRequestIndex, object, method } = expectedBulkGetResult.value;
+      if (esRequestIndex !== undefined) {
+        const indexFound = bulkGetResponse.status !== 404;
+        const actualResult = indexFound ? bulkGetResponse.docs[esRequestIndex] : undefined;
+        const docFound = indexFound && actualResult.found === true;
+        if (docFound && !this.rawDocExistsInNamespace(actualResult, namespace)) {
+          const { id, type } = object;
+          return {
+            tag: 'Left' as 'Left',
+            error: {
+              id,
+              type,
+              error: SavedObjectsErrorHelpers.createConflictError(type, id).output.payload,
+            },
+          };
+        }
+        savedObjectNamespaces = getSavedObjectNamespaces(namespace, docFound && actualResult);
+      } else {
+        if (this._registry.isSingleNamespace(object.type)) {
+          savedObjectNamespace = namespace;
+        } else if (this._registry.isMultiNamespace(object.type)) {
+          savedObjectNamespaces = getSavedObjectNamespaces(namespace);
+        }
+      }
+
       const expectedResult = {
-        esRequestIndex: requestIndexCounter++,
+        esRequestIndex: bulkRequestIndexCounter++,
         requestedId: object.id,
         rawMigratedDoc: this._serializer.savedObjectToRaw(
           this._migrator.migrateDocument({
@@ -307,7 +378,8 @@ export class SavedObjectsRepository {
             type: object.type,
             attributes: object.attributes,
             migrationVersion: object.migrationVersion,
-            namespace,
+            ...(savedObjectNamespace && { namespace: savedObjectNamespace }),
+            ...(savedObjectNamespaces && { namespaces: savedObjectNamespaces }),
             updated_at: time,
             references: object.references || [],
           }) as SavedObjectSanitizedDoc
@@ -327,19 +399,21 @@ export class SavedObjectsRepository {
       return { tag: 'Right' as 'Right', value: expectedResult };
     });
 
-    const esResponse = await this._writeToCluster('bulk', {
-      refresh,
-      body: bulkCreateParams,
-    });
+    const bulkResponse = bulkCreateParams.length
+      ? await this._writeToCluster('bulk', {
+          refresh,
+          body: bulkCreateParams,
+        })
+      : undefined;
 
     return {
-      saved_objects: expectedResults.map(expectedResult => {
+      saved_objects: expectedBulkResults.map(expectedResult => {
         if (isLeft(expectedResult)) {
-          return expectedResult.error;
+          return expectedResult.error as any;
         }
 
         const { requestedId, rawMigratedDoc, esRequestIndex } = expectedResult.value;
-        const response = esResponse.items[esRequestIndex];
+        const response = bulkResponse.items[esRequestIndex];
         const {
           error,
           _id: responseId,
@@ -348,7 +422,7 @@ export class SavedObjectsRepository {
         } = Object.values(response)[0] as any;
 
         const {
-          _source: { type, [type]: attributes, references = [] },
+          _source: { type, [type]: attributes, references = [], namespaces },
         } = rawMigratedDoc;
 
         const id = requestedId || responseId;
@@ -362,6 +436,7 @@ export class SavedObjectsRepository {
         return {
           id,
           type,
+          ...(namespaces && { namespaces }),
           updated_at: time,
           version: encodeVersion(seqNo, primaryTerm),
           attributes,
@@ -382,32 +457,76 @@ export class SavedObjectsRepository {
    */
   async delete(type: string, id: string, options: SavedObjectsDeleteOptions = {}): Promise<{}> {
     if (!this._allowedTypes.includes(type)) {
-      throw SavedObjectsErrorHelpers.createGenericNotFoundError();
+      throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
 
     const { namespace, refresh = DEFAULT_REFRESH_SETTING } = options;
 
-    const response = await this._writeToCluster('delete', {
-      id: this._serializer.generateRawId(namespace, type, id),
+    const rawId = this._serializer.generateRawId(namespace, type, id);
+    let preflightResult: SavedObjectsRawDoc | undefined;
+
+    if (this._registry.isMultiNamespace(type)) {
+      preflightResult = await this.preflightCheckIncludesNamespace(type, id, namespace);
+      const existingNamespaces = getSavedObjectNamespaces(undefined, preflightResult);
+      const remainingNamespaces = existingNamespaces?.filter(
+        x => x !== getNamespaceString(namespace)
+      );
+
+      if (remainingNamespaces?.length) {
+        // if there is 1 or more namespace remaining, update the saved object
+        const time = this._getCurrentTime();
+
+        const doc = {
+          updated_at: time,
+          namespaces: remainingNamespaces,
+        };
+
+        const updateResponse = await this._writeToCluster('update', {
+          id: rawId,
+          index: this.getIndexForType(type),
+          ...getExpectedVersionProperties(undefined, preflightResult),
+          refresh,
+          ignore: [404],
+          body: {
+            doc,
+          },
+        });
+
+        if (updateResponse.status === 404) {
+          // see "404s from missing index" above
+          throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+        }
+        return {};
+      }
+    }
+
+    const deleteResponse = await this._writeToCluster('delete', {
+      id: rawId,
       index: this.getIndexForType(type),
+      ...getExpectedVersionProperties(undefined, preflightResult),
       refresh,
       ignore: [404],
     });
 
-    const deleted = response.result === 'deleted';
+    const deleted = deleteResponse.result === 'deleted';
     if (deleted) {
       return {};
     }
 
-    const docNotFound = response.result === 'not_found';
-    const indexNotFound = response.error && response.error.type === 'index_not_found_exception';
-    if (docNotFound || indexNotFound) {
+    const deleteDocNotFound = deleteResponse.result === 'not_found';
+    const deleteIndexNotFound =
+      deleteResponse.error && deleteResponse.error.type === 'index_not_found_exception';
+    if (deleteDocNotFound || deleteIndexNotFound) {
       // see "404s from missing index" above
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
 
     throw new Error(
-      `Unexpected Elasticsearch DELETE response: ${JSON.stringify({ type, id, response })}`
+      `Unexpected Elasticsearch DELETE response: ${JSON.stringify({
+        type,
+        id,
+        response: deleteResponse,
+      })}`
     );
   }
 
@@ -426,25 +545,37 @@ export class SavedObjectsRepository {
     }
 
     const { refresh = DEFAULT_REFRESH_SETTING } = options;
-
     const allTypes = Object.keys(getRootPropertiesObjects(this._mappings));
+    const typesToUpdate = allTypes.filter(type => !this._registry.isNamespaceAgnostic(type));
 
-    const typesToDelete = allTypes.filter(type => !this._registry.isNamespaceAgnostic(type));
-
-    const esOptions = {
-      index: this.getIndicesForTypes(typesToDelete),
+    const updateOptions = {
+      index: this.getIndicesForTypes(typesToUpdate),
       ignore: [404],
       refresh,
       body: {
+        script: {
+          source: `
+              if (!ctx._source.containsKey('namespaces')) {
+                ctx.op = "delete";
+              } else {
+                ctx._source['namespaces'].removeAll(Collections.singleton(params['namespace']));
+                if (ctx._source['namespaces'].empty) {
+                  ctx.op = "delete";
+                }
+              }
+            `,
+          lang: 'painless',
+          params: { namespace: getNamespaceString(namespace) },
+        },
         conflicts: 'proceed',
         ...getSearchDsl(this._mappings, this._registry, {
           namespace,
-          type: typesToDelete,
+          type: typesToUpdate,
         }),
       },
     };
 
-    return await this._writeToCluster('deleteByQuery', esOptions);
+    return await this._writeToCluster('updateByQuery', updateOptions);
   }
 
   /**
@@ -586,55 +717,77 @@ export class SavedObjectsRepository {
       return { saved_objects: [] };
     }
 
-    const unsupportedTypeObjects = objects
-      .filter(o => !this._allowedTypes.includes(o.type))
-      .map(({ type, id }) => {
-        return ({
-          id,
-          type,
-          error: SavedObjectsErrorHelpers.createUnsupportedTypeError(type).output.payload,
-        } as any) as SavedObject<T>;
-      });
+    let bulkGetRequestIndexCounter = 0;
+    const expectedBulkGetResults: Either[] = objects.map(object => {
+      const { type, id, fields } = object;
 
-    const supportedTypeObjects = objects.filter(o => this._allowedTypes.includes(o.type));
+      if (!this._allowedTypes.includes(type)) {
+        return {
+          tag: 'Left' as 'Left',
+          error: {
+            id,
+            type,
+            error: SavedObjectsErrorHelpers.createUnsupportedTypeError(type).output.payload,
+          },
+        };
+      }
 
-    const response = await this._callCluster('mget', {
-      body: {
-        docs: supportedTypeObjects.map(({ type, id, fields }) => {
-          return {
-            _id: this._serializer.generateRawId(namespace, type, id),
-            _index: this.getIndexForType(type),
-            _source: includedFields(type, fields),
-          };
-        }),
-      },
+      return {
+        tag: 'Right' as 'Right',
+        value: {
+          type,
+          id,
+          fields,
+          esRequestIndex: bulkGetRequestIndexCounter++,
+        },
+      };
     });
 
+    const bulkGetDocs = expectedBulkGetResults
+      .filter(isRight)
+      .map(({ value: { type, id, fields } }) => ({
+        _id: this._serializer.generateRawId(namespace, type, id),
+        _index: this.getIndexForType(type),
+        _source: includedFields(type, fields),
+      }));
+    const bulkGetResponse = bulkGetDocs.length
+      ? await this._callCluster('mget', {
+          body: {
+            docs: bulkGetDocs,
+          },
+          ignore: [404],
+        })
+      : undefined;
+
     return {
-      saved_objects: (response.docs as any[])
-        .map((doc, i) => {
-          const { id, type } = supportedTypeObjects[i];
+      saved_objects: expectedBulkGetResults.map(expectedResult => {
+        if (isLeft(expectedResult)) {
+          return expectedResult.error as any;
+        }
 
-          if (!doc.found) {
-            return ({
-              id,
-              type,
-              error: { statusCode: 404, message: 'Not found' },
-            } as any) as SavedObject<T>;
-          }
+        const { type, id, esRequestIndex } = expectedResult.value;
+        const doc = bulkGetResponse.docs[esRequestIndex];
 
-          const time = doc._source.updated_at;
-          return {
+        if (!doc.found || !this.rawDocExistsInNamespace(doc, namespace)) {
+          return ({
             id,
             type,
-            ...(time && { updated_at: time }),
-            version: encodeHitVersion(doc),
-            attributes: doc._source[type],
-            references: doc._source.references || [],
-            migrationVersion: doc._source.migrationVersion,
-          };
-        })
-        .concat(unsupportedTypeObjects),
+            error: SavedObjectsErrorHelpers.createGenericNotFoundError(type, id).output.payload,
+          } as any) as SavedObject<T>;
+        }
+
+        const time = doc._source.updated_at;
+        return {
+          id,
+          type,
+          ...(doc._source.namespaces && { namespaces: doc._source.namespaces }),
+          ...(time && { updated_at: time }),
+          version: encodeHitVersion(doc),
+          attributes: doc._source[type],
+          references: doc._source.references || [],
+          migrationVersion: doc._source.migrationVersion,
+        };
+      }),
     };
   }
 
@@ -666,7 +819,7 @@ export class SavedObjectsRepository {
 
     const docNotFound = response.found === false;
     const indexNotFound = response.status === 404;
-    if (docNotFound || indexNotFound) {
+    if (docNotFound || indexNotFound || !this.rawDocExistsInNamespace(response, namespace)) {
       // see "404s from missing index" above
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
@@ -676,6 +829,7 @@ export class SavedObjectsRepository {
     return {
       id,
       type,
+      ...(response._source.namespaces && { namespaces: response._source.namespaces }),
       ...(updatedAt && { updated_at: updatedAt }),
       version: encodeHitVersion(response),
       attributes: response._source[type],
@@ -707,29 +861,32 @@ export class SavedObjectsRepository {
 
     const { version, namespace, references, refresh = DEFAULT_REFRESH_SETTING } = options;
 
+    let preflightResult: SavedObjectsRawDoc | undefined;
+    if (this._registry.isMultiNamespace(type)) {
+      preflightResult = await this.preflightCheckIncludesNamespace(type, id, namespace);
+    }
+
     const time = this._getCurrentTime();
 
     const doc = {
       [type]: attributes,
       updated_at: time,
-      references,
+      ...(Array.isArray(references) && { references }),
     };
-    if (!Array.isArray(doc.references)) {
-      delete doc.references;
-    }
 
-    const response = await this._writeToCluster('update', {
+    const updateResponse = await this._writeToCluster('update', {
       id: this._serializer.generateRawId(namespace, type, id),
       index: this.getIndexForType(type),
-      ...(version && decodeRequestVersion(version)),
+      ...getExpectedVersionProperties(version, preflightResult),
       refresh,
       ignore: [404],
       body: {
         doc,
       },
+      ...(this._registry.isMultiNamespace(type) && { _sourceIncludes: ['namespaces'] }),
     });
 
-    if (response.status === 404) {
+    if (updateResponse.status === 404) {
       // see "404s from missing index" above
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
@@ -738,12 +895,168 @@ export class SavedObjectsRepository {
       id,
       type,
       updated_at: time,
-      version: encodeHitVersion(response),
+      version: encodeHitVersion(updateResponse),
+      ...(this._registry.isMultiNamespace(type) && {
+        namespaces: updateResponse.get._source.namespaces,
+      }),
       references,
       attributes,
     };
   }
 
+  /**
+   * Adds one or more namespaces to a given multi-namespace saved object. This method and
+   * [`deleteFromNamespaces`]{@link SavedObjectsRepository.deleteFromNamespaces} are the only ways to change which Spaces a multi-namespace
+   * saved object is shared to.
+   */
+  async addToNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options: SavedObjectsAddToNamespacesOptions = {}
+  ): Promise<{}> {
+    if (!this._allowedTypes.includes(type)) {
+      throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+    }
+
+    if (!this._registry.isMultiNamespace(type)) {
+      throw SavedObjectsErrorHelpers.createBadRequestError(
+        `${type} doesn't support multiple namespaces`
+      );
+    }
+
+    if (!namespaces.length) {
+      throw SavedObjectsErrorHelpers.createBadRequestError(
+        'namespaces must be a non-empty array of strings'
+      );
+    }
+
+    const { version, namespace, refresh = DEFAULT_REFRESH_SETTING } = options;
+
+    const rawId = this._serializer.generateRawId(undefined, type, id);
+    const preflightResult = await this.preflightCheckIncludesNamespace(type, id, namespace);
+    const existingNamespaces = getSavedObjectNamespaces(undefined, preflightResult);
+    // there should never be a case where a multi-namespace object does not have any existing namespaces
+    // however, it is a possibility if someone manually modifies the document in Elasticsearch
+    const time = this._getCurrentTime();
+
+    const doc = {
+      updated_at: time,
+      namespaces: existingNamespaces ? unique(existingNamespaces.concat(namespaces)) : namespaces,
+    };
+
+    const updateResponse = await this._writeToCluster('update', {
+      id: rawId,
+      index: this.getIndexForType(type),
+      ...getExpectedVersionProperties(version, preflightResult),
+      refresh,
+      ignore: [404],
+      body: {
+        doc,
+      },
+    });
+
+    if (updateResponse.status === 404) {
+      // see "404s from missing index" above
+      throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+    }
+
+    return {};
+  }
+
+  /**
+   * Removes one or more namespaces from a given multi-namespace saved object. If no namespaces remain, the saved object is deleted
+   * entirely. This method and [`addToNamespaces`]{@link SavedObjectsRepository.addToNamespaces} are the only ways to change which Spaces a
+   * multi-namespace saved object is shared to.
+   */
+  async deleteFromNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options: SavedObjectsDeleteFromNamespacesOptions = {}
+  ): Promise<{}> {
+    if (!this._allowedTypes.includes(type)) {
+      throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+    }
+
+    if (!this._registry.isMultiNamespace(type)) {
+      throw SavedObjectsErrorHelpers.createBadRequestError(
+        `${type} doesn't support multiple namespaces`
+      );
+    }
+
+    if (!namespaces.length) {
+      throw SavedObjectsErrorHelpers.createBadRequestError(
+        'namespaces must be a non-empty array of strings'
+      );
+    }
+
+    const { namespace, refresh = DEFAULT_REFRESH_SETTING } = options;
+
+    const rawId = this._serializer.generateRawId(undefined, type, id);
+    const preflightResult = await this.preflightCheckIncludesNamespace(type, id, namespace);
+    const existingNamespaces = getSavedObjectNamespaces(undefined, preflightResult);
+    // if there are somehow no existing namespaces, allow the operation to proceed and delete this saved object
+    const remainingNamespaces = existingNamespaces?.filter(x => !namespaces.includes(x));
+
+    if (remainingNamespaces?.length) {
+      // if there is 1 or more namespace remaining, update the saved object
+      const time = this._getCurrentTime();
+
+      const doc = {
+        updated_at: time,
+        namespaces: remainingNamespaces,
+      };
+
+      const updateResponse = await this._writeToCluster('update', {
+        id: rawId,
+        index: this.getIndexForType(type),
+        ...getExpectedVersionProperties(undefined, preflightResult),
+        refresh,
+        ignore: [404],
+        body: {
+          doc,
+        },
+      });
+
+      if (updateResponse.status === 404) {
+        // see "404s from missing index" above
+        throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+      }
+      return {};
+    } else {
+      // if there are no namespaces remaining, delete the saved object
+      const deleteResponse = await this._writeToCluster('delete', {
+        id: this._serializer.generateRawId(undefined, type, id),
+        index: this.getIndexForType(type),
+        ...getExpectedVersionProperties(undefined, preflightResult),
+        refresh,
+        ignore: [404],
+      });
+
+      const deleted = deleteResponse.result === 'deleted';
+      if (deleted) {
+        return {};
+      }
+
+      const deleteDocNotFound = deleteResponse.result === 'not_found';
+      const deleteIndexNotFound =
+        deleteResponse.error && deleteResponse.error.type === 'index_not_found_exception';
+      if (deleteDocNotFound || deleteIndexNotFound) {
+        // see "404s from missing index" above
+        throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+      }
+
+      throw new Error(
+        `Unexpected Elasticsearch DELETE response: ${JSON.stringify({
+          type,
+          id,
+          response: deleteResponse,
+        })}`
+      );
+    }
+  }
+
   /**
    * Updates multiple objects in bulk
    *
@@ -757,10 +1070,10 @@ export class SavedObjectsRepository {
     options: SavedObjectsBulkUpdateOptions = {}
   ): Promise<SavedObjectsBulkUpdateResponse<T>> {
     const time = this._getCurrentTime();
-    const bulkUpdateParams: object[] = [];
+    const { namespace } = options;
 
-    let requestIndexCounter = 0;
-    const expectedResults: Array<Either<any, any>> = objects.map(object => {
+    let bulkGetRequestIndexCounter = 0;
+    const expectedBulkGetResults: Either[] = objects.map(object => {
       const { type, id } = object;
 
       if (!this._allowedTypes.includes(type)) {
@@ -775,41 +1088,100 @@ export class SavedObjectsRepository {
       }
 
       const { attributes, references, version } = object;
-      const { namespace } = options;
 
       const documentToSave = {
         [type]: attributes,
         updated_at: time,
-        references,
+        ...(Array.isArray(references) && { references }),
       };
 
-      if (!Array.isArray(documentToSave.references)) {
-        delete documentToSave.references;
-      }
+      const requiresNamespacesCheck = this._registry.isMultiNamespace(object.type);
 
-      const expectedResult = {
-        type,
-        id,
-        esRequestIndex: requestIndexCounter++,
-        documentToSave,
+      return {
+        tag: 'Right' as 'Right',
+        value: {
+          type,
+          id,
+          version,
+          documentToSave,
+          ...(requiresNamespacesCheck && { esRequestIndex: bulkGetRequestIndexCounter++ }),
+        },
       };
+    });
 
-      bulkUpdateParams.push(
-        {
-          update: {
-            _id: this._serializer.generateRawId(namespace, type, id),
-            _index: this.getIndexForType(type),
-            ...(version && decodeRequestVersion(version)),
+    const bulkGetDocs = expectedBulkGetResults
+      .filter(isRight)
+      .filter(({ value }) => value.esRequestIndex !== undefined)
+      .map(({ value: { type, id } }) => ({
+        _id: this._serializer.generateRawId(namespace, type, id),
+        _index: this.getIndexForType(type),
+        _source: ['type', 'namespaces'],
+      }));
+    const bulkGetResponse = bulkGetDocs.length
+      ? await this._callCluster('mget', {
+          body: {
+            docs: bulkGetDocs,
           },
-        },
-        { doc: documentToSave }
-      );
+          ignore: [404],
+        })
+      : undefined;
 
-      return { tag: 'Right' as 'Right', value: expectedResult };
-    });
+    let bulkUpdateRequestIndexCounter = 0;
+    const bulkUpdateParams: object[] = [];
+    const expectedBulkUpdateResults: Either[] = expectedBulkGetResults.map(
+      expectedBulkGetResult => {
+        if (isLeft(expectedBulkGetResult)) {
+          return expectedBulkGetResult;
+        }
+
+        const { esRequestIndex, id, type, version, documentToSave } = expectedBulkGetResult.value;
+        let namespaces;
+        let versionProperties;
+        if (esRequestIndex !== undefined) {
+          const indexFound = bulkGetResponse.status !== 404;
+          const actualResult = indexFound ? bulkGetResponse.docs[esRequestIndex] : undefined;
+          const docFound = indexFound && actualResult.found === true;
+          if (!docFound || !this.rawDocExistsInNamespace(actualResult, namespace)) {
+            return {
+              tag: 'Left' as 'Left',
+              error: {
+                id,
+                type,
+                error: SavedObjectsErrorHelpers.createGenericNotFoundError(type, id).output.payload,
+              },
+            };
+          }
+          namespaces = actualResult._source.namespaces;
+          versionProperties = getExpectedVersionProperties(version, actualResult);
+        } else {
+          versionProperties = getExpectedVersionProperties(version);
+        }
+
+        const expectedResult = {
+          type,
+          id,
+          namespaces,
+          esRequestIndex: bulkUpdateRequestIndexCounter++,
+          documentToSave: expectedBulkGetResult.value.documentToSave,
+        };
+
+        bulkUpdateParams.push(
+          {
+            update: {
+              _id: this._serializer.generateRawId(namespace, type, id),
+              _index: this.getIndexForType(type),
+              ...versionProperties,
+            },
+          },
+          { doc: documentToSave }
+        );
+
+        return { tag: 'Right' as 'Right', value: expectedResult };
+      }
+    );
 
     const { refresh = DEFAULT_REFRESH_SETTING } = options;
-    const esResponse = bulkUpdateParams.length
+    const bulkUpdateResponse = bulkUpdateParams.length
       ? await this._writeToCluster('bulk', {
           refresh,
           body: bulkUpdateParams,
@@ -817,13 +1189,13 @@ export class SavedObjectsRepository {
       : {};
 
     return {
-      saved_objects: expectedResults.map(expectedResult => {
+      saved_objects: expectedBulkUpdateResults.map(expectedResult => {
         if (isLeft(expectedResult)) {
-          return expectedResult.error;
+          return expectedResult.error as any;
         }
 
-        const { type, id, documentToSave, esRequestIndex } = expectedResult.value;
-        const response = esResponse.items[esRequestIndex];
+        const { type, id, namespaces, documentToSave, esRequestIndex } = expectedResult.value;
+        const response = bulkUpdateResponse.items[esRequestIndex];
         const { error, _seq_no: seqNo, _primary_term: primaryTerm } = Object.values(
           response
         )[0] as any;
@@ -839,6 +1211,7 @@ export class SavedObjectsRepository {
         return {
           id,
           type,
+          ...(namespaces && { namespaces }),
           updated_at,
           version: encodeVersion(seqNo, primaryTerm),
           attributes,
@@ -877,10 +1250,20 @@ export class SavedObjectsRepository {
     const { migrationVersion, namespace, refresh = DEFAULT_REFRESH_SETTING } = options;
 
     const time = this._getCurrentTime();
+    let savedObjectNamespace;
+    let savedObjectNamespaces: string[] | undefined;
+
+    if (this._registry.isSingleNamespace(type) && namespace) {
+      savedObjectNamespace = namespace;
+    } else if (this._registry.isMultiNamespace(type)) {
+      savedObjectNamespaces = await this.preflightGetNamespaces(type, id, namespace);
+    }
 
     const migrated = this._migrator.migrateDocument({
       id,
       type,
+      ...(savedObjectNamespace && { namespace: savedObjectNamespace }),
+      ...(savedObjectNamespaces && { namespaces: savedObjectNamespaces }),
       attributes: { [counterFieldName]: 1 },
       migrationVersion,
       updated_at: time,
@@ -889,7 +1272,7 @@ export class SavedObjectsRepository {
     const raw = this._serializer.savedObjectToRaw(migrated as SavedObjectSanitizedDoc);
 
     const response = await this._writeToCluster('update', {
-      id: this._serializer.generateRawId(namespace, type, id),
+      id: raw._id,
       index: this.getIndexForType(type),
       refresh,
       _source: true,
@@ -952,14 +1335,13 @@ export class SavedObjectsRepository {
   }
 
   /**
-   * Returns an array of indices as specified in `this._schema` for each of the
+   * Returns an array of indices as specified in `this._registry` for each of the
    * given `types`. If any of the types don't have an associated index, the
    * default index `this._index` will be included.
    *
    * @param types The types whose indices should be retrieved
    */
   private getIndicesForTypes(types: string[]) {
-    const unique = (array: string[]) => [...new Set(array)];
     return unique(types.map(t => this.getIndexForType(t)));
   }
 
@@ -975,12 +1357,97 @@ export class SavedObjectsRepository {
     const savedObject = this._serializer.rawToSavedObject(raw);
     return omit(savedObject, 'namespace');
   }
+
+  /**
+   * Check to ensure that a raw document exists in a namespace. If the document is not a multi-namespace type, then this returns `true` as
+   * we rely on the guarantees of the document ID format. If the document is a multi-namespace type, this checks to ensure that the
+   * document's `namespaces` value includes the string representation of the given namespace.
+   *
+   * WARNING: This should only be used for documents that were retrieved from Elasticsearch. Otherwise, the guarantees of the document ID
+   * format mentioned above do not apply.
+   */
+  private rawDocExistsInNamespace(raw: SavedObjectsRawDoc, namespace?: string) {
+    const rawDocType = raw._source.type;
+
+    // if the type is namespace isolated, or namespace agnostic, we can continue to rely on the guarantees
+    // of the document ID format and don't need to check this
+    if (!this._registry.isMultiNamespace(rawDocType)) {
+      return true;
+    }
+
+    const namespaces = raw._source.namespaces;
+    return namespaces?.includes(getNamespaceString(namespace)) ?? false;
+  }
+
+  /**
+   * Pre-flight check to get a multi-namespace saved object's included namespaces. This ensures that, if the saved object exists, it
+   * includes the target namespace.
+   *
+   * @param type The type of the saved object.
+   * @param id The ID of the saved object.
+   * @param namespace The target namespace.
+   * @returns Array of namespaces that this saved object currently includes, or (if the object does not exist yet) the namespaces that a
+   * newly-created object will include. Value may be undefined if an existing saved object has no namespaces attribute; this should not
+   * happen in normal operations, but it is possible if the Elasticsearch document is manually modified.
+   * @throws Will throw an error if the saved object exists and it does not include the target namespace.
+   */
+  private async preflightGetNamespaces(type: string, id: string, namespace?: string) {
+    if (!this._registry.isMultiNamespace(type)) {
+      throw new Error(`Cannot make preflight get request for non-multi-namespace type '${type}'.`);
+    }
+
+    const response = await this._callCluster('get', {
+      id: this._serializer.generateRawId(undefined, type, id),
+      index: this.getIndexForType(type),
+      ignore: [404],
+    });
+
+    const indexFound = response.status !== 404;
+    const docFound = indexFound && response.found === true;
+    if (docFound) {
+      if (!this.rawDocExistsInNamespace(response, namespace)) {
+        throw SavedObjectsErrorHelpers.createConflictError(type, id);
+      }
+      return getSavedObjectNamespaces(namespace, response);
+    }
+    return getSavedObjectNamespaces(namespace);
+  }
+
+  /**
+   * Pre-flight check for a multi-namespace saved object's namespaces. This ensures that, if the saved object exists, it includes the target
+   * namespace.
+   *
+   * @param type The type of the saved object.
+   * @param id The ID of the saved object.
+   * @param namespace The target namespace.
+   * @returns Raw document from Elasticsearch.
+   * @throws Will throw an error if the saved object is not found, or if it doesn't include the target namespace.
+   */
+  private async preflightCheckIncludesNamespace(type: string, id: string, namespace?: string) {
+    if (!this._registry.isMultiNamespace(type)) {
+      throw new Error(`Cannot make preflight get request for non-multi-namespace type '${type}'.`);
+    }
+
+    const rawId = this._serializer.generateRawId(undefined, type, id);
+    const response = await this._callCluster('get', {
+      id: rawId,
+      index: this.getIndexForType(type),
+      ignore: [404],
+    });
+
+    const indexFound = response.status !== 404;
+    const docFound = indexFound && response.found === true;
+    if (!docFound || !this.rawDocExistsInNamespace(response, namespace)) {
+      throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+    }
+    return response as SavedObjectsRawDoc;
+  }
 }
 
 function getBulkOperationError(error: { type: string; reason?: string }, type: string, id: string) {
   switch (error.type) {
     case 'version_conflict_engine_exception':
-      return { statusCode: 409, message: 'version conflict, document already exists' };
+      return SavedObjectsErrorHelpers.createConflictError(type, id).output.payload;
     case 'document_missing_exception':
       return SavedObjectsErrorHelpers.createGenericNotFoundError(type, id).output.payload;
     default:
@@ -989,3 +1456,49 @@ function getBulkOperationError(error: { type: string; reason?: string }, type: s
       };
   }
 }
+
+/**
+ * Returns an object with the expected version properties. This facilitates Elasticsearch's Optimistic Concurrency Control.
+ *
+ * @param version Optional version specified by the consumer.
+ * @param document Optional existing document that was obtained in a preflight operation.
+ */
+function getExpectedVersionProperties(version?: string, document?: SavedObjectsRawDoc) {
+  if (version) {
+    return decodeRequestVersion(version);
+  } else if (document) {
+    return {
+      if_seq_no: document._seq_no,
+      if_primary_term: document._primary_term,
+    };
+  }
+  return {};
+}
+
+/**
+ * Returns the string representation of a namespace.
+ * The default namespace is undefined, and is represented by the string 'default'.
+ */
+function getNamespaceString(namespace?: string) {
+  return namespace ?? 'default';
+}
+
+/**
+ * Returns a string array of namespaces for a given saved object. If the saved object is undefined, the result is an array that contains the
+ * current namespace. Value may be undefined if an existing saved object has no namespaces attribute; this should not happen in normal
+ * operations, but it is possible if the Elasticsearch document is manually modified.
+ *
+ * @param namespace The current namespace.
+ * @param document Optional existing saved object that was obtained in a preflight operation.
+ */
+function getSavedObjectNamespaces(
+  namespace?: string,
+  document?: SavedObjectsRawDoc
+): string[] | undefined {
+  if (document) {
+    return document._source?.namespaces;
+  }
+  return [getNamespaceString(namespace)];
+}
+
+const unique = (array: string[]) => [...new Set(array)];
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts
index b2129765ee426..a72c21dd5eee4 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts
@@ -17,6 +17,9 @@
  * under the License.
  */
 
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { esKuery, KueryNode } from '../../../../../../plugins/data/server';
+
 import { typeRegistryMock } from '../../../saved_objects_type_registry.mock';
 import { getQueryParams } from './query_params';
 
@@ -24,1268 +27,329 @@ const registry = typeRegistryMock.create();
 
 const MAPPINGS = {
   properties: {
-    type: {
-      type: 'keyword',
-    },
-    pending: {
-      properties: {
-        title: {
-          type: 'text',
-        },
-      },
-    },
+    pending: { properties: { title: { type: 'text' } } },
     saved: {
       properties: {
-        title: {
-          type: 'text',
-          fields: {
-            raw: {
-              type: 'keyword',
-            },
-          },
-        },
-        obj: {
-          properties: {
-            key1: {
-              type: 'text',
-            },
-          },
-        },
-      },
-    },
-    global: {
-      properties: {
-        name: {
-          type: 'keyword',
-        },
+        title: { type: 'text', fields: { raw: { type: 'keyword' } } },
+        obj: { properties: { key1: { type: 'text' } } },
       },
     },
+    // mock registry returns isMultiNamespace=true for 'shared' type
+    shared: { properties: { name: { type: 'keyword' } } },
+    // mock registry returns isNamespaceAgnostic=true for 'global' type
+    global: { properties: { name: { type: 'keyword' } } },
   },
 };
+const ALL_TYPES = Object.keys(MAPPINGS.properties);
+// get all possible subsets (combination) of all types
+const ALL_TYPE_SUBSETS = ALL_TYPES.reduce(
+  (subsets, value) => subsets.concat(subsets.map(set => [...set, value])),
+  [[] as string[]]
+)
+  .filter(x => x.length) // exclude empty set
+  .map(x => (x.length === 1 ? x[0] : x)); // if a subset is a single string, destructure it
 
-// create a type clause to be used within the "should", if a namespace is specified
-// the clause will ensure the namespace matches; otherwise, the clause will ensure
-// that there isn't a namespace field.
-const createTypeClause = (type: string, namespace?: string) => {
-  if (namespace) {
-    return {
-      bool: {
-        must: [{ term: { type } }, { term: { namespace } }],
-      },
-    };
-  }
+/**
+ * Note: these tests cases are defined in the order they appear in the source code, for readability's sake
+ */
+describe('#getQueryParams', () => {
+  const mappings = MAPPINGS;
+  type Result = ReturnType<typeof getQueryParams>;
 
-  return {
-    bool: {
-      must: [{ term: { type } }],
-      must_not: [{ exists: { field: 'namespace' } }],
-    },
-  };
-};
+  describe('kueryNode filter clause (query.bool.filter[...]', () => {
+    const expectResult = (result: Result, expected: any) => {
+      expect(result.query.bool.filter).toEqual(expect.arrayContaining([expected]));
+    };
 
-describe('searchDsl/queryParams', () => {
-  describe('no parameters', () => {
-    it('searches for all known types without a namespace specified', () => {
-      expect(getQueryParams({ mappings: MAPPINGS, registry })).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending'),
-                    createTypeClause('saved'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-          },
-        },
+    describe('`kueryNode` parameter', () => {
+      it('does not include the clause when `kueryNode` is not specified', () => {
+        const result = getQueryParams({ mappings, registry, kueryNode: undefined });
+        expect(result.query.bool.filter).toHaveLength(1);
       });
-    });
-  });
 
-  describe('namespace', () => {
-    it('filters namespaced types for namespace, and ensures namespace agnostic types have no namespace', () => {
-      expect(getQueryParams({ mappings: MAPPINGS, registry, namespace: 'foo-namespace' })).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending', 'foo-namespace'),
-                    createTypeClause('saved', 'foo-namespace'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-  });
+      it('includes the specified Kuery clause', () => {
+        const test = (kueryNode: KueryNode) => {
+          const result = getQueryParams({ mappings, registry, kueryNode });
+          const expected = esKuery.toElasticsearchQuery(kueryNode);
+          expect(result.query.bool.filter).toHaveLength(2);
+          expectResult(result, expected);
+        };
 
-  describe('type (singular, namespaced)', () => {
-    it('includes a terms filter for type and namespace not being specified', () => {
-      expect(
-        getQueryParams({ mappings: MAPPINGS, registry, namespace: undefined, type: 'saved' })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-  });
+        const simpleClause = {
+          type: 'function',
+          function: 'is',
+          arguments: [
+            { type: 'literal', value: 'global.name' },
+            { type: 'literal', value: 'GLOBAL' },
+            { type: 'literal', value: false },
+          ],
+        } as KueryNode;
+        test(simpleClause);
 
-  describe('type (singular, global)', () => {
-    it('includes a terms filter for type and namespace not being specified', () => {
-      expect(
-        getQueryParams({ mappings: MAPPINGS, registry, namespace: undefined, type: 'global' })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('global')],
-                  minimum_should_match: 1,
+        const complexClause = {
+          type: 'function',
+          function: 'and',
+          arguments: [
+            simpleClause,
+            {
+              type: 'function',
+              function: 'not',
+              arguments: [
+                {
+                  type: 'function',
+                  function: 'is',
+                  arguments: [
+                    { type: 'literal', value: 'saved.obj.key1' },
+                    { type: 'literal', value: 'key' },
+                    { type: 'literal', value: true },
+                  ],
                 },
-              },
-            ],
-          },
-        },
+              ],
+            },
+          ],
+        } as KueryNode;
+        test(complexClause);
       });
     });
   });
 
-  describe('type (plural, namespaced and global)', () => {
-    it('includes term filters for types and namespace not being specified', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: undefined,
-          type: ['saved', 'global'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-  });
+  describe('reference filter clause (query.bool.filter[bool.must])', () => {
+    describe('`hasReference` parameter', () => {
+      const expectResult = (result: Result, expected: any) => {
+        expect(result.query.bool.filter).toEqual(
+          expect.arrayContaining([{ bool: expect.objectContaining({ must: expected }) }])
+        );
+      };
 
-  describe('namespace, type (plural, namespaced and global)', () => {
-    it('includes a terms filter for type and namespace not being specified', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
+      it('does not include the clause when `hasReference` is not specified', () => {
+        const result = getQueryParams({
+          mappings,
           registry,
-          namespace: 'foo-namespace',
-          type: ['saved', 'global'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved', 'foo-namespace'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-          },
-        },
+          hasReference: undefined,
+        });
+        expectResult(result, undefined);
       });
-    });
-  });
 
-  describe('search', () => {
-    it('includes a sqs query and all known types without a namespace specified', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
+      it('creates a clause with query for specified reference', () => {
+        const hasReference = { id: 'foo', type: 'bar' };
+        const result = getQueryParams({
+          mappings,
           registry,
-          namespace: undefined,
-          type: undefined,
-          search: 'us*',
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
+          hasReference,
+        });
+        expectResult(result, [
+          {
+            nested: {
+              path: 'references',
+              query: {
                 bool: {
-                  should: [
-                    createTypeClause('pending'),
-                    createTypeClause('saved'),
-                    createTypeClause('global'),
+                  must: [
+                    { term: { 'references.id': hasReference.id } },
+                    { term: { 'references.type': hasReference.type } },
                   ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'us*',
-                  lenient: true,
-                  fields: ['*'],
                 },
               },
-            ],
+            },
           },
-        },
+        ]);
       });
     });
   });
 
-  describe('namespace, search', () => {
-    it('includes a sqs query and namespaced types with the namespace and global types without a namespace', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: 'foo-namespace',
-          type: undefined,
-          search: 'us*',
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending', 'foo-namespace'),
-                    createTypeClause('saved', 'foo-namespace'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'us*',
-                  lenient: true,
-                  fields: ['*'],
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-  });
+  describe('type filter clauses (query.bool.filter[bool.should])', () => {
+    describe('`type` parameter', () => {
+      const expectResult = (result: Result, ...types: string[]) => {
+        expect(result.query.bool.filter).toEqual(
+          expect.arrayContaining([
+            {
+              bool: expect.objectContaining({
+                should: types.map(type => ({
+                  bool: expect.objectContaining({
+                    must: expect.arrayContaining([{ term: { type } }]),
+                  }),
+                })),
+                minimum_should_match: 1,
+              }),
+            },
+          ])
+        );
+      };
 
-  describe('type (plural, namespaced and global), search', () => {
-    it('includes a sqs query and types without a namespace', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: undefined,
-          type: ['saved', 'global'],
-          search: 'us*',
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'us*',
-                  lenient: true,
-                  fields: ['*'],
-                },
-              },
-            ],
-          },
-        },
+      it('searches for all known types when `type` is not specified', () => {
+        const result = getQueryParams({ mappings, registry, type: undefined });
+        expectResult(result, ...ALL_TYPES);
       });
-    });
-  });
 
-  describe('namespace, type (plural, namespaced and global), search', () => {
-    it('includes a sqs query and namespace type with a namespace and global type without a namespace', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: 'foo-namespace',
-          type: ['saved', 'global'],
-          search: 'us*',
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved', 'foo-namespace'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'us*',
-                  lenient: true,
-                  fields: ['*'],
-                },
-              },
-            ],
-          },
-        },
+      it('searches for specified type/s', () => {
+        const test = (typeOrTypes: string | string[]) => {
+          const result = getQueryParams({
+            mappings,
+            registry,
+            type: typeOrTypes,
+          });
+          const type = Array.isArray(typeOrTypes) ? typeOrTypes : [typeOrTypes];
+          expectResult(result, ...type);
+        };
+        for (const typeOrTypes of ALL_TYPE_SUBSETS) {
+          test(typeOrTypes);
+        }
       });
     });
-  });
 
-  describe('search, searchFields', () => {
-    it('includes all types for field', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: undefined,
-          type: undefined,
-          search: 'y*',
-          searchFields: ['title'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending'),
-                    createTypeClause('saved'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['pending.title', 'saved.title', 'global.title'],
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-    it('supports field boosting', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: undefined,
-          type: undefined,
-          search: 'y*',
-          searchFields: ['title^3'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending'),
-                    createTypeClause('saved'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['pending.title^3', 'saved.title^3', 'global.title^3'],
-                },
-              },
-            ],
-          },
-        },
+    describe('`namespace` parameter', () => {
+      const createTypeClause = (type: string, namespace?: string) => {
+        if (registry.isMultiNamespace(type)) {
+          return {
+            bool: {
+              must: expect.arrayContaining([{ term: { namespaces: namespace ?? 'default' } }]),
+              must_not: [{ exists: { field: 'namespace' } }],
+            },
+          };
+        } else if (namespace && registry.isSingleNamespace(type)) {
+          return {
+            bool: {
+              must: expect.arrayContaining([{ term: { namespace } }]),
+              must_not: [{ exists: { field: 'namespaces' } }],
+            },
+          };
+        }
+        // isNamespaceAgnostic
+        return {
+          bool: expect.objectContaining({
+            must_not: [{ exists: { field: 'namespace' } }, { exists: { field: 'namespaces' } }],
+          }),
+        };
+      };
+
+      const expectResult = (result: Result, ...typeClauses: any) => {
+        expect(result.query.bool.filter).toEqual(
+          expect.arrayContaining([
+            { bool: expect.objectContaining({ should: typeClauses, minimum_should_match: 1 }) },
+          ])
+        );
+      };
+
+      const test = (namespace?: string) => {
+        for (const typeOrTypes of ALL_TYPE_SUBSETS) {
+          const result = getQueryParams({ mappings, registry, type: typeOrTypes, namespace });
+          const types = Array.isArray(typeOrTypes) ? typeOrTypes : [typeOrTypes];
+          expectResult(result, ...types.map(x => createTypeClause(x, namespace)));
+        }
+        // also test with no specified type/s
+        const result = getQueryParams({ mappings, registry, type: undefined, namespace });
+        expectResult(result, ...ALL_TYPES.map(x => createTypeClause(x, namespace)));
+      };
+
+      it('filters results with "namespace" field when `namespace` is not specified', () => {
+        test(undefined);
       });
-    });
-    it('supports field and multi-field', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: undefined,
-          type: undefined,
-          search: 'y*',
-          searchFields: ['title', 'title.raw'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending'),
-                    createTypeClause('saved'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: [
-                    'pending.title',
-                    'saved.title',
-                    'global.title',
-                    'pending.title.raw',
-                    'saved.title.raw',
-                    'global.title.raw',
-                  ],
-                },
-              },
-            ],
-          },
-        },
+
+      it('filters results for specified namespace for appropriate type/s', () => {
+        test('foo-namespace');
       });
     });
   });
 
-  describe('namespace, search, searchFields', () => {
-    it('includes all types for field', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
+  describe('search clause (query.bool.must.simple_query_string)', () => {
+    const search = 'foo*';
+
+    const expectResult = (result: Result, sqsClause: any) => {
+      expect(result.query.bool.must).toEqual([{ simple_query_string: sqsClause }]);
+    };
+
+    describe('`search` parameter', () => {
+      it('does not include clause when `search` is not specified', () => {
+        const result = getQueryParams({
+          mappings,
           registry,
-          namespace: 'foo-namespace',
-          type: undefined,
-          search: 'y*',
-          searchFields: ['title'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending', 'foo-namespace'),
-                    createTypeClause('saved', 'foo-namespace'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['pending.title', 'saved.title', 'global.title'],
-                },
-              },
-            ],
-          },
-        },
+          search: undefined,
+        });
+        expect(result.query.bool.must).toBeUndefined();
       });
-    });
-    it('supports field boosting', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
+
+      it('creates a clause with query for specified search', () => {
+        const result = getQueryParams({
+          mappings,
           registry,
-          namespace: 'foo-namespace',
-          type: undefined,
-          search: 'y*',
-          searchFields: ['title^3'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending', 'foo-namespace'),
-                    createTypeClause('saved', 'foo-namespace'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['pending.title^3', 'saved.title^3', 'global.title^3'],
-                },
-              },
-            ],
-          },
-        },
+          search,
+        });
+        expectResult(result, expect.objectContaining({ query: search }));
       });
     });
-    it('supports field and multi-field', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
+
+    describe('`searchFields` parameter', () => {
+      const getExpectedFields = (searchFields: string[], typeOrTypes: string | string[]) => {
+        const types = Array.isArray(typeOrTypes) ? typeOrTypes : [typeOrTypes];
+        return searchFields.map(x => types.map(y => `${y}.${x}`)).flat();
+      };
+
+      const test = (searchFields: string[]) => {
+        for (const typeOrTypes of ALL_TYPE_SUBSETS) {
+          const result = getQueryParams({
+            mappings,
+            registry,
+            type: typeOrTypes,
+            search,
+            searchFields,
+          });
+          const fields = getExpectedFields(searchFields, typeOrTypes);
+          expectResult(result, expect.objectContaining({ fields }));
+        }
+        // also test with no specified type/s
+        const result = getQueryParams({
+          mappings,
           registry,
-          namespace: 'foo-namespace',
           type: undefined,
-          search: 'y*',
-          searchFields: ['title', 'title.raw'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    createTypeClause('pending', 'foo-namespace'),
-                    createTypeClause('saved', 'foo-namespace'),
-                    createTypeClause('global'),
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: [
-                    'pending.title',
-                    'saved.title',
-                    'global.title',
-                    'pending.title.raw',
-                    'saved.title.raw',
-                    'global.title.raw',
-                  ],
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-  });
+          search,
+          searchFields,
+        });
+        const fields = getExpectedFields(searchFields, ALL_TYPES);
+        expectResult(result, expect.objectContaining({ fields }));
+      };
 
-  describe('type (plural, namespaced and global), search, searchFields', () => {
-    it('includes all types for field', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: undefined,
-          type: ['saved', 'global'],
-          search: 'y*',
-          searchFields: ['title'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['saved.title', 'global.title'],
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-    it('supports field boosting', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: undefined,
-          type: ['saved', 'global'],
-          search: 'y*',
-          searchFields: ['title^3'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['saved.title^3', 'global.title^3'],
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-    it('supports field and multi-field', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
+      it('includes lenient flag and all fields when `searchFields` is not specified', () => {
+        const result = getQueryParams({
+          mappings,
           registry,
-          namespace: undefined,
-          type: ['saved', 'global'],
-          search: 'y*',
-          searchFields: ['title', 'title.raw'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['saved.title', 'global.title', 'saved.title.raw', 'global.title.raw'],
-                },
-              },
-            ],
-          },
-        },
+          search,
+          searchFields: undefined,
+        });
+        expectResult(result, expect.objectContaining({ lenient: true, fields: ['*'] }));
       });
-    });
-  });
 
-  describe('namespace, type (plural, namespaced and global), search, searchFields', () => {
-    it('includes all types for field', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: 'foo-namespace',
-          type: ['saved', 'global'],
-          search: 'y*',
-          searchFields: ['title'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved', 'foo-namespace'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['saved.title', 'global.title'],
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-    it('supports field boosting', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: 'foo-namespace',
-          type: ['saved', 'global'],
-          search: 'y*',
-          searchFields: ['title^3'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved', 'foo-namespace'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['saved.title^3', 'global.title^3'],
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-    it('supports field and multi-field', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: 'foo-namespace',
-          type: ['saved', 'global'],
-          search: 'y*',
-          searchFields: ['title', 'title.raw'],
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [createTypeClause('saved', 'foo-namespace'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['saved.title', 'global.title', 'saved.title.raw', 'global.title.raw'],
-                },
-              },
-            ],
-          },
-        },
+      it('includes specified search fields for appropriate type/s', () => {
+        test(['title']);
       });
-    });
-  });
 
-  describe('type (plural, namespaced and global), search, defaultSearchOperator', () => {
-    it('supports defaultSearchOperator', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: 'foo-namespace',
-          type: ['saved', 'global'],
-          search: 'foo',
-          searchFields: undefined,
-          defaultSearchOperator: 'AND',
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  minimum_should_match: 1,
-                  should: [
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'saved',
-                            },
-                          },
-                          {
-                            term: {
-                              namespace: 'foo-namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'global',
-                            },
-                          },
-                        ],
-                        must_not: [
-                          {
-                            exists: {
-                              field: 'namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  ],
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  lenient: true,
-                  fields: ['*'],
-                  default_operator: 'AND',
-                  query: 'foo',
-                },
-              },
-            ],
-          },
-        },
+      it('supports boosting', () => {
+        test(['title^3']);
       });
-    });
-  });
 
-  describe('type (plural, namespaced and global), hasReference', () => {
-    it('supports hasReference', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: 'foo-namespace',
-          type: ['saved', 'global'],
-          search: undefined,
-          searchFields: undefined,
-          defaultSearchOperator: 'OR',
-          hasReference: {
-            type: 'bar',
-            id: '1',
-          },
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  must: [
-                    {
-                      nested: {
-                        path: 'references',
-                        query: {
-                          bool: {
-                            must: [
-                              {
-                                term: {
-                                  'references.id': '1',
-                                },
-                              },
-                              {
-                                term: {
-                                  'references.type': 'bar',
-                                },
-                              },
-                            ],
-                          },
-                        },
-                      },
-                    },
-                  ],
-                  should: [createTypeClause('saved', 'foo-namespace'), createTypeClause('global')],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-          },
-        },
+      it('supports multiple fields', () => {
+        test(['title, title.raw']);
       });
     });
-  });
 
-  describe('type filter', () => {
-    it(' with namespace', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
-          registry,
-          namespace: 'foo-namespace',
-          kueryNode: {
-            type: 'function',
-            function: 'is',
-            arguments: [
-              { type: 'literal', value: 'global.name' },
-              { type: 'literal', value: 'GLOBAL' },
-              { type: 'literal', value: false },
-            ],
-          },
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    {
-                      match: {
-                        'global.name': 'GLOBAL',
-                      },
-                    },
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-              {
-                bool: {
-                  should: [
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'pending',
-                            },
-                          },
-                          {
-                            term: {
-                              namespace: 'foo-namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'saved',
-                            },
-                          },
-                          {
-                            term: {
-                              namespace: 'foo-namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'global',
-                            },
-                          },
-                        ],
-                        must_not: [
-                          {
-                            exists: {
-                              field: 'namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-          },
-        },
-      });
-    });
-    it(' with namespace and more complex filter', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
+    describe('`defaultSearchOperator` parameter', () => {
+      it('does not include default_operator when `defaultSearchOperator` is not specified', () => {
+        const result = getQueryParams({
+          mappings,
           registry,
-          namespace: 'foo-namespace',
-          kueryNode: {
-            type: 'function',
-            function: 'and',
-            arguments: [
-              {
-                type: 'function',
-                function: 'is',
-                arguments: [
-                  { type: 'literal', value: 'global.name' },
-                  { type: 'literal', value: 'GLOBAL' },
-                  { type: 'literal', value: false },
-                ],
-              },
-              {
-                type: 'function',
-                function: 'not',
-                arguments: [
-                  {
-                    type: 'function',
-                    function: 'is',
-                    arguments: [
-                      { type: 'literal', value: 'saved.obj.key1' },
-                      { type: 'literal', value: 'key' },
-                      { type: 'literal', value: true },
-                    ],
-                  },
-                ],
-              },
-            ],
-          },
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  filter: [
-                    {
-                      bool: {
-                        should: [
-                          {
-                            match: {
-                              'global.name': 'GLOBAL',
-                            },
-                          },
-                        ],
-                        minimum_should_match: 1,
-                      },
-                    },
-                    {
-                      bool: {
-                        must_not: {
-                          bool: {
-                            should: [
-                              {
-                                match_phrase: {
-                                  'saved.obj.key1': 'key',
-                                },
-                              },
-                            ],
-                            minimum_should_match: 1,
-                          },
-                        },
-                      },
-                    },
-                  ],
-                },
-              },
-              {
-                bool: {
-                  should: [
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'pending',
-                            },
-                          },
-                          {
-                            term: {
-                              namespace: 'foo-namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'saved',
-                            },
-                          },
-                          {
-                            term: {
-                              namespace: 'foo-namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'global',
-                            },
-                          },
-                        ],
-                        must_not: [
-                          {
-                            exists: {
-                              field: 'namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-          },
-        },
+          search,
+          defaultSearchOperator: undefined,
+        });
+        expectResult(result, expect.not.objectContaining({ default_operator: expect.anything() }));
       });
-    });
-    it(' with search and searchFields', () => {
-      expect(
-        getQueryParams({
-          mappings: MAPPINGS,
+
+      it('includes specified default operator', () => {
+        const defaultSearchOperator = 'AND';
+        const result = getQueryParams({
+          mappings,
           registry,
-          namespace: 'foo-namespace',
-          search: 'y*',
-          searchFields: ['title'],
-          kueryNode: {
-            type: 'function',
-            function: 'is',
-            arguments: [
-              { type: 'literal', value: 'global.name' },
-              { type: 'literal', value: 'GLOBAL' },
-              { type: 'literal', value: false },
-            ],
-          },
-        })
-      ).toEqual({
-        query: {
-          bool: {
-            filter: [
-              {
-                bool: {
-                  should: [
-                    {
-                      match: {
-                        'global.name': 'GLOBAL',
-                      },
-                    },
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-              {
-                bool: {
-                  should: [
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'pending',
-                            },
-                          },
-                          {
-                            term: {
-                              namespace: 'foo-namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'saved',
-                            },
-                          },
-                          {
-                            term: {
-                              namespace: 'foo-namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                    {
-                      bool: {
-                        must: [
-                          {
-                            term: {
-                              type: 'global',
-                            },
-                          },
-                        ],
-                        must_not: [
-                          {
-                            exists: {
-                              field: 'namespace',
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  ],
-                  minimum_should_match: 1,
-                },
-              },
-            ],
-            must: [
-              {
-                simple_query_string: {
-                  query: 'y*',
-                  fields: ['pending.title', 'saved.title', 'global.title'],
-                },
-              },
-            ],
-          },
-        },
+          search,
+          defaultSearchOperator,
+        });
+        expectResult(result, expect.objectContaining({ default_operator: defaultSearchOperator }));
       });
     });
   });
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts
index e6c06208ca1a5..967ce8bceaf84 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts
@@ -66,18 +66,26 @@ function getClauseForType(
   namespace: string | undefined,
   type: string
 ) {
-  if (namespace && !registry.isNamespaceAgnostic(type)) {
+  if (registry.isMultiNamespace(type)) {
+    return {
+      bool: {
+        must: [{ term: { type } }, { term: { namespaces: namespace ?? 'default' } }],
+        must_not: [{ exists: { field: 'namespace' } }],
+      },
+    };
+  } else if (namespace && registry.isSingleNamespace(type)) {
     return {
       bool: {
         must: [{ term: { type } }, { term: { namespace } }],
+        must_not: [{ exists: { field: 'namespaces' } }],
       },
     };
   }
-
+  // isSingleNamespace in the default namespace, or isNamespaceAgnostic
   return {
     bool: {
       must: [{ term: { type } }],
-      must_not: [{ exists: { field: 'namespace' } }],
+      must_not: [{ exists: { field: 'namespace' } }, { exists: { field: 'namespaces' } }],
     },
   };
 }
diff --git a/src/core/server/saved_objects/service/saved_objects_client.mock.ts b/src/core/server/saved_objects/service/saved_objects_client.mock.ts
index c6de9fa94291c..b209c9ca54f63 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.mock.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.mock.ts
@@ -31,6 +31,8 @@ const create = () =>
     find: jest.fn(),
     get: jest.fn(),
     update: jest.fn(),
+    addToNamespaces: jest.fn(),
+    deleteFromNamespaces: jest.fn(),
   } as unknown) as jest.Mocked<SavedObjectsClientContract>);
 
 export const savedObjectsClientMock = { create };
diff --git a/src/core/server/saved_objects/service/saved_objects_client.test.js b/src/core/server/saved_objects/service/saved_objects_client.test.js
index 1794d9ae86c17..53bb31369adbf 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.test.js
+++ b/src/core/server/saved_objects/service/saved_objects_client.test.js
@@ -147,3 +147,37 @@ test(`#bulkUpdate`, async () => {
   });
   expect(result).toBe(returnValue);
 });
+
+test(`#addToNamespaces`, async () => {
+  const returnValue = Symbol();
+  const mockRepository = {
+    addToNamespaces: jest.fn().mockResolvedValue(returnValue),
+  };
+  const client = new SavedObjectsClient(mockRepository);
+
+  const type = Symbol();
+  const id = Symbol();
+  const namespaces = Symbol();
+  const options = Symbol();
+  const result = await client.addToNamespaces(type, id, namespaces, options);
+
+  expect(mockRepository.addToNamespaces).toHaveBeenCalledWith(type, id, namespaces, options);
+  expect(result).toBe(returnValue);
+});
+
+test(`#deleteFromNamespaces`, async () => {
+  const returnValue = Symbol();
+  const mockRepository = {
+    deleteFromNamespaces: jest.fn().mockResolvedValue(returnValue),
+  };
+  const client = new SavedObjectsClient(mockRepository);
+
+  const type = Symbol();
+  const id = Symbol();
+  const namespaces = Symbol();
+  const options = Symbol();
+  const result = await client.deleteFromNamespaces(type, id, namespaces, options);
+
+  expect(mockRepository.deleteFromNamespaces).toHaveBeenCalledWith(type, id, namespaces, options);
+  expect(result).toBe(returnValue);
+});
diff --git a/src/core/server/saved_objects/service/saved_objects_client.ts b/src/core/server/saved_objects/service/saved_objects_client.ts
index 70d69374ba8fe..8780f07cc3091 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.ts
@@ -107,6 +107,26 @@ export interface SavedObjectsUpdateOptions extends SavedObjectsBaseOptions {
   refresh?: MutatingOperationRefreshSetting;
 }
 
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsAddToNamespacesOptions extends SavedObjectsBaseOptions {
+  /** An opaque version number which changes on each successful write operation. Can be used for implementing optimistic concurrency control. */
+  version?: string;
+  /** The Elasticsearch Refresh setting for this operation */
+  refresh?: MutatingOperationRefreshSetting;
+}
+
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsDeleteFromNamespacesOptions extends SavedObjectsBaseOptions {
+  /** The Elasticsearch Refresh setting for this operation */
+  refresh?: MutatingOperationRefreshSetting;
+}
+
 /**
  *
  * @public
@@ -270,6 +290,40 @@ export class SavedObjectsClient {
     return await this._repository.update(type, id, attributes, options);
   }
 
+  /**
+   * Adds namespaces to a SavedObject
+   *
+   * @param type
+   * @param id
+   * @param namespaces
+   * @param options
+   */
+  async addToNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options: SavedObjectsAddToNamespacesOptions = {}
+  ): Promise<{}> {
+    return await this._repository.addToNamespaces(type, id, namespaces, options);
+  }
+
+  /**
+   * Removes namespaces from a SavedObject
+   *
+   * @param type
+   * @param id
+   * @param namespaces
+   * @param options
+   */
+  async deleteFromNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options: SavedObjectsDeleteFromNamespacesOptions = {}
+  ): Promise<{}> {
+    return await this._repository.deleteFromNamespaces(type, id, namespaces, options);
+  }
+
   /**
    * Bulk Updates multiple SavedObject at once
    *
diff --git a/src/core/server/saved_objects/types.ts b/src/core/server/saved_objects/types.ts
index f14e9d9efb5e3..9efc82603b179 100644
--- a/src/core/server/saved_objects/types.ts
+++ b/src/core/server/saved_objects/types.ts
@@ -172,6 +172,19 @@ export type MutatingOperationRefreshSetting = boolean | 'wait_for';
  */
 export type SavedObjectsClientContract = Pick<SavedObjectsClient, keyof SavedObjectsClient>;
 
+/**
+ * The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive:
+ *  * single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace.
+ *  * multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces.
+ *  * agnostic: this type of saved object is global.
+ *
+ * Note: do not write logic that uses this value directly; instead, use the appropriate accessors in the
+ * {@link SavedObjectTypeRegistry | type registry}.
+ *
+ * @public
+ */
+export type SavedObjectsNamespaceType = 'single' | 'multiple' | 'agnostic';
+
 /**
  * @remarks This is only internal for now, and will only be public when we expose the registerType API
  *
@@ -190,9 +203,14 @@ export interface SavedObjectsType {
    */
   hidden: boolean;
   /**
-   * Is the type global (true), or namespaced (false).
+   * Is the type global (true), or not (false).
+   * @deprecated Use `namespaceType` instead.
+   */
+  namespaceAgnostic?: boolean;
+  /**
+   * The {@link SavedObjectsNamespaceType | namespace type} for the type.
    */
-  namespaceAgnostic: boolean;
+  namespaceType?: SavedObjectsNamespaceType;
   /**
    * If defined, the type instances will be stored in the given index instead of the default one.
    */
@@ -329,6 +347,8 @@ export type SavedObjectLegacyMigrationFn = (
  */
 interface SavedObjectsLegacyTypeSchema {
   isNamespaceAgnostic?: boolean;
+  /** Cannot be used in conjunction with `isNamespaceAgnostic` */
+  multiNamespace?: boolean;
   hidden?: boolean;
   indexPattern?: ((config: LegacyConfig) => string) | string;
   convertToAliasScript?: string;
diff --git a/src/core/server/saved_objects/utils.test.ts b/src/core/server/saved_objects/utils.test.ts
index 0719fe7138e8a..64bdf1771decc 100644
--- a/src/core/server/saved_objects/utils.test.ts
+++ b/src/core/server/saved_objects/utils.test.ts
@@ -84,6 +84,16 @@ describe('convertLegacyTypes', () => {
         },
         {
           pluginId: 'pluginB',
+          properties: {
+            typeB: {
+              properties: {
+                fieldB: { type: 'text' },
+              },
+            },
+          },
+        },
+        {
+          pluginId: 'pluginC',
           properties: {
             typeC: {
               properties: {
@@ -92,6 +102,16 @@ describe('convertLegacyTypes', () => {
             },
           },
         },
+        {
+          pluginId: 'pluginD',
+          properties: {
+            typeD: {
+              properties: {
+                fieldD: { type: 'text' },
+              },
+            },
+          },
+        },
       ],
       savedObjectMigrations: {},
       savedObjectSchemas: {
@@ -100,6 +120,18 @@ describe('convertLegacyTypes', () => {
           hidden: true,
           isNamespaceAgnostic: true,
         },
+        typeB: {
+          indexPattern: 'barBaz',
+          hidden: false,
+          multiNamespace: true,
+        },
+        typeD: {
+          indexPattern: 'bazQux',
+          hidden: false,
+          // if both isNamespaceAgnostic and multiNamespace are true, the resulting namespaceType is 'agnostic'
+          isNamespaceAgnostic: true,
+          multiNamespace: true,
+        },
       },
       savedObjectValidations: {},
       savedObjectsManagement: {},
@@ -372,29 +404,56 @@ describe('convertTypesToLegacySchema', () => {
       {
         name: 'typeA',
         hidden: false,
-        namespaceAgnostic: true,
+        namespaceType: 'agnostic',
         mappings: { properties: {} },
         convertToAliasScript: 'some script',
       },
       {
         name: 'typeB',
         hidden: true,
-        namespaceAgnostic: false,
+        namespaceType: 'single',
         indexPattern: 'myIndex',
         mappings: { properties: {} },
       },
+      {
+        name: 'typeC',
+        hidden: false,
+        namespaceType: 'multiple',
+        mappings: { properties: {} },
+      },
+      // deprecated test case
+      {
+        name: 'typeD',
+        hidden: false,
+        namespaceAgnostic: true,
+        namespaceType: 'multiple', // if namespaceAgnostic and namespaceType are both set, namespaceAgnostic takes precedence
+        mappings: { properties: {} },
+      },
     ];
     expect(convertTypesToLegacySchema(types)).toEqual({
       typeA: {
         hidden: false,
         isNamespaceAgnostic: true,
+        multiNamespace: false,
         convertToAliasScript: 'some script',
       },
       typeB: {
         hidden: true,
         isNamespaceAgnostic: false,
+        multiNamespace: false,
         indexPattern: 'myIndex',
       },
+      typeC: {
+        hidden: false,
+        isNamespaceAgnostic: false,
+        multiNamespace: true,
+      },
+      // deprecated test case
+      typeD: {
+        hidden: false,
+        isNamespaceAgnostic: true,
+        multiNamespace: false,
+      },
     });
   });
 });
diff --git a/src/core/server/saved_objects/utils.ts b/src/core/server/saved_objects/utils.ts
index ea90efd8b9fbd..5348963812629 100644
--- a/src/core/server/saved_objects/utils.ts
+++ b/src/core/server/saved_objects/utils.ts
@@ -20,6 +20,7 @@
 import { LegacyConfig } from '../legacy';
 import { SavedObjectMigrationMap } from './migrations';
 import {
+  SavedObjectsNamespaceType,
   SavedObjectsType,
   SavedObjectsLegacyUiExports,
   SavedObjectLegacyMigrationMap,
@@ -48,10 +49,15 @@ export const convertLegacyTypes = (
         const schema = savedObjectSchemas[type];
         const migrations = savedObjectMigrations[type];
         const management = savedObjectsManagement[type];
+        const namespaceType = (schema?.isNamespaceAgnostic
+          ? 'agnostic'
+          : schema?.multiNamespace
+          ? 'multiple'
+          : 'single') as SavedObjectsNamespaceType;
         return {
           name: type,
           hidden: schema?.hidden ?? false,
-          namespaceAgnostic: schema?.isNamespaceAgnostic ?? false,
+          namespaceType,
           mappings,
           indexPattern:
             typeof schema?.indexPattern === 'function'
@@ -76,7 +82,8 @@ export const convertTypesToLegacySchema = (
     return {
       ...schema,
       [type.name]: {
-        isNamespaceAgnostic: type.namespaceAgnostic,
+        isNamespaceAgnostic: type.namespaceAgnostic || type.namespaceType === 'agnostic',
+        multiNamespace: !type.namespaceAgnostic && type.namespaceType === 'multiple',
         hidden: type.hidden,
         indexPattern: type.indexPattern,
         convertToAliasScript: type.convertToAliasScript,
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index f3e3b7736d8d3..a35bca7375286 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1003,7 +1003,7 @@ export type IsAuthenticated = (request: KibanaRequest | LegacyRequest) => boolea
 export type ISavedObjectsRepository = Pick<SavedObjectsRepository, keyof SavedObjectsRepository>;
 
 // @public
-export type ISavedObjectTypeRegistry = Pick<SavedObjectTypeRegistry, 'getType' | 'getAllTypes' | 'getIndex' | 'isNamespaceAgnostic' | 'isHidden' | 'getImportableAndExportableTypes' | 'isImportableAndExportable'>;
+export type ISavedObjectTypeRegistry = Omit<SavedObjectTypeRegistry, 'registerType'>;
 
 // @public
 export type IScopedClusterClient = Pick<ScopedClusterClient, 'callAsCurrentUser' | 'callAsInternalUser'>;
@@ -1643,6 +1643,7 @@ export interface SavedObject<T = unknown> {
     };
     id: string;
     migrationVersion?: SavedObjectsMigrationVersion;
+    namespaces?: string[];
     references: SavedObjectReference[];
     type: string;
     updated_at?: string;
@@ -1687,6 +1688,12 @@ export interface SavedObjectReference {
     type: string;
 }
 
+// @public (undocumented)
+export interface SavedObjectsAddToNamespacesOptions extends SavedObjectsBaseOptions {
+    refresh?: MutatingOperationRefreshSetting;
+    version?: string;
+}
+
 // Warning: (ae-forgotten-export) The symbol "SavedObjectDoc" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "Referencable" needs to be exported by the entry point index.d.ts
 //
@@ -1754,11 +1761,13 @@ export interface SavedObjectsBulkUpdateResponse<T = unknown> {
 export class SavedObjectsClient {
     // @internal
     constructor(repository: ISavedObjectsRepository);
+    addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<{}>;
     bulkCreate<T = unknown>(objects: Array<SavedObjectsBulkCreateObject<T>>, options?: SavedObjectsCreateOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkGet<T = unknown>(objects?: SavedObjectsBulkGetObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkUpdate<T = unknown>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
     create<T = unknown>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
     delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
+    deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
     // (undocumented)
     static errors: typeof SavedObjectsErrorHelpers;
     // (undocumented)
@@ -1839,6 +1848,11 @@ export interface SavedObjectsDeleteByNamespaceOptions extends SavedObjectsBaseOp
     refresh?: MutatingOperationRefreshSetting;
 }
 
+// @public (undocumented)
+export interface SavedObjectsDeleteFromNamespacesOptions extends SavedObjectsBaseOptions {
+    refresh?: MutatingOperationRefreshSetting;
+}
+
 // @public (undocumented)
 export interface SavedObjectsDeleteOptions extends SavedObjectsBaseOptions {
     refresh?: MutatingOperationRefreshSetting;
@@ -1849,6 +1863,8 @@ export class SavedObjectsErrorHelpers {
     // (undocumented)
     static createBadRequestError(reason?: string): DecoratedError;
     // (undocumented)
+    static createConflictError(type: string, id: string): DecoratedError;
+    // (undocumented)
     static createEsAutoCreateIndexError(): DecoratedError;
     // (undocumented)
     static createGenericNotFoundError(type?: string | null, id?: string | null): DecoratedError;
@@ -1861,6 +1877,8 @@ export class SavedObjectsErrorHelpers {
     // (undocumented)
     static decorateConflictError(error: Error, reason?: string): DecoratedError;
     // (undocumented)
+    static decorateEsCannotExecuteScriptError(error: Error, reason?: string): DecoratedError;
+    // (undocumented)
     static decorateEsUnavailableError(error: Error, reason?: string): DecoratedError;
     // (undocumented)
     static decorateForbiddenError(error: Error, reason?: string): DecoratedError;
@@ -1877,6 +1895,8 @@ export class SavedObjectsErrorHelpers {
     // (undocumented)
     static isEsAutoCreateIndexError(error: Error | DecoratedError): boolean;
     // (undocumented)
+    static isEsCannotExecuteScriptError(error: Error | DecoratedError): boolean;
+    // (undocumented)
     static isEsUnavailableError(error: Error | DecoratedError): boolean;
     // (undocumented)
     static isForbiddenError(error: Error | DecoratedError): boolean;
@@ -2106,6 +2126,9 @@ export interface SavedObjectsMigrationVersion {
     [pluginName: string]: string;
 }
 
+// @public
+export type SavedObjectsNamespaceType = 'single' | 'multiple' | 'agnostic';
+
 // @public
 export interface SavedObjectsRawDoc {
     // (undocumented)
@@ -2124,6 +2147,7 @@ export interface SavedObjectsRawDoc {
 
 // @public (undocumented)
 export class SavedObjectsRepository {
+    addToNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsAddToNamespacesOptions): Promise<{}>;
     bulkCreate<T = unknown>(objects: Array<SavedObjectsBulkCreateObject<T>>, options?: SavedObjectsCreateOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkGet<T = unknown>(objects?: SavedObjectsBulkGetObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkUpdate<T = unknown>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
@@ -2134,6 +2158,7 @@ export class SavedObjectsRepository {
     static createRepository(migrator: KibanaMigrator, typeRegistry: SavedObjectTypeRegistry, indexName: string, callCluster: APICaller, extraTypes?: string[], injectedConstructor?: any): ISavedObjectsRepository;
     delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
     deleteByNamespace(namespace: string, options?: SavedObjectsDeleteByNamespaceOptions): Promise<any>;
+    deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
     // (undocumented)
     find<T = unknown>({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespace, type, filter, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
     get<T = unknown>(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<SavedObject<T>>;
@@ -2175,7 +2200,11 @@ export class SavedObjectsSchema {
     // (undocumented)
     isHiddenType(type: string): boolean;
     // (undocumented)
+    isMultiNamespace(type: string): boolean;
+    // (undocumented)
     isNamespaceAgnostic(type: string): boolean;
+    // (undocumented)
+    isSingleNamespace(type: string): boolean;
 }
 
 // @public
@@ -2224,7 +2253,9 @@ export interface SavedObjectsType {
     mappings: SavedObjectsTypeMappingDefinition;
     migrations?: SavedObjectMigrationMap;
     name: string;
-    namespaceAgnostic: boolean;
+    // @deprecated
+    namespaceAgnostic?: boolean;
+    namespaceType?: SavedObjectsNamespaceType;
 }
 
 // @public
@@ -2269,7 +2300,9 @@ export class SavedObjectTypeRegistry {
     getType(type: string): SavedObjectsType | undefined;
     isHidden(type: string): boolean;
     isImportableAndExportable(type: string): boolean;
+    isMultiNamespace(type: string): boolean;
     isNamespaceAgnostic(type: string): boolean;
+    isSingleNamespace(type: string): boolean;
     registerType(type: SavedObjectsType): void;
     }
 
diff --git a/src/core/types/saved_objects.ts b/src/core/types/saved_objects.ts
index d3faab6c557cd..04aaacc3cf31a 100644
--- a/src/core/types/saved_objects.ts
+++ b/src/core/types/saved_objects.ts
@@ -96,4 +96,6 @@ export interface SavedObject<T = unknown> {
   references: SavedObjectReference[];
   /** {@inheritdoc SavedObjectsMigrationVersion} */
   migrationVersion?: SavedObjectsMigrationVersion;
+  /** Namespace(s) that this saved object exists in. This attribute is only used for multi-namespace saved object types. */
+  namespaces?: string[];
 }
diff --git a/test/api_integration/apis/saved_objects/bulk_create.js b/test/api_integration/apis/saved_objects/bulk_create.js
index afa5153336ff7..2d77fdf266793 100644
--- a/test/api_integration/apis/saved_objects/bulk_create.js
+++ b/test/api_integration/apis/saved_objects/bulk_create.js
@@ -58,7 +58,9 @@ export default function({ getService }) {
                   type: 'visualization',
                   id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
                   error: {
-                    message: 'version conflict, document already exists',
+                    error: 'Conflict',
+                    message:
+                      'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] conflict',
                     statusCode: 409,
                   },
                 },
diff --git a/test/api_integration/apis/saved_objects/bulk_get.js b/test/api_integration/apis/saved_objects/bulk_get.js
index 984ac781d3e46..67e511f2bf548 100644
--- a/test/api_integration/apis/saved_objects/bulk_get.js
+++ b/test/api_integration/apis/saved_objects/bulk_get.js
@@ -80,8 +80,9 @@ export default function({ getService }) {
                   id: 'does not exist',
                   type: 'dashboard',
                   error: {
+                    error: 'Not Found',
+                    message: 'Saved object [dashboard/does not exist] not found',
                     statusCode: 404,
-                    message: 'Not found',
                   },
                 },
                 {
@@ -123,24 +124,28 @@ export default function({ getService }) {
                   id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
                   type: 'visualization',
                   error: {
+                    error: 'Not Found',
+                    message:
+                      'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] not found',
                     statusCode: 404,
-                    message: 'Not found',
                   },
                 },
                 {
                   id: 'does not exist',
                   type: 'dashboard',
                   error: {
+                    error: 'Not Found',
+                    message: 'Saved object [dashboard/does not exist] not found',
                     statusCode: 404,
-                    message: 'Not found',
                   },
                 },
                 {
                   id: '7.0.0-alpha1',
                   type: 'config',
                   error: {
+                    error: 'Not Found',
+                    message: 'Saved object [config/7.0.0-alpha1] not found',
                     statusCode: 404,
-                    message: 'Not found',
                   },
                 },
               ],
diff --git a/test/api_integration/apis/saved_objects/export.js b/test/api_integration/apis/saved_objects/export.js
index fc9ab8140869c..9558e82880deb 100644
--- a/test/api_integration/apis/saved_objects/export.js
+++ b/test/api_integration/apis/saved_objects/export.js
@@ -170,8 +170,9 @@ export default function({ getService }) {
                       id: '1',
                       type: 'dashboard',
                       error: {
+                        error: 'Not Found',
+                        message: 'Saved object [dashboard/1] not found',
                         statusCode: 404,
-                        message: 'Not found',
                       },
                     },
                   ],
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
index f691e62b9352a..2caf3a7055df9 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
@@ -10,14 +10,16 @@ import { SavedObjectsClientContract } from 'src/core/server';
 import { EncryptedSavedObjectsService } from '../crypto';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from 'src/core/server/mocks';
 import { encryptedSavedObjectsServiceMock } from '../crypto/index.mock';
 
 let wrapper: EncryptedSavedObjectsClientWrapper;
 let mockBaseClient: jest.Mocked<SavedObjectsClientContract>;
+let mockBaseTypeRegistry: ReturnType<typeof savedObjectsTypeRegistryMock.create>;
 let encryptedSavedObjectsServiceMockInstance: jest.Mocked<EncryptedSavedObjectsService>;
 beforeEach(() => {
   mockBaseClient = savedObjectsClientMock.create();
+  mockBaseTypeRegistry = savedObjectsTypeRegistryMock.create();
   encryptedSavedObjectsServiceMockInstance = encryptedSavedObjectsServiceMock.create([
     {
       type: 'known-type',
@@ -28,6 +30,7 @@ beforeEach(() => {
   wrapper = new EncryptedSavedObjectsClientWrapper({
     service: encryptedSavedObjectsServiceMockInstance,
     baseClient: mockBaseClient,
+    baseTypeRegistry: mockBaseTypeRegistry,
   } as any);
 });
 
@@ -91,35 +94,50 @@ describe('#create', () => {
     );
   });
 
-  it('uses `namespace` to encrypt attributes if it is specified', async () => {
-    const attributes = { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' };
-    const options = { overwrite: true, namespace: 'some-namespace' };
-    const mockedResponse = {
-      id: 'uuid-v4-id',
-      type: 'known-type',
-      attributes: { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
-      references: [],
-    };
+  describe('namespace', () => {
+    const doTest = async (namespace: string, expectNamespaceInDescriptor: boolean) => {
+      const attributes = { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' };
+      const options = { overwrite: true, namespace };
+      const mockedResponse = {
+        id: 'uuid-v4-id',
+        type: 'known-type',
+        attributes: { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
+        references: [],
+      };
 
-    mockBaseClient.create.mockResolvedValue(mockedResponse);
+      mockBaseClient.create.mockResolvedValue(mockedResponse);
 
-    expect(await wrapper.create('known-type', attributes, options)).toEqual({
-      ...mockedResponse,
-      attributes: { attrOne: 'one', attrThree: 'three' },
-    });
+      expect(await wrapper.create('known-type', attributes, options)).toEqual({
+        ...mockedResponse,
+        attributes: { attrOne: 'one', attrThree: 'three' },
+      });
 
-    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
-      { type: 'known-type', id: 'uuid-v4-id', namespace: 'some-namespace' },
-      { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
-    );
+      expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+      expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
+        {
+          type: 'known-type',
+          id: 'uuid-v4-id',
+          namespace: expectNamespaceInDescriptor ? namespace : undefined,
+        },
+        { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
+      );
 
-    expect(mockBaseClient.create).toHaveBeenCalledTimes(1);
-    expect(mockBaseClient.create).toHaveBeenCalledWith(
-      'known-type',
-      { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
-      { id: 'uuid-v4-id', overwrite: true, namespace: 'some-namespace' }
-    );
+      expect(mockBaseClient.create).toHaveBeenCalledTimes(1);
+      expect(mockBaseClient.create).toHaveBeenCalledWith(
+        'known-type',
+        { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
+        { id: 'uuid-v4-id', overwrite: true, namespace }
+      );
+    };
+
+    it('uses `namespace` to encrypt attributes if it is specified when type is single-namespace', async () => {
+      await doTest('some-namespace', true);
+    });
+
+    it('does not use `namespace` to encrypt attributes if it is specified when type is not single-namespace', async () => {
+      mockBaseTypeRegistry.isSingleNamespace.mockReturnValue(false);
+      await doTest('some-namespace', false);
+    });
   });
 
   it('fails if base client fails', async () => {
@@ -190,14 +208,13 @@ describe('#bulkCreate', () => {
 
   it('fails if ID is specified for registered type', async () => {
     const attributes = { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' };
-    const options = { namespace: 'some-namespace' };
 
     const bulkCreateParams = [
       { id: 'some-id', type: 'known-type', attributes },
       { type: 'unknown-type', attributes },
     ];
 
-    await expect(wrapper.bulkCreate(bulkCreateParams, options)).rejects.toThrowError(
+    await expect(wrapper.bulkCreate(bulkCreateParams)).rejects.toThrowError(
       'Predefined IDs are not allowed for saved objects with encrypted attributes.'
     );
 
@@ -257,39 +274,57 @@ describe('#bulkCreate', () => {
     );
   });
 
-  it('uses `namespace` to encrypt attributes if it is specified', async () => {
-    const attributes = { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' };
-    const options = { namespace: 'some-namespace' };
-    const mockedResponse = {
-      saved_objects: [{ id: 'uuid-v4-id', type: 'known-type', attributes, references: [] }],
-    };
+  describe('namespace', () => {
+    const doTest = async (namespace: string, expectNamespaceInDescriptor: boolean) => {
+      const attributes = { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' };
+      const options = { namespace };
+      const mockedResponse = {
+        saved_objects: [{ id: 'uuid-v4-id', type: 'known-type', attributes, references: [] }],
+      };
+
+      mockBaseClient.bulkCreate.mockResolvedValue(mockedResponse);
+
+      const bulkCreateParams = [{ type: 'known-type', attributes }];
+      await expect(wrapper.bulkCreate(bulkCreateParams, options)).resolves.toEqual({
+        saved_objects: [
+          {
+            ...mockedResponse.saved_objects[0],
+            attributes: { attrOne: 'one', attrThree: 'three' },
+          },
+        ],
+      });
 
-    mockBaseClient.bulkCreate.mockResolvedValue(mockedResponse);
+      expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+      expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
+        {
+          type: 'known-type',
+          id: 'uuid-v4-id',
+          namespace: expectNamespaceInDescriptor ? namespace : undefined,
+        },
+        { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
+      );
+
+      expect(mockBaseClient.bulkCreate).toHaveBeenCalledTimes(1);
+      expect(mockBaseClient.bulkCreate).toHaveBeenCalledWith(
+        [
+          {
+            ...bulkCreateParams[0],
+            id: 'uuid-v4-id',
+            attributes: { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
+          },
+        ],
+        options
+      );
+    };
 
-    const bulkCreateParams = [{ type: 'known-type', attributes }];
-    await expect(wrapper.bulkCreate(bulkCreateParams, options)).resolves.toEqual({
-      saved_objects: [
-        { ...mockedResponse.saved_objects[0], attributes: { attrOne: 'one', attrThree: 'three' } },
-      ],
+    it('uses `namespace` to encrypt attributes if it is specified when type is single-namespace', async () => {
+      await doTest('some-namespace', true);
     });
 
-    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
-      { type: 'known-type', id: 'uuid-v4-id', namespace: 'some-namespace' },
-      { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
-    );
-
-    expect(mockBaseClient.bulkCreate).toHaveBeenCalledTimes(1);
-    expect(mockBaseClient.bulkCreate).toHaveBeenCalledWith(
-      [
-        {
-          ...bulkCreateParams[0],
-          id: 'uuid-v4-id',
-          attributes: { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
-        },
-      ],
-      options
-    );
+    it('does not use `namespace` to encrypt attributes if it is specified when type is not single-namespace', async () => {
+      mockBaseTypeRegistry.isSingleNamespace.mockReturnValue(false);
+      await doTest('some-namespace', false);
+    });
   });
 
   it('fails if base client fails', async () => {
@@ -432,63 +467,79 @@ describe('#bulkUpdate', () => {
     );
   });
 
-  it('uses `namespace` to encrypt attributes if it is specified', async () => {
-    const docs = [
-      {
-        id: 'some-id',
-        type: 'known-type',
-        attributes: {
-          attrOne: 'one',
-          attrSecret: 'secret',
-          attrThree: 'three',
-        },
-        version: 'some-version',
-      },
-    ];
-
-    mockBaseClient.bulkUpdate.mockResolvedValue({
-      saved_objects: docs.map(doc => ({ ...doc, references: undefined })),
-    });
-
-    await expect(wrapper.bulkUpdate(docs, { namespace: 'some-namespace' })).resolves.toEqual({
-      saved_objects: [
+  describe('namespace', () => {
+    const doTest = async (namespace: string, expectNamespaceInDescriptor: boolean) => {
+      const docs = [
         {
           id: 'some-id',
           type: 'known-type',
           attributes: {
             attrOne: 'one',
+            attrSecret: 'secret',
             attrThree: 'three',
           },
           version: 'some-version',
-          references: undefined,
         },
-      ],
-    });
-
-    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
-      { type: 'known-type', id: 'some-id', namespace: 'some-namespace' },
-      { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
-    );
+      ];
+      const options = { namespace };
+
+      mockBaseClient.bulkUpdate.mockResolvedValue({
+        saved_objects: docs.map(doc => ({ ...doc, references: undefined })),
+      });
+
+      await expect(wrapper.bulkUpdate(docs, options)).resolves.toEqual({
+        saved_objects: [
+          {
+            id: 'some-id',
+            type: 'known-type',
+            attributes: {
+              attrOne: 'one',
+              attrThree: 'three',
+            },
+            version: 'some-version',
+            references: undefined,
+          },
+        ],
+      });
 
-    expect(mockBaseClient.bulkUpdate).toHaveBeenCalledTimes(1);
-    expect(mockBaseClient.bulkUpdate).toHaveBeenCalledWith(
-      [
+      expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+      expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
         {
-          id: 'some-id',
           type: 'known-type',
-          attributes: {
-            attrOne: 'one',
-            attrSecret: '*secret*',
-            attrThree: 'three',
+          id: 'some-id',
+          namespace: expectNamespaceInDescriptor ? namespace : undefined,
+        },
+        { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
+      );
+
+      expect(mockBaseClient.bulkUpdate).toHaveBeenCalledTimes(1);
+      expect(mockBaseClient.bulkUpdate).toHaveBeenCalledWith(
+        [
+          {
+            id: 'some-id',
+            type: 'known-type',
+            attributes: {
+              attrOne: 'one',
+              attrSecret: '*secret*',
+              attrThree: 'three',
+            },
+            version: 'some-version',
+
+            references: undefined,
           },
-          version: 'some-version',
+        ],
+        options
+      );
+    };
 
-          references: undefined,
-        },
-      ],
-      { namespace: 'some-namespace' }
-    );
+    it('uses `namespace` to encrypt attributes if it is specified when type is single-namespace', async () => {
+      await doTest('some-namespace', true);
+    });
+
+    it('does not use `namespace` to encrypt attributes if it is specified when type is not single-namespace', async () => {
+      mockBaseTypeRegistry.isSingleNamespace.mockReturnValue(false);
+      await doTest('some-namespace', false);
+    });
   });
 
   it('fails if base client fails', async () => {
@@ -871,31 +922,46 @@ describe('#update', () => {
     );
   });
 
-  it('uses `namespace` to encrypt attributes if it is specified', async () => {
-    const attributes = { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' };
-    const options = { version: 'some-version', namespace: 'some-namespace' };
-    const mockedResponse = { id: 'some-id', type: 'known-type', attributes, references: [] };
+  describe('namespace', () => {
+    const doTest = async (namespace: string, expectNamespaceInDescriptor: boolean) => {
+      const attributes = { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' };
+      const options = { version: 'some-version', namespace };
+      const mockedResponse = { id: 'some-id', type: 'known-type', attributes, references: [] };
 
-    mockBaseClient.update.mockResolvedValue(mockedResponse);
+      mockBaseClient.update.mockResolvedValue(mockedResponse);
 
-    await expect(wrapper.update('known-type', 'some-id', attributes, options)).resolves.toEqual({
-      ...mockedResponse,
-      attributes: { attrOne: 'one', attrThree: 'three' },
-    });
+      await expect(wrapper.update('known-type', 'some-id', attributes, options)).resolves.toEqual({
+        ...mockedResponse,
+        attributes: { attrOne: 'one', attrThree: 'three' },
+      });
 
-    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
-      { type: 'known-type', id: 'some-id', namespace: 'some-namespace' },
-      { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
-    );
+      expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+      expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
+        {
+          type: 'known-type',
+          id: 'some-id',
+          namespace: expectNamespaceInDescriptor ? namespace : undefined,
+        },
+        { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
+      );
+
+      expect(mockBaseClient.update).toHaveBeenCalledTimes(1);
+      expect(mockBaseClient.update).toHaveBeenCalledWith(
+        'known-type',
+        'some-id',
+        { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
+        options
+      );
+    };
 
-    expect(mockBaseClient.update).toHaveBeenCalledTimes(1);
-    expect(mockBaseClient.update).toHaveBeenCalledWith(
-      'known-type',
-      'some-id',
-      { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
-      options
-    );
+    it('uses `namespace` to encrypt attributes if it is specified when type is single-namespace', async () => {
+      await doTest('some-namespace', true);
+    });
+
+    it('does not use `namespace` to encrypt attributes if it is specified when type is not single-namespace', async () => {
+      mockBaseTypeRegistry.isSingleNamespace.mockReturnValue(false);
+      await doTest('some-namespace', false);
+    });
   });
 
   it('fails if base client fails', async () => {
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
index b4f1de52c9ce3..e8197536d29d9 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
@@ -19,11 +19,15 @@ import {
   SavedObjectsFindResponse,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
+  SavedObjectsAddToNamespacesOptions,
+  SavedObjectsDeleteFromNamespacesOptions,
+  ISavedObjectTypeRegistry,
 } from 'src/core/server';
 import { EncryptedSavedObjectsService } from '../crypto';
 
 interface EncryptedSavedObjectsClientOptions {
   baseClient: SavedObjectsClientContract;
+  baseTypeRegistry: ISavedObjectTypeRegistry;
   service: Readonly<EncryptedSavedObjectsService>;
 }
 
@@ -41,6 +45,10 @@ export class EncryptedSavedObjectsClientWrapper implements SavedObjectsClientCon
     public readonly errors = options.baseClient.errors
   ) {}
 
+  // only include namespace in AAD descriptor if the specified type is single-namespace
+  private getDescriptorNamespace = (type: string, namespace?: string) =>
+    this.options.baseTypeRegistry.isSingleNamespace(type) ? namespace : undefined;
+
   public async create<T = unknown>(
     type: string,
     attributes: T = {} as T,
@@ -60,11 +68,12 @@ export class EncryptedSavedObjectsClientWrapper implements SavedObjectsClientCon
     }
 
     const id = generateID();
+    const namespace = this.getDescriptorNamespace(type, options.namespace);
     return this.stripEncryptedAttributesFromResponse(
       await this.options.baseClient.create(
         type,
         await this.options.service.encryptAttributes(
-          { type, id, namespace: options.namespace },
+          { type, id, namespace },
           attributes as Record<string, unknown>
         ),
         { ...options, id }
@@ -95,11 +104,12 @@ export class EncryptedSavedObjectsClientWrapper implements SavedObjectsClientCon
         }
 
         const id = generateID();
+        const namespace = this.getDescriptorNamespace(object.type, options?.namespace);
         return {
           ...object,
           id,
           attributes: await this.options.service.encryptAttributes(
-            { type: object.type, id, namespace: options && options.namespace },
+            { type: object.type, id, namespace },
             object.attributes as Record<string, unknown>
           ),
         } as SavedObjectsBulkCreateObject<T>;
@@ -124,10 +134,11 @@ export class EncryptedSavedObjectsClientWrapper implements SavedObjectsClientCon
         if (!this.options.service.isRegistered(type)) {
           return object;
         }
+        const namespace = this.getDescriptorNamespace(type, options?.namespace);
         return {
           ...object,
           attributes: await this.options.service.encryptAttributes(
-            { type, id, namespace: options && options.namespace },
+            { type, id, namespace },
             attributes
           ),
         };
@@ -173,20 +184,35 @@ export class EncryptedSavedObjectsClientWrapper implements SavedObjectsClientCon
     if (!this.options.service.isRegistered(type)) {
       return await this.options.baseClient.update(type, id, attributes, options);
     }
-
+    const namespace = this.getDescriptorNamespace(type, options?.namespace);
     return this.stripEncryptedAttributesFromResponse(
       await this.options.baseClient.update(
         type,
         id,
-        await this.options.service.encryptAttributes(
-          { type, id, namespace: options && options.namespace },
-          attributes
-        ),
+        await this.options.service.encryptAttributes({ type, id, namespace }, attributes),
         options
       )
     );
   }
 
+  public async addToNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options?: SavedObjectsAddToNamespacesOptions
+  ) {
+    return await this.options.baseClient.addToNamespaces(type, id, namespaces, options);
+  }
+
+  public async deleteFromNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options?: SavedObjectsDeleteFromNamespacesOptions
+  ) {
+    return await this.options.baseClient.deleteFromNamespaces(type, id, namespaces, options);
+  }
+
   /**
    * Strips encrypted attributes from any non-bulk Saved Objects API response. If type isn't
    * registered, response is returned as is.
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
index c76477cd8da43..10599ae3a1798 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
@@ -40,7 +40,8 @@ export function setupSavedObjects({
   savedObjects.addClientWrapper(
     Number.MAX_SAFE_INTEGER,
     'encryptedSavedObjects',
-    ({ client: baseClient }) => new EncryptedSavedObjectsClientWrapper({ baseClient, service })
+    ({ client: baseClient, typeRegistry: baseTypeRegistry }) =>
+      new EncryptedSavedObjectsClientWrapper({ baseClient, baseTypeRegistry, service })
   );
 
   const internalRepositoryPromise = getStartServices().then(([core]) =>
diff --git a/x-pack/plugins/security/server/audit/audit_logger.test.ts b/x-pack/plugins/security/server/audit/audit_logger.test.ts
index 01cde02b7dfdd..f7ee210a21a74 100644
--- a/x-pack/plugins/security/server/audit/audit_logger.test.ts
+++ b/x-pack/plugins/security/server/audit/audit_logger.test.ts
@@ -18,25 +18,46 @@ describe(`#savedObjectsAuthorizationFailure`, () => {
     const username = 'foo-user';
     const action = 'foo-action';
     const types = ['foo-type-1', 'foo-type-2'];
-    const missing = [`saved_object:${types[0]}/foo-action`, `saved_object:${types[1]}/foo-action`];
+    const spaceIds = ['foo-space', 'bar-space'];
+    const missing = [
+      {
+        spaceId: 'foo-space',
+        privilege: `saved_object:${types[0]}/${action}`,
+      },
+      {
+        spaceId: 'foo-space',
+        privilege: `saved_object:${types[1]}/${action}`,
+      },
+    ];
     const args = {
       foo: 'bar',
       baz: 'quz',
     };
 
-    securityAuditLogger.savedObjectsAuthorizationFailure(username, action, types, missing, args);
+    securityAuditLogger.savedObjectsAuthorizationFailure(
+      username,
+      action,
+      types,
+      spaceIds,
+      missing,
+      args
+    );
 
     expect(auditLogger.log).toHaveBeenCalledWith(
       'saved_objects_authorization_failure',
-      expect.stringContaining(`${username} unauthorized to ${action}`),
+      expect.any(String),
       {
         username,
         action,
         types,
+        spaceIds,
         missing,
         args,
       }
     );
+    expect(auditLogger.log.mock.calls[0][1]).toMatchInlineSnapshot(
+      `"foo-user unauthorized to [foo-action] [foo-type-1,foo-type-2] in [foo-space,bar-space]: missing [(foo-space)saved_object:foo-type-1/foo-action,(foo-space)saved_object:foo-type-2/foo-action]"`
+    );
   });
 });
 
@@ -47,22 +68,27 @@ describe(`#savedObjectsAuthorizationSuccess`, () => {
     const username = 'foo-user';
     const action = 'foo-action';
     const types = ['foo-type-1', 'foo-type-2'];
+    const spaceIds = ['foo-space', 'bar-space'];
     const args = {
       foo: 'bar',
       baz: 'quz',
     };
 
-    securityAuditLogger.savedObjectsAuthorizationSuccess(username, action, types, args);
+    securityAuditLogger.savedObjectsAuthorizationSuccess(username, action, types, spaceIds, args);
 
     expect(auditLogger.log).toHaveBeenCalledWith(
       'saved_objects_authorization_success',
-      expect.stringContaining(`${username} authorized to ${action}`),
+      expect.any(String),
       {
         username,
         action,
         types,
+        spaceIds,
         args,
       }
     );
+    expect(auditLogger.log.mock.calls[0][1]).toMatchInlineSnapshot(
+      `"foo-user authorized to [foo-action] [foo-type-1,foo-type-2] in [foo-space,bar-space]"`
+    );
   });
 });
diff --git a/x-pack/plugins/security/server/audit/audit_logger.ts b/x-pack/plugins/security/server/audit/audit_logger.ts
index df8df35f97b49..40b525b5d2188 100644
--- a/x-pack/plugins/security/server/audit/audit_logger.ts
+++ b/x-pack/plugins/security/server/audit/audit_logger.ts
@@ -13,16 +13,23 @@ export class SecurityAuditLogger {
     username: string,
     action: string,
     types: string[],
-    missing: string[],
+    spaceIds: string[],
+    missing: Array<{ spaceId?: string; privilege: string }>,
     args?: Record<string, unknown>
   ) {
+    const typesString = types.join(',');
+    const spacesString = spaceIds.length ? ` in [${spaceIds.join(',')}]` : '';
+    const missingString = missing
+      .map(({ spaceId, privilege }) => `${spaceId ? `(${spaceId})` : ''}${privilege}`)
+      .join(',');
     this.getAuditLogger().log(
       'saved_objects_authorization_failure',
-      `${username} unauthorized to ${action} ${types.join(',')}, missing ${missing.join(',')}`,
+      `${username} unauthorized to [${action}] [${typesString}]${spacesString}: missing [${missingString}]`,
       {
         username,
         action,
         types,
+        spaceIds,
         missing,
         args,
       }
@@ -33,15 +40,19 @@ export class SecurityAuditLogger {
     username: string,
     action: string,
     types: string[],
+    spaceIds: string[],
     args?: Record<string, unknown>
   ) {
+    const typesString = types.join(',');
+    const spacesString = spaceIds.length ? ` in [${spaceIds.join(',')}]` : '';
     this.getAuditLogger().log(
       'saved_objects_authorization_success',
-      `${username} authorized to ${action} ${types.join(',')}`,
+      `${username} authorized to [${action}] [${typesString}]${spacesString}`,
       {
         username,
         action,
         types,
+        spaceIds,
         args,
       }
     );
diff --git a/x-pack/plugins/security/server/authorization/__snapshots__/check_privileges.test.ts.snap b/x-pack/plugins/security/server/authorization/__snapshots__/check_privileges.test.ts.snap
deleted file mode 100644
index 1212c2cd6a5cb..0000000000000
--- a/x-pack/plugins/security/server/authorization/__snapshots__/check_privileges.test.ts.snap
+++ /dev/null
@@ -1,27 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`#atSpace throws error when checking for login and user has login but doesn't have version 1`] = `[Error: Multiple versions of Kibana are running against the same Elasticsearch cluster, unable to authorize user.]`;
-
-exports[`#atSpace with a malformed Elasticsearch response throws a validation error when an extra privilege is present in the response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because ["saved_object:bar-type/get" is not allowed]]]]`;
-
-exports[`#atSpace with a malformed Elasticsearch response throws a validation error when privileges are missing in the response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because [child "saved_object:foo-type/get" fails because ["saved_object:foo-type/get" is required]]]]]`;
-
-exports[`#atSpaces throws error when Elasticsearch returns malformed response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because [child "mock-action:version" fails because ["mock-action:version" is required]]]]]`;
-
-exports[`#atSpaces throws error when checking for login and user has login but doesn't have version 1`] = `[Error: Multiple versions of Kibana are running against the same Elasticsearch cluster, unable to authorize user.]`;
-
-exports[`#atSpaces with a malformed Elasticsearch response throws a validation error when an a space is missing in the response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]`;
-
-exports[`#atSpaces with a malformed Elasticsearch response throws a validation error when an extra privilege is present in the response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]`;
-
-exports[`#atSpaces with a malformed Elasticsearch response throws a validation error when an extra space is present in the response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because ["space:space_3" is not allowed]]]`;
-
-exports[`#atSpaces with a malformed Elasticsearch response throws a validation error when privileges are missing in the response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]`;
-
-exports[`#globally throws error when Elasticsearch returns malformed response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because [child "mock-action:version" fails because ["mock-action:version" is required]]]]]`;
-
-exports[`#globally throws error when checking for login and user has login but doesn't have version 1`] = `[Error: Multiple versions of Kibana are running against the same Elasticsearch cluster, unable to authorize user.]`;
-
-exports[`#globally with a malformed Elasticsearch response throws a validation error when an extra privilege is present in the response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because ["saved_object:bar-type/get" is not allowed]]]]`;
-
-exports[`#globally with a malformed Elasticsearch response throws a validation error when privileges are missing in the response 1`] = `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because [child "saved_object:foo-type/get" fails because ["saved_object:foo-type/get" is required]]]]]`;
diff --git a/x-pack/plugins/security/server/authorization/check_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_privileges.test.ts
index 8c1241937892e..a64c5d509ca11 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges.test.ts
@@ -31,123 +31,121 @@ const createMockClusterClient = (response: any) => {
 };
 
 describe('#atSpace', () => {
-  const checkPrivilegesAtSpaceTest = (
-    description: string,
-    options: {
-      spaceId: string;
-      privilegeOrPrivileges: string | string[];
-      esHasPrivilegesResponse: HasPrivilegesResponse;
-      expectedResult?: any;
-      expectErrorThrown?: any;
+  const checkPrivilegesAtSpaceTest = async (options: {
+    spaceId: string;
+    privilegeOrPrivileges: string | string[];
+    esHasPrivilegesResponse: HasPrivilegesResponse;
+  }) => {
+    const { mockClusterClient, mockScopedClusterClient } = createMockClusterClient(
+      options.esHasPrivilegesResponse
+    );
+    const checkPrivilegesWithRequest = checkPrivilegesWithRequestFactory(
+      mockActions,
+      mockClusterClient,
+      application
+    );
+    const request = httpServerMock.createKibanaRequest();
+    const checkPrivileges = checkPrivilegesWithRequest(request);
+
+    let actualResult;
+    let errorThrown = null;
+    try {
+      actualResult = await checkPrivileges.atSpace(options.spaceId, options.privilegeOrPrivileges);
+    } catch (err) {
+      errorThrown = err;
     }
-  ) => {
-    test(description, async () => {
-      const { mockClusterClient, mockScopedClusterClient } = createMockClusterClient(
-        options.esHasPrivilegesResponse
-      );
-      const checkPrivilegesWithRequest = checkPrivilegesWithRequestFactory(
-        mockActions,
-        mockClusterClient,
-        application
-      );
-      const request = httpServerMock.createKibanaRequest();
-      const checkPrivileges = checkPrivilegesWithRequest(request);
-
-      let actualResult;
-      let errorThrown = null;
-      try {
-        actualResult = await checkPrivileges.atSpace(
-          options.spaceId,
-          options.privilegeOrPrivileges
-        );
-      } catch (err) {
-        errorThrown = err;
-      }
 
-      expect(mockClusterClient.asScoped).toHaveBeenCalledWith(request);
-      expect(mockScopedClusterClient.callAsCurrentUser).toHaveBeenCalledWith(
-        'shield.hasPrivileges',
-        {
-          body: {
-            applications: [
-              {
-                application,
-                resources: [`space:${options.spaceId}`],
-                privileges: uniq([
-                  mockActions.version,
-                  mockActions.login,
-                  ...(Array.isArray(options.privilegeOrPrivileges)
-                    ? options.privilegeOrPrivileges
-                    : [options.privilegeOrPrivileges]),
-                ]),
-              },
-            ],
+    expect(mockClusterClient.asScoped).toHaveBeenCalledWith(request);
+    expect(mockScopedClusterClient.callAsCurrentUser).toHaveBeenCalledWith('shield.hasPrivileges', {
+      body: {
+        applications: [
+          {
+            application,
+            resources: [`space:${options.spaceId}`],
+            privileges: uniq([
+              mockActions.version,
+              mockActions.login,
+              ...(Array.isArray(options.privilegeOrPrivileges)
+                ? options.privilegeOrPrivileges
+                : [options.privilegeOrPrivileges]),
+            ]),
           },
-        }
-      );
-
-      if (options.expectedResult) {
-        expect(errorThrown).toBeNull();
-        expect(actualResult).toEqual(options.expectedResult);
-      }
-
-      if (options.expectErrorThrown) {
-        expect(errorThrown).toMatchSnapshot();
-      }
+        ],
+      },
     });
+
+    if (errorThrown) {
+      return errorThrown;
+    }
+    return actualResult;
   };
 
-  checkPrivilegesAtSpaceTest('successful when checking for login and user has login', {
-    spaceId: 'space_1',
-    privilegeOrPrivileges: mockActions.login,
-    esHasPrivilegesResponse: {
-      has_all_requested: true,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          'space:space_1': {
-            [mockActions.login]: true,
-            [mockActions.version]: true,
+  test('successful when checking for login and user has login', async () => {
+    const result = await checkPrivilegesAtSpaceTest({
+      spaceId: 'space_1',
+      privilegeOrPrivileges: mockActions.login,
+      esHasPrivilegesResponse: {
+        has_all_requested: true,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            'space:space_1': {
+              [mockActions.login]: true,
+              [mockActions.version]: true,
+            },
           },
         },
       },
-    },
-    expectedResult: {
-      hasAllRequested: true,
-      username: 'foo-username',
-      privileges: {
-        [mockActions.login]: true,
-      },
-    },
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": true,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "mock-action:login",
+            "resource": "space_1",
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
   });
 
-  checkPrivilegesAtSpaceTest(`failure when checking for login and user doesn't have login`, {
-    spaceId: 'space_1',
-    privilegeOrPrivileges: mockActions.login,
-    esHasPrivilegesResponse: {
-      has_all_requested: false,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          'space:space_1': {
-            [mockActions.login]: false,
-            [mockActions.version]: true,
+  test(`failure when checking for login and user doesn't have login`, async () => {
+    const result = await checkPrivilegesAtSpaceTest({
+      spaceId: 'space_1',
+      privilegeOrPrivileges: mockActions.login,
+      esHasPrivilegesResponse: {
+        has_all_requested: false,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            'space:space_1': {
+              [mockActions.login]: false,
+              [mockActions.version]: true,
+            },
           },
         },
       },
-    },
-    expectedResult: {
-      hasAllRequested: false,
-      username: 'foo-username',
-      privileges: {
-        [mockActions.login]: false,
-      },
-    },
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": false,
+        "privileges": Array [
+          Object {
+            "authorized": false,
+            "privilege": "mock-action:login",
+            "resource": "space_1",
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
   });
 
-  checkPrivilegesAtSpaceTest(
-    `throws error when checking for login and user has login but doesn't have version`,
-    {
+  test(`throws error when checking for login and user has login but doesn't have version`, async () => {
+    const result = await checkPrivilegesAtSpaceTest({
       spaceId: 'space_1',
       privilegeOrPrivileges: mockActions.login,
       esHasPrivilegesResponse: {
@@ -162,74 +160,99 @@ describe('#atSpace', () => {
           },
         },
       },
-      expectErrorThrown: true,
-    }
-  );
-
-  checkPrivilegesAtSpaceTest(`successful when checking for two actions and the user has both`, {
-    spaceId: 'space_1',
-    privilegeOrPrivileges: [
-      `saved_object:${savedObjectTypes[0]}/get`,
-      `saved_object:${savedObjectTypes[1]}/get`,
-    ],
-    esHasPrivilegesResponse: {
-      has_all_requested: true,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          'space:space_1': {
-            [mockActions.login]: true,
-            [mockActions.version]: true,
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+    });
+    expect(result).toMatchInlineSnapshot(
+      `[Error: Multiple versions of Kibana are running against the same Elasticsearch cluster, unable to authorize user.]`
+    );
+  });
+
+  test(`successful when checking for two actions and the user has both`, async () => {
+    const result = await checkPrivilegesAtSpaceTest({
+      spaceId: 'space_1',
+      privilegeOrPrivileges: [
+        `saved_object:${savedObjectTypes[0]}/get`,
+        `saved_object:${savedObjectTypes[1]}/get`,
+      ],
+      esHasPrivilegesResponse: {
+        has_all_requested: true,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            'space:space_1': {
+              [mockActions.login]: true,
+              [mockActions.version]: true,
+              [`saved_object:${savedObjectTypes[0]}/get`]: true,
+              [`saved_object:${savedObjectTypes[1]}/get`]: true,
+            },
           },
         },
       },
-    },
-    expectedResult: {
-      hasAllRequested: true,
-      username: 'foo-username',
-      privileges: {
-        [`saved_object:${savedObjectTypes[0]}/get`]: true,
-        [`saved_object:${savedObjectTypes[1]}/get`]: true,
-      },
-    },
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": true,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_1",
+          },
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_1",
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
   });
 
-  checkPrivilegesAtSpaceTest(`failure when checking for two actions and the user has only one`, {
-    spaceId: 'space_1',
-    privilegeOrPrivileges: [
-      `saved_object:${savedObjectTypes[0]}/get`,
-      `saved_object:${savedObjectTypes[1]}/get`,
-    ],
-    esHasPrivilegesResponse: {
-      has_all_requested: false,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          'space:space_1': {
-            [mockActions.login]: true,
-            [mockActions.version]: true,
-            [`saved_object:${savedObjectTypes[0]}/get`]: false,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+  test(`failure when checking for two actions and the user has only one`, async () => {
+    const result = await checkPrivilegesAtSpaceTest({
+      spaceId: 'space_1',
+      privilegeOrPrivileges: [
+        `saved_object:${savedObjectTypes[0]}/get`,
+        `saved_object:${savedObjectTypes[1]}/get`,
+      ],
+      esHasPrivilegesResponse: {
+        has_all_requested: false,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            'space:space_1': {
+              [mockActions.login]: true,
+              [mockActions.version]: true,
+              [`saved_object:${savedObjectTypes[0]}/get`]: false,
+              [`saved_object:${savedObjectTypes[1]}/get`]: true,
+            },
           },
         },
       },
-    },
-    expectedResult: {
-      hasAllRequested: false,
-      username: 'foo-username',
-      privileges: {
-        [`saved_object:${savedObjectTypes[0]}/get`]: false,
-        [`saved_object:${savedObjectTypes[1]}/get`]: true,
-      },
-    },
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": false,
+        "privileges": Array [
+          Object {
+            "authorized": false,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_1",
+          },
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_1",
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
   });
 
   describe('with a malformed Elasticsearch response', () => {
-    checkPrivilegesAtSpaceTest(
-      `throws a validation error when an extra privilege is present in the response`,
-      {
+    test(`throws a validation error when an extra privilege is present in the response`, async () => {
+      const result = await checkPrivilegesAtSpaceTest({
         spaceId: 'space_1',
         privilegeOrPrivileges: [`saved_object:${savedObjectTypes[0]}/get`],
         esHasPrivilegesResponse: {
@@ -246,13 +269,14 @@ describe('#atSpace', () => {
             },
           },
         },
-        expectErrorThrown: true,
-      }
-    );
+      });
+      expect(result).toMatchInlineSnapshot(
+        `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because ["saved_object:bar-type/get" is not allowed]]]]`
+      );
+    });
 
-    checkPrivilegesAtSpaceTest(
-      `throws a validation error when privileges are missing in the response`,
-      {
+    test(`throws a validation error when privileges are missing in the response`, async () => {
+      const result = await checkPrivilegesAtSpaceTest({
         spaceId: 'space_1',
         privilegeOrPrivileges: [`saved_object:${savedObjectTypes[0]}/get`],
         esHasPrivilegesResponse: {
@@ -267,82 +291,69 @@ describe('#atSpace', () => {
             },
           },
         },
-        expectErrorThrown: true,
-      }
-    );
+      });
+      expect(result).toMatchInlineSnapshot(
+        `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because [child "saved_object:foo-type/get" fails because ["saved_object:foo-type/get" is required]]]]]`
+      );
+    });
   });
 });
 
 describe('#atSpaces', () => {
-  const checkPrivilegesAtSpacesTest = (
-    description: string,
-    options: {
-      spaceIds: string[];
-      privilegeOrPrivileges: string | string[];
-      esHasPrivilegesResponse: HasPrivilegesResponse;
-      expectedResult?: any;
-      expectErrorThrown?: any;
-    }
-  ) => {
-    test(description, async () => {
-      const { mockClusterClient, mockScopedClusterClient } = createMockClusterClient(
-        options.esHasPrivilegesResponse
-      );
-      const checkPrivilegesWithRequest = checkPrivilegesWithRequestFactory(
-        mockActions,
-        mockClusterClient,
-        application
-      );
-      const request = httpServerMock.createKibanaRequest();
-      const checkPrivileges = checkPrivilegesWithRequest(request);
-
-      let actualResult;
-      let errorThrown = null;
-      try {
-        actualResult = await checkPrivileges.atSpaces(
-          options.spaceIds,
-          options.privilegeOrPrivileges
-        );
-      } catch (err) {
-        errorThrown = err;
-      }
+  const checkPrivilegesAtSpacesTest = async (options: {
+    spaceIds: string[];
+    privilegeOrPrivileges: string | string[];
+    esHasPrivilegesResponse: HasPrivilegesResponse;
+  }) => {
+    const { mockClusterClient, mockScopedClusterClient } = createMockClusterClient(
+      options.esHasPrivilegesResponse
+    );
+    const checkPrivilegesWithRequest = checkPrivilegesWithRequestFactory(
+      mockActions,
+      mockClusterClient,
+      application
+    );
+    const request = httpServerMock.createKibanaRequest();
+    const checkPrivileges = checkPrivilegesWithRequest(request);
 
-      expect(mockClusterClient.asScoped).toHaveBeenCalledWith(request);
-      expect(mockScopedClusterClient.callAsCurrentUser).toHaveBeenCalledWith(
-        'shield.hasPrivileges',
-        {
-          body: {
-            applications: [
-              {
-                application,
-                resources: options.spaceIds.map(spaceId => `space:${spaceId}`),
-                privileges: uniq([
-                  mockActions.version,
-                  mockActions.login,
-                  ...(Array.isArray(options.privilegeOrPrivileges)
-                    ? options.privilegeOrPrivileges
-                    : [options.privilegeOrPrivileges]),
-                ]),
-              },
-            ],
-          },
-        }
+    let actualResult;
+    let errorThrown = null;
+    try {
+      actualResult = await checkPrivileges.atSpaces(
+        options.spaceIds,
+        options.privilegeOrPrivileges
       );
+    } catch (err) {
+      errorThrown = err;
+    }
 
-      if (options.expectedResult) {
-        expect(errorThrown).toBeNull();
-        expect(actualResult).toEqual(options.expectedResult);
-      }
-
-      if (options.expectErrorThrown) {
-        expect(errorThrown).toMatchSnapshot();
-      }
+    expect(mockClusterClient.asScoped).toHaveBeenCalledWith(request);
+    expect(mockScopedClusterClient.callAsCurrentUser).toHaveBeenCalledWith('shield.hasPrivileges', {
+      body: {
+        applications: [
+          {
+            application,
+            resources: options.spaceIds.map(spaceId => `space:${spaceId}`),
+            privileges: uniq([
+              mockActions.version,
+              mockActions.login,
+              ...(Array.isArray(options.privilegeOrPrivileges)
+                ? options.privilegeOrPrivileges
+                : [options.privilegeOrPrivileges]),
+            ]),
+          },
+        ],
+      },
     });
+
+    if (errorThrown) {
+      return errorThrown;
+    }
+    return actualResult;
   };
 
-  checkPrivilegesAtSpacesTest(
-    'successful when checking for login and user has login at both spaces',
-    {
+  test('successful when checking for login and user has login at both spaces', async () => {
+    const result = await checkPrivilegesAtSpacesTest({
       spaceIds: ['space_1', 'space_2'],
       privilegeOrPrivileges: mockActions.login,
       esHasPrivilegesResponse: {
@@ -361,24 +372,29 @@ describe('#atSpaces', () => {
           },
         },
       },
-      expectedResult: {
-        hasAllRequested: true,
-        username: 'foo-username',
-        spacePrivileges: {
-          space_1: {
-            [mockActions.login]: true,
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": true,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "mock-action:login",
+            "resource": "space_1",
           },
-          space_2: {
-            [mockActions.login]: true,
+          Object {
+            "authorized": true,
+            "privilege": "mock-action:login",
+            "resource": "space_2",
           },
-        },
-      },
-    }
-  );
+        ],
+        "username": "foo-username",
+      }
+    `);
+  });
 
-  checkPrivilegesAtSpacesTest(
-    'failure when checking for login and user has login at only one space',
-    {
+  test('failure when checking for login and user has login at only one space', async () => {
+    const result = await checkPrivilegesAtSpacesTest({
       spaceIds: ['space_1', 'space_2'],
       privilegeOrPrivileges: mockActions.login,
       esHasPrivilegesResponse: {
@@ -397,24 +413,29 @@ describe('#atSpaces', () => {
           },
         },
       },
-      expectedResult: {
-        hasAllRequested: false,
-        username: 'foo-username',
-        spacePrivileges: {
-          space_1: {
-            [mockActions.login]: true,
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": false,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "mock-action:login",
+            "resource": "space_1",
           },
-          space_2: {
-            [mockActions.login]: false,
+          Object {
+            "authorized": false,
+            "privilege": "mock-action:login",
+            "resource": "space_2",
           },
-        },
-      },
-    }
-  );
+        ],
+        "username": "foo-username",
+      }
+    `);
+  });
 
-  checkPrivilegesAtSpacesTest(
-    `throws error when checking for login and user has login but doesn't have version`,
-    {
+  test(`throws error when checking for login and user has login but doesn't have version`, async () => {
+    const result = await checkPrivilegesAtSpacesTest({
       spaceIds: ['space_1', 'space_2'],
       privilegeOrPrivileges: mockActions.login,
       esHasPrivilegesResponse: {
@@ -433,38 +454,43 @@ describe('#atSpaces', () => {
           },
         },
       },
-      expectErrorThrown: true,
-    }
-  );
-
-  checkPrivilegesAtSpacesTest(`throws error when Elasticsearch returns malformed response`, {
-    spaceIds: ['space_1', 'space_2'],
-    privilegeOrPrivileges: [
-      `saved_object:${savedObjectTypes[0]}/get`,
-      `saved_object:${savedObjectTypes[1]}/get`,
-    ],
-    esHasPrivilegesResponse: {
-      has_all_requested: true,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          'space:space_1': {
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
-          },
-          'space:space_2': {
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+    });
+    expect(result).toMatchInlineSnapshot(
+      `[Error: Multiple versions of Kibana are running against the same Elasticsearch cluster, unable to authorize user.]`
+    );
+  });
+
+  test(`throws error when Elasticsearch returns malformed response`, async () => {
+    const result = await checkPrivilegesAtSpacesTest({
+      spaceIds: ['space_1', 'space_2'],
+      privilegeOrPrivileges: [
+        `saved_object:${savedObjectTypes[0]}/get`,
+        `saved_object:${savedObjectTypes[1]}/get`,
+      ],
+      esHasPrivilegesResponse: {
+        has_all_requested: true,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            'space:space_1': {
+              [`saved_object:${savedObjectTypes[0]}/get`]: true,
+              [`saved_object:${savedObjectTypes[1]}/get`]: true,
+            },
+            'space:space_2': {
+              [`saved_object:${savedObjectTypes[0]}/get`]: true,
+              [`saved_object:${savedObjectTypes[1]}/get`]: true,
+            },
           },
         },
       },
-    },
-    expectErrorThrown: true,
+    });
+    expect(result).toMatchInlineSnapshot(
+      `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because [child "mock-action:version" fails because ["mock-action:version" is required]]]]]`
+    );
   });
 
-  checkPrivilegesAtSpacesTest(
-    `successful when checking for two actions at two spaces and user has it all`,
-    {
+  test(`successful when checking for two actions at two spaces and user has it all`, async () => {
+    const result = await checkPrivilegesAtSpacesTest({
       spaceIds: ['space_1', 'space_2'],
       privilegeOrPrivileges: [
         `saved_object:${savedObjectTypes[0]}/get`,
@@ -490,26 +516,39 @@ describe('#atSpaces', () => {
           },
         },
       },
-      expectedResult: {
-        hasAllRequested: true,
-        username: 'foo-username',
-        spacePrivileges: {
-          space_1: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": true,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_1",
           },
-          space_2: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_1",
           },
-        },
-      },
-    }
-  );
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_2",
+          },
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_2",
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
+  });
 
-  checkPrivilegesAtSpacesTest(
-    `failure when checking for two actions at two spaces and user has one action at one space`,
-    {
+  test(`failure when checking for two actions at two spaces and user has one action at one space`, async () => {
+    const result = await checkPrivilegesAtSpacesTest({
       spaceIds: ['space_1', 'space_2'],
       privilegeOrPrivileges: [
         `saved_object:${savedObjectTypes[0]}/get`,
@@ -535,26 +574,39 @@ describe('#atSpaces', () => {
           },
         },
       },
-      expectedResult: {
-        hasAllRequested: false,
-        username: 'foo-username',
-        spacePrivileges: {
-          space_1: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: false,
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": false,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_1",
           },
-          space_2: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: false,
-            [`saved_object:${savedObjectTypes[1]}/get`]: false,
+          Object {
+            "authorized": false,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_1",
           },
-        },
-      },
-    }
-  );
+          Object {
+            "authorized": false,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_2",
+          },
+          Object {
+            "authorized": false,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_2",
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
+  });
 
-  checkPrivilegesAtSpacesTest(
-    `failure when checking for two actions at two spaces and user has two actions at one space`,
-    {
+  test(`failure when checking for two actions at two spaces and user has two actions at one space`, async () => {
+    const result = await checkPrivilegesAtSpacesTest({
       spaceIds: ['space_1', 'space_2'],
       privilegeOrPrivileges: [
         `saved_object:${savedObjectTypes[0]}/get`,
@@ -580,26 +632,39 @@ describe('#atSpaces', () => {
           },
         },
       },
-      expectedResult: {
-        hasAllRequested: false,
-        username: 'foo-username',
-        spacePrivileges: {
-          space_1: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": false,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_1",
           },
-          space_2: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: false,
-            [`saved_object:${savedObjectTypes[1]}/get`]: false,
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_1",
           },
-        },
-      },
-    }
-  );
+          Object {
+            "authorized": false,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_2",
+          },
+          Object {
+            "authorized": false,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_2",
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
+  });
 
-  checkPrivilegesAtSpacesTest(
-    `failure when checking for two actions at two spaces and user has two actions at one space & one action at the other`,
-    {
+  test(`failure when checking for two actions at two spaces and user has two actions at one space & one action at the other`, async () => {
+    const result = await checkPrivilegesAtSpacesTest({
       spaceIds: ['space_1', 'space_2'],
       privilegeOrPrivileges: [
         `saved_object:${savedObjectTypes[0]}/get`,
@@ -625,27 +690,40 @@ describe('#atSpaces', () => {
           },
         },
       },
-      expectedResult: {
-        hasAllRequested: false,
-        username: 'foo-username',
-        spacePrivileges: {
-          space_1: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": false,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_1",
           },
-          space_2: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: false,
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_1",
           },
-        },
-      },
-    }
-  );
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:foo-type/get",
+            "resource": "space_2",
+          },
+          Object {
+            "authorized": false,
+            "privilege": "saved_object:bar-type/get",
+            "resource": "space_2",
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
+  });
 
   describe('with a malformed Elasticsearch response', () => {
-    checkPrivilegesAtSpacesTest(
-      `throws a validation error when an extra privilege is present in the response`,
-      {
+    test(`throws a validation error when an extra privilege is present in the response`, async () => {
+      const result = await checkPrivilegesAtSpacesTest({
         spaceIds: ['space_1', 'space_2'],
         privilegeOrPrivileges: [`saved_object:${savedObjectTypes[0]}/get`],
         esHasPrivilegesResponse: {
@@ -668,13 +746,14 @@ describe('#atSpaces', () => {
             },
           },
         },
-        expectErrorThrown: true,
-      }
-    );
+      });
+      expect(result).toMatchInlineSnapshot(
+        `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]`
+      );
+    });
 
-    checkPrivilegesAtSpacesTest(
-      `throws a validation error when privileges are missing in the response`,
-      {
+    test(`throws a validation error when privileges are missing in the response`, async () => {
+      const result = await checkPrivilegesAtSpacesTest({
         spaceIds: ['space_1', 'space_2'],
         privilegeOrPrivileges: [`saved_object:${savedObjectTypes[0]}/get`],
         esHasPrivilegesResponse: {
@@ -695,13 +774,14 @@ describe('#atSpaces', () => {
             },
           },
         },
-        expectErrorThrown: true,
-      }
-    );
+      });
+      expect(result).toMatchInlineSnapshot(
+        `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]`
+      );
+    });
 
-    checkPrivilegesAtSpacesTest(
-      `throws a validation error when an extra space is present in the response`,
-      {
+    test(`throws a validation error when an extra space is present in the response`, async () => {
+      const result = await checkPrivilegesAtSpacesTest({
         spaceIds: ['space_1', 'space_2'],
         privilegeOrPrivileges: [`saved_object:${savedObjectTypes[0]}/get`],
         esHasPrivilegesResponse: {
@@ -727,13 +807,14 @@ describe('#atSpaces', () => {
             },
           },
         },
-        expectErrorThrown: true,
-      }
-    );
+      });
+      expect(result).toMatchInlineSnapshot(
+        `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because ["space:space_3" is not allowed]]]`
+      );
+    });
 
-    checkPrivilegesAtSpacesTest(
-      `throws a validation error when an a space is missing in the response`,
-      {
+    test(`throws a validation error when an a space is missing in the response`, async () => {
+      const result = await checkPrivilegesAtSpacesTest({
         spaceIds: ['space_1', 'space_2'],
         privilegeOrPrivileges: [`saved_object:${savedObjectTypes[0]}/get`],
         esHasPrivilegesResponse: {
@@ -749,124 +830,127 @@ describe('#atSpaces', () => {
             },
           },
         },
-        expectErrorThrown: true,
-      }
-    );
+      });
+      expect(result).toMatchInlineSnapshot(
+        `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]`
+      );
+    });
   });
 });
 
 describe('#globally', () => {
-  const checkPrivilegesGloballyTest = (
-    description: string,
-    options: {
-      privilegeOrPrivileges: string | string[];
-      esHasPrivilegesResponse: HasPrivilegesResponse;
-      expectedResult?: any;
-      expectErrorThrown?: any;
+  const checkPrivilegesGloballyTest = async (options: {
+    privilegeOrPrivileges: string | string[];
+    esHasPrivilegesResponse: HasPrivilegesResponse;
+  }) => {
+    const { mockClusterClient, mockScopedClusterClient } = createMockClusterClient(
+      options.esHasPrivilegesResponse
+    );
+    const checkPrivilegesWithRequest = checkPrivilegesWithRequestFactory(
+      mockActions,
+      mockClusterClient,
+      application
+    );
+    const request = httpServerMock.createKibanaRequest();
+    const checkPrivileges = checkPrivilegesWithRequest(request);
+
+    let actualResult;
+    let errorThrown = null;
+    try {
+      actualResult = await checkPrivileges.globally(options.privilegeOrPrivileges);
+    } catch (err) {
+      errorThrown = err;
     }
-  ) => {
-    test(description, async () => {
-      const { mockClusterClient, mockScopedClusterClient } = createMockClusterClient(
-        options.esHasPrivilegesResponse
-      );
-      const checkPrivilegesWithRequest = checkPrivilegesWithRequestFactory(
-        mockActions,
-        mockClusterClient,
-        application
-      );
-      const request = httpServerMock.createKibanaRequest();
-      const checkPrivileges = checkPrivilegesWithRequest(request);
-
-      let actualResult;
-      let errorThrown = null;
-      try {
-        actualResult = await checkPrivileges.globally(options.privilegeOrPrivileges);
-      } catch (err) {
-        errorThrown = err;
-      }
 
-      expect(mockClusterClient.asScoped).toHaveBeenCalledWith(request);
-      expect(mockScopedClusterClient.callAsCurrentUser).toHaveBeenCalledWith(
-        'shield.hasPrivileges',
-        {
-          body: {
-            applications: [
-              {
-                application,
-                resources: [GLOBAL_RESOURCE],
-                privileges: uniq([
-                  mockActions.version,
-                  mockActions.login,
-                  ...(Array.isArray(options.privilegeOrPrivileges)
-                    ? options.privilegeOrPrivileges
-                    : [options.privilegeOrPrivileges]),
-                ]),
-              },
-            ],
+    expect(mockClusterClient.asScoped).toHaveBeenCalledWith(request);
+    expect(mockScopedClusterClient.callAsCurrentUser).toHaveBeenCalledWith('shield.hasPrivileges', {
+      body: {
+        applications: [
+          {
+            application,
+            resources: [GLOBAL_RESOURCE],
+            privileges: uniq([
+              mockActions.version,
+              mockActions.login,
+              ...(Array.isArray(options.privilegeOrPrivileges)
+                ? options.privilegeOrPrivileges
+                : [options.privilegeOrPrivileges]),
+            ]),
           },
-        }
-      );
-
-      if (options.expectedResult) {
-        expect(errorThrown).toBeNull();
-        expect(actualResult).toEqual(options.expectedResult);
-      }
-
-      if (options.expectErrorThrown) {
-        expect(errorThrown).toMatchSnapshot();
-      }
+        ],
+      },
     });
+
+    if (errorThrown) {
+      return errorThrown;
+    }
+    return actualResult;
   };
 
-  checkPrivilegesGloballyTest('successful when checking for login and user has login', {
-    privilegeOrPrivileges: mockActions.login,
-    esHasPrivilegesResponse: {
-      has_all_requested: true,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          [GLOBAL_RESOURCE]: {
-            [mockActions.login]: true,
-            [mockActions.version]: true,
+  test('successful when checking for login and user has login', async () => {
+    const result = await checkPrivilegesGloballyTest({
+      privilegeOrPrivileges: mockActions.login,
+      esHasPrivilegesResponse: {
+        has_all_requested: true,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            [GLOBAL_RESOURCE]: {
+              [mockActions.login]: true,
+              [mockActions.version]: true,
+            },
           },
         },
       },
-    },
-    expectedResult: {
-      hasAllRequested: true,
-      username: 'foo-username',
-      privileges: {
-        [mockActions.login]: true,
-      },
-    },
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": true,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "mock-action:login",
+            "resource": undefined,
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
   });
 
-  checkPrivilegesGloballyTest(`failure when checking for login and user doesn't have login`, {
-    privilegeOrPrivileges: mockActions.login,
-    esHasPrivilegesResponse: {
-      has_all_requested: false,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          [GLOBAL_RESOURCE]: {
-            [mockActions.login]: false,
-            [mockActions.version]: true,
+  test(`failure when checking for login and user doesn't have login`, async () => {
+    const result = await checkPrivilegesGloballyTest({
+      privilegeOrPrivileges: mockActions.login,
+      esHasPrivilegesResponse: {
+        has_all_requested: false,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            [GLOBAL_RESOURCE]: {
+              [mockActions.login]: false,
+              [mockActions.version]: true,
+            },
           },
         },
       },
-    },
-    expectedResult: {
-      hasAllRequested: false,
-      username: 'foo-username',
-      privileges: {
-        [mockActions.login]: false,
-      },
-    },
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": false,
+        "privileges": Array [
+          Object {
+            "authorized": false,
+            "privilege": "mock-action:login",
+            "resource": undefined,
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
   });
 
-  checkPrivilegesGloballyTest(
-    `throws error when checking for login and user has login but doesn't have version`,
-    {
+  test(`throws error when checking for login and user has login but doesn't have version`, async () => {
+    const result = await checkPrivilegesGloballyTest({
       privilegeOrPrivileges: mockActions.login,
       esHasPrivilegesResponse: {
         has_all_requested: false,
@@ -880,92 +964,121 @@ describe('#globally', () => {
           },
         },
       },
-      expectErrorThrown: true,
-    }
-  );
-
-  checkPrivilegesGloballyTest(`throws error when Elasticsearch returns malformed response`, {
-    privilegeOrPrivileges: [
-      `saved_object:${savedObjectTypes[0]}/get`,
-      `saved_object:${savedObjectTypes[1]}/get`,
-    ],
-    esHasPrivilegesResponse: {
-      has_all_requested: false,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          [GLOBAL_RESOURCE]: {
-            [`saved_object:${savedObjectTypes[0]}/get`]: false,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+    });
+    expect(result).toMatchInlineSnapshot(
+      `[Error: Multiple versions of Kibana are running against the same Elasticsearch cluster, unable to authorize user.]`
+    );
+  });
+
+  test(`throws error when Elasticsearch returns malformed response`, async () => {
+    const result = await checkPrivilegesGloballyTest({
+      privilegeOrPrivileges: [
+        `saved_object:${savedObjectTypes[0]}/get`,
+        `saved_object:${savedObjectTypes[1]}/get`,
+      ],
+      esHasPrivilegesResponse: {
+        has_all_requested: false,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            [GLOBAL_RESOURCE]: {
+              [`saved_object:${savedObjectTypes[0]}/get`]: false,
+              [`saved_object:${savedObjectTypes[1]}/get`]: true,
+            },
           },
         },
       },
-    },
-    expectErrorThrown: true,
+    });
+    expect(result).toMatchInlineSnapshot(
+      `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because [child "mock-action:version" fails because ["mock-action:version" is required]]]]]`
+    );
   });
 
-  checkPrivilegesGloballyTest(`successful when checking for two actions and the user has both`, {
-    privilegeOrPrivileges: [
-      `saved_object:${savedObjectTypes[0]}/get`,
-      `saved_object:${savedObjectTypes[1]}/get`,
-    ],
-    esHasPrivilegesResponse: {
-      has_all_requested: true,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          [GLOBAL_RESOURCE]: {
-            [mockActions.login]: true,
-            [mockActions.version]: true,
-            [`saved_object:${savedObjectTypes[0]}/get`]: true,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+  test(`successful when checking for two actions and the user has both`, async () => {
+    const result = await checkPrivilegesGloballyTest({
+      privilegeOrPrivileges: [
+        `saved_object:${savedObjectTypes[0]}/get`,
+        `saved_object:${savedObjectTypes[1]}/get`,
+      ],
+      esHasPrivilegesResponse: {
+        has_all_requested: true,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            [GLOBAL_RESOURCE]: {
+              [mockActions.login]: true,
+              [mockActions.version]: true,
+              [`saved_object:${savedObjectTypes[0]}/get`]: true,
+              [`saved_object:${savedObjectTypes[1]}/get`]: true,
+            },
           },
         },
       },
-    },
-    expectedResult: {
-      hasAllRequested: true,
-      username: 'foo-username',
-      privileges: {
-        [`saved_object:${savedObjectTypes[0]}/get`]: true,
-        [`saved_object:${savedObjectTypes[1]}/get`]: true,
-      },
-    },
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": true,
+        "privileges": Array [
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:foo-type/get",
+            "resource": undefined,
+          },
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:bar-type/get",
+            "resource": undefined,
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
   });
 
-  checkPrivilegesGloballyTest(`failure when checking for two actions and the user has only one`, {
-    privilegeOrPrivileges: [
-      `saved_object:${savedObjectTypes[0]}/get`,
-      `saved_object:${savedObjectTypes[1]}/get`,
-    ],
-    esHasPrivilegesResponse: {
-      has_all_requested: false,
-      username: 'foo-username',
-      application: {
-        [application]: {
-          [GLOBAL_RESOURCE]: {
-            [mockActions.login]: true,
-            [mockActions.version]: true,
-            [`saved_object:${savedObjectTypes[0]}/get`]: false,
-            [`saved_object:${savedObjectTypes[1]}/get`]: true,
+  test(`failure when checking for two actions and the user has only one`, async () => {
+    const result = await checkPrivilegesGloballyTest({
+      privilegeOrPrivileges: [
+        `saved_object:${savedObjectTypes[0]}/get`,
+        `saved_object:${savedObjectTypes[1]}/get`,
+      ],
+      esHasPrivilegesResponse: {
+        has_all_requested: false,
+        username: 'foo-username',
+        application: {
+          [application]: {
+            [GLOBAL_RESOURCE]: {
+              [mockActions.login]: true,
+              [mockActions.version]: true,
+              [`saved_object:${savedObjectTypes[0]}/get`]: false,
+              [`saved_object:${savedObjectTypes[1]}/get`]: true,
+            },
           },
         },
       },
-    },
-    expectedResult: {
-      hasAllRequested: false,
-      username: 'foo-username',
-      privileges: {
-        [`saved_object:${savedObjectTypes[0]}/get`]: false,
-        [`saved_object:${savedObjectTypes[1]}/get`]: true,
-      },
-    },
+    });
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "hasAllRequested": false,
+        "privileges": Array [
+          Object {
+            "authorized": false,
+            "privilege": "saved_object:foo-type/get",
+            "resource": undefined,
+          },
+          Object {
+            "authorized": true,
+            "privilege": "saved_object:bar-type/get",
+            "resource": undefined,
+          },
+        ],
+        "username": "foo-username",
+      }
+    `);
   });
 
   describe('with a malformed Elasticsearch response', () => {
-    checkPrivilegesGloballyTest(
-      `throws a validation error when an extra privilege is present in the response`,
-      {
+    test(`throws a validation error when an extra privilege is present in the response`, async () => {
+      const result = await checkPrivilegesGloballyTest({
         privilegeOrPrivileges: [`saved_object:${savedObjectTypes[0]}/get`],
         esHasPrivilegesResponse: {
           has_all_requested: false,
@@ -981,13 +1094,14 @@ describe('#globally', () => {
             },
           },
         },
-        expectErrorThrown: true,
-      }
-    );
+      });
+      expect(result).toMatchInlineSnapshot(
+        `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because ["saved_object:bar-type/get" is not allowed]]]]`
+      );
+    });
 
-    checkPrivilegesGloballyTest(
-      `throws a validation error when privileges are missing in the response`,
-      {
+    test(`throws a validation error when privileges are missing in the response`, async () => {
+      const result = await checkPrivilegesGloballyTest({
         privilegeOrPrivileges: [`saved_object:${savedObjectTypes[0]}/get`],
         esHasPrivilegesResponse: {
           has_all_requested: false,
@@ -1001,8 +1115,10 @@ describe('#globally', () => {
             },
           },
         },
-        expectErrorThrown: true,
-      }
-    );
+      });
+      expect(result).toMatchInlineSnapshot(
+        `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because [child "saved_object:foo-type/get" fails because ["saved_object:foo-type/get" is required]]]]]`
+      );
+    });
   });
 });
diff --git a/x-pack/plugins/security/server/authorization/check_privileges.ts b/x-pack/plugins/security/server/authorization/check_privileges.ts
index 3ef7a8f29a0bf..177a49d6defe9 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges.ts
@@ -16,32 +16,17 @@ interface CheckPrivilegesActions {
   version: string;
 }
 
-interface CheckPrivilegesAtResourcesResponse {
+export interface CheckPrivilegesResponse {
   hasAllRequested: boolean;
   username: string;
-  resourcePrivileges: {
-    [resource: string]: {
-      [privilege: string]: boolean;
-    };
-  };
-}
-
-export interface CheckPrivilegesAtResourceResponse {
-  hasAllRequested: boolean;
-  username: string;
-  privileges: {
-    [privilege: string]: boolean;
-  };
-}
-
-export interface CheckPrivilegesAtSpacesResponse {
-  hasAllRequested: boolean;
-  username: string;
-  spacePrivileges: {
-    [spaceId: string]: {
-      [privilege: string]: boolean;
-    };
-  };
+  privileges: Array<{
+    /**
+     * If this attribute is undefined, this element is a privilege for the global resource.
+     */
+    resource?: string;
+    privilege: string;
+    authorized: boolean;
+  }>;
 }
 
 export type CheckPrivilegesWithRequest = (request: KibanaRequest) => CheckPrivileges;
@@ -50,12 +35,12 @@ export interface CheckPrivileges {
   atSpace(
     spaceId: string,
     privilegeOrPrivileges: string | string[]
-  ): Promise<CheckPrivilegesAtResourceResponse>;
+  ): Promise<CheckPrivilegesResponse>;
   atSpaces(
     spaceIds: string[],
     privilegeOrPrivileges: string | string[]
-  ): Promise<CheckPrivilegesAtSpacesResponse>;
-  globally(privilegeOrPrivileges: string | string[]): Promise<CheckPrivilegesAtResourceResponse>;
+  ): Promise<CheckPrivilegesResponse>;
+  globally(privilegeOrPrivileges: string | string[]): Promise<CheckPrivilegesResponse>;
 }
 
 export function checkPrivilegesWithRequestFactory(
@@ -75,7 +60,7 @@ export function checkPrivilegesWithRequestFactory(
     const checkPrivilegesAtResources = async (
       resources: string[],
       privilegeOrPrivileges: string | string[]
-    ): Promise<CheckPrivilegesAtResourcesResponse> => {
+    ): Promise<CheckPrivilegesResponse> => {
       const privileges = Array.isArray(privilegeOrPrivileges)
         ? privilegeOrPrivileges
         : [privilegeOrPrivileges];
@@ -106,55 +91,43 @@ export function checkPrivilegesWithRequestFactory(
         );
       }
 
+      // we need to filter out the non requested privileges from the response
+      const resourcePrivileges = transform(applicationPrivilegesResponse, (result, value, key) => {
+        result[key!] = pick(value, privileges);
+      }) as HasPrivilegesResponseApplication;
+      const privilegeArray = Object.entries(resourcePrivileges)
+        .map(([key, val]) => {
+          // we need to turn the resource responses back into the space ids
+          const resource =
+            key !== GLOBAL_RESOURCE ? ResourceSerializer.deserializeSpaceResource(key!) : undefined;
+          return Object.entries(val).map(([privilege, authorized]) => ({
+            resource,
+            privilege,
+            authorized,
+          }));
+        })
+        .flat();
+
       return {
         hasAllRequested: hasPrivilegesResponse.has_all_requested,
         username: hasPrivilegesResponse.username,
-        // we need to filter out the non requested privileges from the response
-        resourcePrivileges: transform(applicationPrivilegesResponse, (result, value, key) => {
-          result[key!] = pick(value, privileges);
-        }),
-      };
-    };
-
-    const checkPrivilegesAtResource = async (
-      resource: string,
-      privilegeOrPrivileges: string | string[]
-    ) => {
-      const { hasAllRequested, username, resourcePrivileges } = await checkPrivilegesAtResources(
-        [resource],
-        privilegeOrPrivileges
-      );
-      return {
-        hasAllRequested,
-        username,
-        privileges: resourcePrivileges[resource],
+        privileges: privilegeArray,
       };
     };
 
     return {
       async atSpace(spaceId: string, privilegeOrPrivileges: string | string[]) {
         const spaceResource = ResourceSerializer.serializeSpaceResource(spaceId);
-        return await checkPrivilegesAtResource(spaceResource, privilegeOrPrivileges);
+        return await checkPrivilegesAtResources([spaceResource], privilegeOrPrivileges);
       },
       async atSpaces(spaceIds: string[], privilegeOrPrivileges: string | string[]) {
         const spaceResources = spaceIds.map(spaceId =>
           ResourceSerializer.serializeSpaceResource(spaceId)
         );
-        const { hasAllRequested, username, resourcePrivileges } = await checkPrivilegesAtResources(
-          spaceResources,
-          privilegeOrPrivileges
-        );
-        return {
-          hasAllRequested,
-          username,
-          // we need to turn the resource responses back into the space ids
-          spacePrivileges: transform(resourcePrivileges, (result, value, key) => {
-            result[ResourceSerializer.deserializeSpaceResource(key!)] = value;
-          }),
-        };
+        return await checkPrivilegesAtResources(spaceResources, privilegeOrPrivileges);
       },
       async globally(privilegeOrPrivileges: string | string[]) {
-        return await checkPrivilegesAtResource(GLOBAL_RESOURCE, privilegeOrPrivileges);
+        return await checkPrivilegesAtResources([GLOBAL_RESOURCE], privilegeOrPrivileges);
       },
     };
   };
diff --git a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
index 0377dd06eb669..6014bad739e77 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
@@ -6,11 +6,11 @@
 
 import { KibanaRequest } from '../../../../../src/core/server';
 import { SpacesService } from '../plugin';
-import { CheckPrivilegesAtResourceResponse, CheckPrivilegesWithRequest } from './check_privileges';
+import { CheckPrivilegesResponse, CheckPrivilegesWithRequest } from './check_privileges';
 
 export type CheckPrivilegesDynamically = (
   privilegeOrPrivileges: string | string[]
-) => Promise<CheckPrivilegesAtResourceResponse>;
+) => Promise<CheckPrivilegesResponse>;
 
 export type CheckPrivilegesDynamicallyWithRequest = (
   request: KibanaRequest
diff --git a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
index 4618e8e6641fc..43b3824500579 100644
--- a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
@@ -7,57 +7,113 @@
 import { checkSavedObjectsPrivilegesWithRequestFactory } from './check_saved_objects_privileges';
 
 import { httpServerMock } from '../../../../../src/core/server/mocks';
+import { CheckPrivileges, CheckPrivilegesWithRequest } from './check_privileges';
+import { SpacesService } from '../plugin';
 
-test(`checkPrivileges.atSpace when spaces is enabled`, async () => {
-  const expectedResult = Symbol();
-  const spaceId = 'foo-space';
-  const mockCheckPrivileges = {
-    atSpace: jest.fn().mockReturnValue(expectedResult),
-  };
-  const mockCheckPrivilegesWithRequest = jest.fn().mockReturnValue(mockCheckPrivileges);
-  const request = httpServerMock.createKibanaRequest();
-  const privilegeOrPrivileges = ['foo', 'bar'];
-  const mockSpacesService = {
-    getSpaceId: jest.fn(),
-    namespaceToSpaceId: jest.fn().mockReturnValue(spaceId),
-  };
+let mockCheckPrivileges: jest.Mocked<CheckPrivileges>;
+let mockCheckPrivilegesWithRequest: jest.Mocked<CheckPrivilegesWithRequest>;
+let mockSpacesService: jest.Mocked<SpacesService> | undefined;
+const request = httpServerMock.createKibanaRequest();
 
-  const checkSavedObjectsPrivileges = checkSavedObjectsPrivilegesWithRequestFactory(
+const createFactory = () =>
+  checkSavedObjectsPrivilegesWithRequestFactory(
     mockCheckPrivilegesWithRequest,
     () => mockSpacesService
   )(request);
 
-  const namespace = 'foo';
-
-  const result = await checkSavedObjectsPrivileges(privilegeOrPrivileges, namespace);
+beforeEach(() => {
+  mockCheckPrivileges = {
+    atSpace: jest.fn(),
+    atSpaces: jest.fn(),
+    globally: jest.fn(),
+  };
+  mockCheckPrivilegesWithRequest = jest.fn().mockReturnValue(mockCheckPrivileges);
 
-  expect(result).toBe(expectedResult);
-  expect(mockCheckPrivilegesWithRequest).toHaveBeenCalledWith(request);
-  expect(mockCheckPrivileges.atSpace).toHaveBeenCalledWith(spaceId, privilegeOrPrivileges);
-  expect(mockSpacesService.namespaceToSpaceId).toBeCalledWith(namespace);
+  mockSpacesService = {
+    getSpaceId: jest.fn(),
+    namespaceToSpaceId: jest.fn().mockImplementation((namespace: string) => `${namespace}-id`),
+  };
 });
 
-test(`checkPrivileges.globally when spaces is disabled`, async () => {
-  const expectedResult = Symbol();
-  const mockCheckPrivileges = {
-    globally: jest.fn().mockReturnValue(expectedResult),
-  };
-  const mockCheckPrivilegesWithRequest = jest.fn().mockReturnValue(mockCheckPrivileges);
+describe('#checkSavedObjectsPrivileges', () => {
+  const actions = ['foo', 'bar'];
+  const namespace1 = 'baz';
+  const namespace2 = 'qux';
 
-  const request = httpServerMock.createKibanaRequest();
+  describe('when checking multiple namespaces', () => {
+    const namespaces = [namespace1, namespace2];
 
-  const privilegeOrPrivileges = ['foo', 'bar'];
+    test(`throws an error when Spaces is disabled`, async () => {
+      mockSpacesService = undefined;
+      const checkSavedObjectsPrivileges = createFactory();
 
-  const checkSavedObjectsPrivileges = checkSavedObjectsPrivilegesWithRequestFactory(
-    mockCheckPrivilegesWithRequest,
-    () => undefined
-  )(request);
+      await expect(
+        checkSavedObjectsPrivileges(actions, namespaces)
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Can't check saved object privileges for multiple namespaces if Spaces is disabled"`
+      );
+    });
+
+    test(`throws an error when using an empty namespaces array`, async () => {
+      const checkSavedObjectsPrivileges = createFactory();
+
+      await expect(
+        checkSavedObjectsPrivileges(actions, [])
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Can't check saved object privileges for 0 namespaces"`
+      );
+    });
+
+    test(`uses checkPrivileges.atSpaces when spaces is enabled`, async () => {
+      const expectedResult = Symbol();
+      mockCheckPrivileges.atSpaces.mockReturnValue(expectedResult as any);
+      const checkSavedObjectsPrivileges = createFactory();
+
+      const result = await checkSavedObjectsPrivileges(actions, namespaces);
+
+      expect(result).toBe(expectedResult);
+      expect(mockSpacesService!.namespaceToSpaceId).toHaveBeenCalledTimes(2);
+      expect(mockSpacesService!.namespaceToSpaceId).toHaveBeenNthCalledWith(1, namespace1);
+      expect(mockSpacesService!.namespaceToSpaceId).toHaveBeenNthCalledWith(2, namespace2);
+      expect(mockCheckPrivilegesWithRequest).toHaveBeenCalledTimes(1);
+      expect(mockCheckPrivilegesWithRequest).toHaveBeenCalledWith(request);
+      expect(mockCheckPrivileges.atSpaces).toHaveBeenCalledTimes(1);
+      const spaceIds = mockSpacesService!.namespaceToSpaceId.mock.results.map(x => x.value);
+      expect(mockCheckPrivileges.atSpaces).toHaveBeenCalledWith(spaceIds, actions);
+    });
+  });
+
+  describe('when checking a single namespace', () => {
+    test(`uses checkPrivileges.atSpace when Spaces is enabled`, async () => {
+      const expectedResult = Symbol();
+      mockCheckPrivileges.atSpace.mockReturnValue(expectedResult as any);
+      const checkSavedObjectsPrivileges = createFactory();
+
+      const result = await checkSavedObjectsPrivileges(actions, namespace1);
+
+      expect(result).toBe(expectedResult);
+      expect(mockSpacesService!.namespaceToSpaceId).toHaveBeenCalledTimes(1);
+      expect(mockSpacesService!.namespaceToSpaceId).toHaveBeenCalledWith(namespace1);
+      expect(mockCheckPrivilegesWithRequest).toHaveBeenCalledTimes(1);
+      expect(mockCheckPrivilegesWithRequest).toHaveBeenCalledWith(request);
+      expect(mockCheckPrivileges.atSpace).toHaveBeenCalledTimes(1);
+      const spaceId = mockSpacesService!.namespaceToSpaceId.mock.results[0].value;
+      expect(mockCheckPrivileges.atSpace).toHaveBeenCalledWith(spaceId, actions);
+    });
 
-  const namespace = 'foo';
+    test(`uses checkPrivileges.globally when Spaces is disabled`, async () => {
+      const expectedResult = Symbol();
+      mockCheckPrivileges.globally.mockReturnValue(expectedResult as any);
+      mockSpacesService = undefined;
+      const checkSavedObjectsPrivileges = createFactory();
 
-  const result = await checkSavedObjectsPrivileges(privilegeOrPrivileges, namespace);
+      const result = await checkSavedObjectsPrivileges(actions, namespace1);
 
-  expect(result).toBe(expectedResult);
-  expect(mockCheckPrivilegesWithRequest).toHaveBeenCalledWith(request);
-  expect(mockCheckPrivileges.globally).toHaveBeenCalledWith(privilegeOrPrivileges);
+      expect(result).toBe(expectedResult);
+      expect(mockCheckPrivilegesWithRequest).toHaveBeenCalledTimes(1);
+      expect(mockCheckPrivilegesWithRequest).toHaveBeenCalledWith(request);
+      expect(mockCheckPrivileges.globally).toHaveBeenCalledTimes(1);
+      expect(mockCheckPrivileges.globally).toHaveBeenCalledWith(actions);
+    });
+  });
 });
diff --git a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
index 02958fe265efa..43140143a1773 100644
--- a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
@@ -6,32 +6,44 @@
 
 import { KibanaRequest } from '../../../../../src/core/server';
 import { SpacesService } from '../plugin';
-import { CheckPrivilegesAtResourceResponse, CheckPrivilegesWithRequest } from './check_privileges';
+import { CheckPrivilegesWithRequest, CheckPrivilegesResponse } from './check_privileges';
 
 export type CheckSavedObjectsPrivilegesWithRequest = (
   request: KibanaRequest
 ) => CheckSavedObjectsPrivileges;
+
 export type CheckSavedObjectsPrivileges = (
   actions: string | string[],
-  namespace?: string
-) => Promise<CheckPrivilegesAtResourceResponse>;
+  namespaceOrNamespaces?: string | string[]
+) => Promise<CheckPrivilegesResponse>;
 
 export const checkSavedObjectsPrivilegesWithRequestFactory = (
   checkPrivilegesWithRequest: CheckPrivilegesWithRequest,
   getSpacesService: () => SpacesService | undefined
 ): CheckSavedObjectsPrivilegesWithRequest => {
-  return function checkSavedObjectsPrivilegesWithRequest(request: KibanaRequest) {
+  return function checkSavedObjectsPrivilegesWithRequest(
+    request: KibanaRequest
+  ): CheckSavedObjectsPrivileges {
     return async function checkSavedObjectsPrivileges(
       actions: string | string[],
-      namespace?: string
+      namespaceOrNamespaces?: string | string[]
     ) {
       const spacesService = getSpacesService();
-      return spacesService
-        ? await checkPrivilegesWithRequest(request).atSpace(
-            spacesService.namespaceToSpaceId(namespace),
-            actions
-          )
-        : await checkPrivilegesWithRequest(request).globally(actions);
+      if (Array.isArray(namespaceOrNamespaces)) {
+        if (spacesService === undefined) {
+          throw new Error(
+            `Can't check saved object privileges for multiple namespaces if Spaces is disabled`
+          );
+        } else if (!namespaceOrNamespaces.length) {
+          throw new Error(`Can't check saved object privileges for 0 namespaces`);
+        }
+        const spaceIds = namespaceOrNamespaces.map(x => spacesService.namespaceToSpaceId(x));
+        return await checkPrivilegesWithRequest(request).atSpaces(spaceIds, actions);
+      } else if (spacesService) {
+        const spaceId = spacesService.namespaceToSpaceId(namespaceOrNamespaces);
+        return await checkPrivilegesWithRequest(request).atSpace(spaceId, actions);
+      }
+      return await checkPrivilegesWithRequest(request).globally(actions);
     };
   };
 };
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
index 912ae60e12065..ea97a1b3b590c 100644
--- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
+++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
@@ -11,7 +11,9 @@ import { httpServerMock, loggingServiceMock } from '../../../../../src/core/serv
 import { authorizationMock } from './index.mock';
 import { Feature } from '../../../features/server';
 
-type MockAuthzOptions = { rejectCheckPrivileges: any } | { resolveCheckPrivileges: any };
+type MockAuthzOptions =
+  | { rejectCheckPrivileges: any }
+  | { resolveCheckPrivileges: { privileges: Array<{ privilege: string; authorized: boolean }> } };
 
 const actions = new Actions('1.0.0-zeta1');
 const mockRequest = httpServerMock.createKibanaRequest();
@@ -26,7 +28,8 @@ const createMockAuthz = (options: MockAuthzOptions) => {
         throw options.rejectCheckPrivileges;
       }
 
-      expect(checkActions).toEqual(Object.keys(options.resolveCheckPrivileges.privileges));
+      const expected = options.resolveCheckPrivileges.privileges.map(x => x.privilege);
+      expect(checkActions).toEqual(expected);
       return options.resolveCheckPrivileges;
     });
   });
@@ -226,17 +229,17 @@ describe('usingPrivileges', () => {
   test(`disables ui capabilities when they don't have privileges`, async () => {
     const mockAuthz = createMockAuthz({
       resolveCheckPrivileges: {
-        privileges: {
-          [actions.ui.get('navLinks', 'foo')]: true,
-          [actions.ui.get('navLinks', 'bar')]: false,
-          [actions.ui.get('navLinks', 'quz')]: false,
-          [actions.ui.get('management', 'kibana', 'indices')]: true,
-          [actions.ui.get('management', 'kibana', 'settings')]: false,
-          [actions.ui.get('fooFeature', 'foo')]: true,
-          [actions.ui.get('fooFeature', 'bar')]: false,
-          [actions.ui.get('barFeature', 'foo')]: true,
-          [actions.ui.get('barFeature', 'bar')]: false,
-        },
+        privileges: [
+          { privilege: actions.ui.get('navLinks', 'foo'), authorized: true },
+          { privilege: actions.ui.get('navLinks', 'bar'), authorized: false },
+          { privilege: actions.ui.get('navLinks', 'quz'), authorized: false },
+          { privilege: actions.ui.get('management', 'kibana', 'indices'), authorized: true },
+          { privilege: actions.ui.get('management', 'kibana', 'settings'), authorized: false },
+          { privilege: actions.ui.get('fooFeature', 'foo'), authorized: true },
+          { privilege: actions.ui.get('fooFeature', 'bar'), authorized: false },
+          { privilege: actions.ui.get('barFeature', 'foo'), authorized: true },
+          { privilege: actions.ui.get('barFeature', 'bar'), authorized: false },
+        ],
       },
     });
 
@@ -314,15 +317,15 @@ describe('usingPrivileges', () => {
   test(`doesn't re-enable disabled uiCapabilities`, async () => {
     const mockAuthz = createMockAuthz({
       resolveCheckPrivileges: {
-        privileges: {
-          [actions.ui.get('navLinks', 'foo')]: true,
-          [actions.ui.get('navLinks', 'bar')]: true,
-          [actions.ui.get('management', 'kibana', 'indices')]: true,
-          [actions.ui.get('fooFeature', 'foo')]: true,
-          [actions.ui.get('fooFeature', 'bar')]: true,
-          [actions.ui.get('barFeature', 'foo')]: true,
-          [actions.ui.get('barFeature', 'bar')]: true,
-        },
+        privileges: [
+          { privilege: actions.ui.get('navLinks', 'foo'), authorized: true },
+          { privilege: actions.ui.get('navLinks', 'bar'), authorized: true },
+          { privilege: actions.ui.get('management', 'kibana', 'indices'), authorized: true },
+          { privilege: actions.ui.get('fooFeature', 'foo'), authorized: true },
+          { privilege: actions.ui.get('fooFeature', 'bar'), authorized: true },
+          { privilege: actions.ui.get('barFeature', 'foo'), authorized: true },
+          { privilege: actions.ui.get('barFeature', 'bar'), authorized: true },
+        ],
       },
     });
 
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
index be26f52fbf756..f0f1a42ad0bd5 100644
--- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
+++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
@@ -9,7 +9,7 @@ import { UICapabilities } from 'ui/capabilities';
 import { KibanaRequest, Logger } from '../../../../../src/core/server';
 import { Feature } from '../../../features/server';
 
-import { CheckPrivilegesAtResourceResponse } from './check_privileges';
+import { CheckPrivilegesResponse } from './check_privileges';
 import { Authorization } from './index';
 
 export function disableUICapabilitiesFactory(
@@ -77,7 +77,7 @@ export function disableUICapabilitiesFactory(
       []
     );
 
-    let checkPrivilegesResponse: CheckPrivilegesAtResourceResponse;
+    let checkPrivilegesResponse: CheckPrivilegesResponse;
     try {
       const checkPrivilegesDynamically = authz.checkPrivilegesDynamicallyWithRequest(request);
       checkPrivilegesResponse = await checkPrivilegesDynamically(uiActions);
@@ -105,7 +105,9 @@ export function disableUICapabilitiesFactory(
       }
 
       const action = authz.actions.ui.get(featureId, ...uiCapabilityParts);
-      return checkPrivilegesResponse.privileges[action] === true;
+      return checkPrivilegesResponse.privileges.some(
+        x => x.privilege === action && x.authorized === true
+      );
     };
 
     return mapValues(uiCapabilities, (featureUICapabilities, featureId) => {
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index 032d231fe798f..68acf68f46109 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -149,6 +149,7 @@ export class Plugin {
       auditLogger: new SecurityAuditLogger(() => this.getLegacyAPI().auditLogger),
       authz,
       savedObjects: core.savedObjects,
+      getSpacesService: this.getSpacesService,
     });
 
     core.capabilities.registerSwitcher(authz.disableUnauthorizedCapabilities);
diff --git a/x-pack/plugins/security/server/saved_objects/index.ts b/x-pack/plugins/security/server/saved_objects/index.ts
index 5954729562847..7dac745fcf84b 100644
--- a/x-pack/plugins/security/server/saved_objects/index.ts
+++ b/x-pack/plugins/security/server/saved_objects/index.ts
@@ -13,14 +13,21 @@ import {
 import { SecureSavedObjectsClientWrapper } from './secure_saved_objects_client_wrapper';
 import { Authorization } from '../authorization';
 import { SecurityAuditLogger } from '../audit';
+import { SpacesService } from '../plugin';
 
 interface SetupSavedObjectsParams {
   auditLogger: SecurityAuditLogger;
   authz: Pick<Authorization, 'mode' | 'actions' | 'checkSavedObjectsPrivilegesWithRequest'>;
   savedObjects: CoreSetup['savedObjects'];
+  getSpacesService(): SpacesService | undefined;
 }
 
-export function setupSavedObjects({ auditLogger, authz, savedObjects }: SetupSavedObjectsParams) {
+export function setupSavedObjects({
+  auditLogger,
+  authz,
+  savedObjects,
+  getSpacesService,
+}: SetupSavedObjectsParams) {
   const getKibanaRequest = (request: KibanaRequest | LegacyRequest) =>
     request instanceof KibanaRequest ? request : KibanaRequest.from(request);
 
@@ -44,6 +51,7 @@ export function setupSavedObjects({ auditLogger, authz, savedObjects }: SetupSav
             kibanaRequest
           ),
           errors: SavedObjectsClient.errors,
+          getSpacesService,
         })
       : client;
   });
diff --git a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
index 3c04508e3a74a..3c4034e07f995 100644
--- a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
@@ -9,6 +9,11 @@ import { Actions } from '../authorization';
 import { securityAuditLoggerMock } from '../audit/index.mock';
 import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectActions } from '../authorization/actions/saved_object';
+
+let clientOpts: ReturnType<typeof createSecureSavedObjectsClientWrapperOptions>;
+let client: SecureSavedObjectsClientWrapper;
+const USERNAME = Symbol();
 
 const createSecureSavedObjectsClientWrapperOptions = () => {
   const actions = new Actions('some-version');
@@ -22,810 +27,677 @@ const createSecureSavedObjectsClientWrapperOptions = () => {
   const errors = ({
     decorateForbiddenError: jest.fn().mockReturnValue(forbiddenError),
     decorateGeneralError: jest.fn().mockReturnValue(generalError),
+    isNotFoundError: jest.fn().mockReturnValue(false),
   } as unknown) as jest.Mocked<SavedObjectsClientContract['errors']>;
+  const getSpacesService = jest.fn().mockReturnValue(true);
 
   return {
     actions,
     baseClient: savedObjectsClientMock.create(),
     checkSavedObjectsPrivilegesAsCurrentUser: jest.fn(),
     errors,
+    getSpacesService,
     auditLogger: securityAuditLoggerMock.create(),
     forbiddenError,
     generalError,
   };
 };
 
-describe('#errors', () => {
-  test(`assigns errors from constructor to .errors`, () => {
-    const options = createSecureSavedObjectsClientWrapperOptions();
-    const client = new SecureSavedObjectsClientWrapper(options);
+const expectGeneralError = async (fn: Function, args: Record<string, any>) => {
+  // mock the checkPrivileges.globally rejection
+  const rejection = new Error('An actual error would happen here');
+  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(rejection);
+
+  await expect(fn.bind(client)(...Object.values(args))).rejects.toThrowError(
+    clientOpts.generalError
+  );
+  expect(clientOpts.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
+  expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
+  expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
+};
+
+/**
+ * Fails the first authorization check, passes any others
+ * Requires that function args are passed in as key/value pairs
+ * The argument properties must be in the correct order to be spread properly
+ */
+const expectForbiddenError = async (fn: Function, args: Record<string, any>) => {
+  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+    getMockCheckPrivilegesFailure
+  );
+
+  await expect(fn.bind(client)(...Object.values(args))).rejects.toThrowError(
+    clientOpts.forbiddenError
+  );
+  const getCalls = (clientOpts.actions.savedObject.get as jest.MockedFunction<
+    SavedObjectActions['get']
+  >).mock.calls;
+  const actions = clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mock.calls[0][0];
+  const spaceId = args.options?.namespace || 'default';
+
+  const ACTION = getCalls[0][1];
+  const types = getCalls.map(x => x[0]);
+  const missing = [{ spaceId, privilege: actions[0] }]; // if there was more than one type, only the first type was unauthorized
+  const spaceIds = [spaceId];
+
+  expect(clientOpts.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
+  expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledTimes(1);
+  expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
+    USERNAME,
+    ACTION,
+    types,
+    spaceIds,
+    missing,
+    args
+  );
+  expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
+};
+
+const expectSuccess = async (fn: Function, args: Record<string, any>) => {
+  const result = await fn.bind(client)(...Object.values(args));
+  const getCalls = (clientOpts.actions.savedObject.get as jest.MockedFunction<
+    SavedObjectActions['get']
+  >).mock.calls;
+  const ACTION = getCalls[0][1];
+  const types = getCalls.map(x => x[0]);
+  const spaceIds = [args.options?.namespace || 'default'];
+
+  expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
+  expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledTimes(1);
+  expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
+    USERNAME,
+    ACTION,
+    types,
+    spaceIds,
+    args
+  );
+  return result;
+};
+
+const expectPrivilegeCheck = async (fn: Function, args: Record<string, any>) => {
+  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+    getMockCheckPrivilegesFailure
+  );
+
+  await expect(fn.bind(client)(...Object.values(args))).rejects.toThrow(); // test is simpler with error case
+  const getResults = (clientOpts.actions.savedObject.get as jest.MockedFunction<
+    SavedObjectActions['get']
+  >).mock.results;
+  const actions = getResults.map(x => x.value);
+
+  expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledTimes(1);
+  expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
+    actions,
+    args.options?.namespace
+  );
+};
+
+const expectObjectNamespaceFiltering = async (fn: Function, args: Record<string, any>) => {
+  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementationOnce(
+    getMockCheckPrivilegesSuccess // privilege check for authorization
+  );
+  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+    getMockCheckPrivilegesFailure // privilege check for namespace filtering
+  );
+
+  const authorizedNamespace = args.options.namespace || 'default';
+  const namespaces = ['some-other-namespace', authorizedNamespace];
+  const returnValue = { namespaces, foo: 'bar' };
+  // we don't know which base client method will be called; mock them all
+  clientOpts.baseClient.create.mockReturnValue(returnValue as any);
+  clientOpts.baseClient.get.mockReturnValue(returnValue as any);
+  clientOpts.baseClient.update.mockReturnValue(returnValue as any);
+
+  const result = await fn.bind(client)(...Object.values(args));
+  expect(result).toEqual(expect.objectContaining({ namespaces: [authorizedNamespace, '?'] }));
+
+  expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledTimes(2);
+  expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenLastCalledWith(
+    'login:',
+    namespaces
+  );
+};
+
+const expectObjectsNamespaceFiltering = async (fn: Function, args: Record<string, any>) => {
+  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementationOnce(
+    getMockCheckPrivilegesSuccess // privilege check for authorization
+  );
+  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+    getMockCheckPrivilegesFailure // privilege check for namespace filtering
+  );
+
+  const authorizedNamespace = args.options.namespace || 'default';
+  const returnValue = {
+    saved_objects: [
+      { namespaces: ['foo'] },
+      { namespaces: [authorizedNamespace] },
+      { namespaces: ['foo', authorizedNamespace] },
+    ],
+  };
+
+  // we don't know which base client method will be called; mock them all
+  clientOpts.baseClient.bulkCreate.mockReturnValue(returnValue as any);
+  clientOpts.baseClient.bulkGet.mockReturnValue(returnValue as any);
+  clientOpts.baseClient.bulkUpdate.mockReturnValue(returnValue as any);
+  clientOpts.baseClient.find.mockReturnValue(returnValue as any);
+
+  const result = await fn.bind(client)(...Object.values(args));
+  expect(result).toEqual(
+    expect.objectContaining({
+      saved_objects: [
+        { namespaces: ['?'] },
+        { namespaces: [authorizedNamespace] },
+        { namespaces: [authorizedNamespace, '?'] },
+      ],
+    })
+  );
+
+  expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledTimes(2);
+  expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenLastCalledWith('login:', [
+    'foo',
+    authorizedNamespace,
+  ]);
+};
+
+function getMockCheckPrivilegesSuccess(actions: string | string[], namespaces?: string | string[]) {
+  const _namespaces = Array.isArray(namespaces) ? namespaces : [namespaces || 'default'];
+  const _actions = Array.isArray(actions) ? actions : [actions];
+  return {
+    hasAllRequested: true,
+    username: USERNAME,
+    privileges: _namespaces
+      .map(resource =>
+        _actions.map(action => ({
+          resource,
+          privilege: action,
+          authorized: true,
+        }))
+      )
+      .flat(),
+  };
+}
+
+/**
+ * Fails the authorization check for the first privilege, and passes any others
+ * This check may be for an action for two different types in the same namespace
+ * Or, it may be for an action for the same type in two different namespaces
+ * Either way, the first privilege check returned is false, and any others return true
+ */
+function getMockCheckPrivilegesFailure(actions: string | string[], namespaces?: string | string[]) {
+  const _namespaces = Array.isArray(namespaces) ? namespaces : [namespaces || 'default'];
+  const _actions = Array.isArray(actions) ? actions : [actions];
+  return {
+    hasAllRequested: false,
+    username: USERNAME,
+    privileges: _namespaces
+      .map((resource, idxa) =>
+        _actions.map((action, idxb) => ({
+          resource,
+          privilege: action,
+          authorized: idxa > 0 || idxb > 0,
+        }))
+      )
+      .flat(),
+  };
+}
+
+/**
+ * Before each test, create the Client with its Options
+ */
+beforeEach(() => {
+  clientOpts = createSecureSavedObjectsClientWrapperOptions();
+  client = new SecureSavedObjectsClientWrapper(clientOpts);
+
+  // succeed privilege checks by default
+  clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+    getMockCheckPrivilegesSuccess
+  );
+});
+
+describe('#addToNamespaces', () => {
+  const type = 'foo';
+  const id = `${type}-id`;
+  const newNs1 = 'foo-namespace';
+  const newNs2 = 'bar-namespace';
+  const namespaces = [newNs1, newNs2];
+  const currentNs = 'default';
+  const privilege1 = `mock-saved_object:${type}/create`;
+  const privilege2 = `mock-saved_object:${type}/update`;
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    await expectGeneralError(client.addToNamespaces, { type, id, namespaces });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized to create in new space`, async () => {
+    clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+      getMockCheckPrivilegesFailure
+    );
+
+    await expect(client.addToNamespaces(type, id, namespaces)).rejects.toThrowError(
+      clientOpts.forbiddenError
+    );
+
+    expect(clientOpts.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledTimes(1);
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
+      USERNAME,
+      'addToNamespacesCreate',
+      [type],
+      namespaces.sort(),
+      [{ privilege: privilege1, spaceId: newNs1 }],
+      { id, type, namespaces, options: {} }
+    );
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized to update in current space`, async () => {
+    clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementationOnce(
+      getMockCheckPrivilegesSuccess // create
+    );
+    clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+      getMockCheckPrivilegesFailure // update
+    );
+
+    await expect(client.addToNamespaces(type, id, namespaces)).rejects.toThrowError(
+      clientOpts.forbiddenError
+    );
+
+    expect(clientOpts.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledTimes(1);
+    expect(
+      clientOpts.auditLogger.savedObjectsAuthorizationFailure
+    ).toHaveBeenLastCalledWith(
+      USERNAME,
+      'addToNamespacesUpdate',
+      [type],
+      [currentNs],
+      [{ privilege: privilege2, spaceId: currentNs }],
+      { id, type, namespaces, options: {} }
+    );
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledTimes(1);
+  });
+
+  test(`returns result of baseClient.addToNamespaces when authorized`, async () => {
+    const apiCallReturnValue = Symbol();
+    clientOpts.baseClient.addToNamespaces.mockReturnValue(apiCallReturnValue as any);
+
+    const result = await client.addToNamespaces(type, id, namespaces);
+    expect(result).toBe(apiCallReturnValue);
+
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledTimes(2);
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenNthCalledWith(
+      1,
+      USERNAME,
+      'addToNamespacesCreate', // action for privilege check is 'create', but auditAction is 'addToNamespacesCreate'
+      [type],
+      namespaces.sort(),
+      { type, id, namespaces, options: {} }
+    );
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenNthCalledWith(
+      2,
+      USERNAME,
+      'addToNamespacesUpdate', // action for privilege check is 'update', but auditAction is 'addToNamespacesUpdate'
+      [type],
+      [currentNs],
+      { type, id, namespaces, options: {} }
+    );
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementationOnce(
+      getMockCheckPrivilegesSuccess // create
+    );
+    clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+      getMockCheckPrivilegesFailure // update
+    );
+
+    await expect(client.addToNamespaces(type, id, namespaces)).rejects.toThrow(); // test is simpler with error case
+
+    expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledTimes(2);
+    expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenNthCalledWith(
+      1,
+      [privilege1],
+      namespaces
+    );
+    expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenNthCalledWith(
+      2,
+      [privilege2],
+      undefined // default namespace
+    );
+  });
+});
+
+describe('#bulkCreate', () => {
+  const attributes = { some: 'attr' };
+  const obj1 = Object.freeze({ type: 'foo', otherThing: 'sup', attributes });
+  const obj2 = Object.freeze({ type: 'bar', otherThing: 'everyone', attributes });
+  const options = Object.freeze({ namespace: 'some-ns' });
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    const objects = [obj1];
+    await expectGeneralError(client.bulkCreate, { objects });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    const objects = [obj1, obj2];
+    await expectForbiddenError(client.bulkCreate, { objects, options });
+  });
+
+  test(`returns result of baseClient.bulkCreate when authorized`, async () => {
+    const apiCallReturnValue = { saved_objects: [], foo: 'bar' };
+    clientOpts.baseClient.bulkCreate.mockReturnValue(apiCallReturnValue as any);
+
+    const objects = [obj1, obj2];
+    const result = await expectSuccess(client.bulkCreate, { objects, options });
+    expect(result).toEqual(apiCallReturnValue);
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    const objects = [obj1, obj2];
+    await expectPrivilegeCheck(client.bulkCreate, { objects, options });
+  });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    const objects = [obj1, obj2];
+    await expectObjectsNamespaceFiltering(client.bulkCreate, { objects, options });
+  });
+});
+
+describe('#bulkGet', () => {
+  const obj1 = Object.freeze({ type: 'foo', id: 'foo-id' });
+  const obj2 = Object.freeze({ type: 'bar', id: 'bar-id' });
+  const options = Object.freeze({ namespace: 'some-ns' });
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    const objects = [obj1];
+    await expectGeneralError(client.bulkGet, { objects });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    const objects = [obj1, obj2];
+    await expectForbiddenError(client.bulkGet, { objects, options });
+  });
+
+  test(`returns result of baseClient.bulkGet when authorized`, async () => {
+    const apiCallReturnValue = { saved_objects: [], foo: 'bar' };
+    clientOpts.baseClient.bulkGet.mockReturnValue(apiCallReturnValue as any);
+
+    const objects = [obj1, obj2];
+    const result = await expectSuccess(client.bulkGet, { objects, options });
+    expect(result).toEqual(apiCallReturnValue);
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    const objects = [obj1, obj2];
+    await expectPrivilegeCheck(client.bulkGet, { objects, options });
+  });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    const objects = [obj1, obj2];
+    await expectObjectsNamespaceFiltering(client.bulkGet, { objects, options });
+  });
+});
+
+describe('#bulkUpdate', () => {
+  const obj1 = Object.freeze({ type: 'foo', id: 'foo-id', attributes: { some: 'attr' } });
+  const obj2 = Object.freeze({ type: 'bar', id: 'bar-id', attributes: { other: 'attr' } });
+  const options = Object.freeze({ namespace: 'some-ns' });
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    const objects = [obj1];
+    await expectGeneralError(client.bulkUpdate, { objects });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    const objects = [obj1, obj2];
+    await expectForbiddenError(client.bulkUpdate, { objects, options });
+  });
+
+  test(`returns result of baseClient.bulkUpdate when authorized`, async () => {
+    const apiCallReturnValue = { saved_objects: [], foo: 'bar' };
+    clientOpts.baseClient.bulkUpdate.mockReturnValue(apiCallReturnValue as any);
+
+    const objects = [obj1, obj2];
+    const result = await expectSuccess(client.bulkUpdate, { objects, options });
+    expect(result).toEqual(apiCallReturnValue);
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    const objects = [obj1, obj2];
+    await expectPrivilegeCheck(client.bulkUpdate, { objects, options });
+  });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    const objects = [obj1, obj2];
+    await expectObjectsNamespaceFiltering(client.bulkUpdate, { objects, options });
+  });
+});
+
+describe('#create', () => {
+  const type = 'foo';
+  const attributes = { some_attr: 's' };
+  const options = Object.freeze({ namespace: 'some-ns' });
+
+  test(`throws decorated GeneralError when checkPrivileges.globally rejects promise`, async () => {
+    await expectGeneralError(client.create, { type });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    await expectForbiddenError(client.create, { type, attributes, options });
+  });
+
+  test(`returns result of baseClient.create when authorized`, async () => {
+    const apiCallReturnValue = Symbol();
+    clientOpts.baseClient.create.mockResolvedValue(apiCallReturnValue as any);
+
+    const result = await expectSuccess(client.create, { type, attributes, options });
+    expect(result).toBe(apiCallReturnValue);
+  });
 
-    expect(client.errors).toBe(options.errors);
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    await expectPrivilegeCheck(client.create, { type, attributes, options });
+  });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    await expectObjectNamespaceFiltering(client.create, { type, attributes, options });
   });
 });
 
-describe(`spaces disabled`, () => {
-  describe('#create', () => {
-    test(`throws decorated GeneralError when checkPrivileges.globally rejects promise`, async () => {
-      const type = 'foo';
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(
-        new Error('An actual error would happen here')
-      );
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      await expect(client.create(type)).rejects.toThrowError(options.generalError);
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'create')],
-        undefined
-      );
-      expect(options.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when unauthorized`, async () => {
-      const type = 'foo';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: { [options.actions.savedObject.get(type, 'create')]: false },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const attributes = { some_attr: 's' };
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.create(type, attributes, apiCallOptions)).rejects.toThrowError(
-        options.forbiddenError
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'create')],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'create',
-        [type],
-        [options.actions.savedObject.get(type, 'create')],
-        { type, attributes, options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`returns result of baseClient.create when authorized`, async () => {
-      const type = 'foo';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: true,
-        username,
-        privileges: { [options.actions.savedObject.get(type, 'create')]: true },
-      });
-
-      const apiCallReturnValue = Symbol();
-      options.baseClient.create.mockReturnValue(apiCallReturnValue as any);
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const attributes = { some_attr: 's' };
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.create(type, attributes, apiCallOptions)).resolves.toBe(
-        apiCallReturnValue
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'create')],
-        apiCallOptions.namespace
-      );
-      expect(options.baseClient.create).toHaveBeenCalledWith(type, attributes, apiCallOptions);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
-        username,
-        'create',
-        [type],
-        { type, attributes, options: apiCallOptions }
-      );
-    });
-  });
-
-  describe('#bulkCreate', () => {
-    test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
-      const type = 'foo';
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(
-        new Error('An actual error would happen here')
-      );
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(
-        client.bulkCreate([{ type, attributes: {} }], apiCallOptions)
-      ).rejects.toThrowError(options.generalError);
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'bulk_create')],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when unauthorized`, async () => {
-      const type1 = 'foo';
-      const type2 = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type1, 'bulk_create')]: false,
-          [options.actions.savedObject.get(type2, 'bulk_create')]: true,
-        },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const objects = [
-        { type: type1, attributes: {} },
-        { type: type2, attributes: {} },
-      ];
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.bulkCreate(objects, apiCallOptions)).rejects.toThrowError(
-        options.forbiddenError
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [
-          options.actions.savedObject.get(type1, 'bulk_create'),
-          options.actions.savedObject.get(type2, 'bulk_create'),
-        ],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'bulk_create',
-        [type1, type2],
-        [options.actions.savedObject.get(type1, 'bulk_create')],
-        { objects, options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`returns result of baseClient.bulkCreate when authorized`, async () => {
-      const type1 = 'foo';
-      const type2 = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: true,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type1, 'bulk_create')]: true,
-          [options.actions.savedObject.get(type2, 'bulk_create')]: true,
-        },
-      });
-
-      const apiCallReturnValue = Symbol();
-      options.baseClient.bulkCreate.mockReturnValue(apiCallReturnValue as any);
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const objects = [
-        { type: type1, otherThing: 'sup', attributes: {} },
-        { type: type2, otherThing: 'everyone', attributes: {} },
-      ];
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.bulkCreate(objects, apiCallOptions)).resolves.toBe(apiCallReturnValue);
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [
-          options.actions.savedObject.get(type1, 'bulk_create'),
-          options.actions.savedObject.get(type2, 'bulk_create'),
-        ],
-        apiCallOptions.namespace
-      );
-      expect(options.baseClient.bulkCreate).toHaveBeenCalledWith(objects, apiCallOptions);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
-        username,
-        'bulk_create',
-        [type1, type2],
-        { objects, options: apiCallOptions }
-      );
-    });
-  });
-
-  describe('#delete', () => {
-    test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
-      const type = 'foo';
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(
-        new Error('An actual error would happen here')
-      );
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      await expect(client.delete(type, 'bar')).rejects.toThrowError(options.generalError);
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'delete')],
-        undefined
-      );
-      expect(options.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when unauthorized`, async () => {
-      const type = 'foo';
-      const id = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type, 'delete')]: false,
-        },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.delete(type, id, apiCallOptions)).rejects.toThrowError(
-        options.forbiddenError
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'delete')],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'delete',
-        [type],
-        [options.actions.savedObject.get(type, 'delete')],
-        { type, id, options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`returns result of internalRepository.delete when authorized`, async () => {
-      const type = 'foo';
-      const id = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: true,
-        username,
-        privileges: { [options.actions.savedObject.get(type, 'delete')]: true },
-      });
-
-      const apiCallReturnValue = Symbol();
-      options.baseClient.delete.mockReturnValue(apiCallReturnValue as any);
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.delete(type, id, apiCallOptions)).resolves.toBe(apiCallReturnValue);
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'delete')],
-        apiCallOptions.namespace
-      );
-      expect(options.baseClient.delete).toHaveBeenCalledWith(type, id, apiCallOptions);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
-        username,
-        'delete',
-        [type],
-        { type, id, options: apiCallOptions }
-      );
-    });
-  });
-
-  describe('#find', () => {
-    test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
-      const type = 'foo';
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(
-        new Error('An actual error would happen here')
-      );
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      await expect(client.find({ type })).rejects.toThrowError(options.generalError);
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'find')],
-        undefined
-      );
-      expect(options.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when type's singular and unauthorized`, async () => {
-      const type = 'foo';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: { [options.actions.savedObject.get(type, 'find')]: false },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const apiCallOptions = Object.freeze({ type, namespace: 'some-ns' });
-      await expect(client.find(apiCallOptions)).rejects.toThrowError(options.forbiddenError);
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'find')],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'find',
-        [type],
-        [options.actions.savedObject.get(type, 'find')],
-        { options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when type's an array and unauthorized`, async () => {
-      const type1 = 'foo';
-      const type2 = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type1, 'find')]: false,
-          [options.actions.savedObject.get(type2, 'find')]: true,
-        },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const apiCallOptions = Object.freeze({ type: [type1, type2], namespace: 'some-ns' });
-      await expect(client.find(apiCallOptions)).rejects.toThrowError(options.forbiddenError);
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [
-          options.actions.savedObject.get(type1, 'find'),
-          options.actions.savedObject.get(type2, 'find'),
-        ],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'find',
-        [type1, type2],
-        [options.actions.savedObject.get(type1, 'find')],
-        { options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`returns result of baseClient.find when authorized`, async () => {
-      const type = 'foo';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: true,
-        username,
-        privileges: { [options.actions.savedObject.get(type, 'find')]: true },
-      });
-
-      const apiCallReturnValue = Symbol();
-      options.baseClient.find.mockReturnValue(apiCallReturnValue as any);
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const apiCallOptions = Object.freeze({ type, namespace: 'some-ns' });
-      await expect(client.find(apiCallOptions)).resolves.toBe(apiCallReturnValue);
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'find')],
-        apiCallOptions.namespace
-      );
-      expect(options.baseClient.find).toHaveBeenCalledWith(apiCallOptions);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
-        username,
-        'find',
-        [type],
-        { options: apiCallOptions }
-      );
-    });
-  });
-
-  describe('#bulkGet', () => {
-    test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
-      const type = 'foo';
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(
-        new Error('An actual error would happen here')
-      );
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      await expect(client.bulkGet([{ id: 'bar', type }])).rejects.toThrowError(
-        options.generalError
-      );
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'bulk_get')],
-        undefined
-      );
-      expect(options.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when unauthorized`, async () => {
-      const type1 = 'foo';
-      const type2 = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type1, 'bulk_get')]: false,
-          [options.actions.savedObject.get(type2, 'bulk_get')]: true,
-        },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const objects = [
-        { type: type1, id: `bar-${type1}` },
-        { type: type2, id: `bar-${type2}` },
-      ];
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.bulkGet(objects, apiCallOptions)).rejects.toThrowError(
-        options.forbiddenError
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [
-          options.actions.savedObject.get(type1, 'bulk_get'),
-          options.actions.savedObject.get(type2, 'bulk_get'),
-        ],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'bulk_get',
-        [type1, type2],
-        [options.actions.savedObject.get(type1, 'bulk_get')],
-        { objects, options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`returns result of baseClient.bulkGet when authorized`, async () => {
-      const type1 = 'foo';
-      const type2 = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: true,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type1, 'bulk_get')]: true,
-          [options.actions.savedObject.get(type2, 'bulk_get')]: true,
-        },
-      });
-
-      const apiCallReturnValue = Symbol();
-      options.baseClient.bulkGet.mockReturnValue(apiCallReturnValue as any);
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const objects = [
-        { type: type1, id: `id-${type1}` },
-        { type: type2, id: `id-${type2}` },
-      ];
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.bulkGet(objects, apiCallOptions)).resolves.toBe(apiCallReturnValue);
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [
-          options.actions.savedObject.get(type1, 'bulk_get'),
-          options.actions.savedObject.get(type2, 'bulk_get'),
-        ],
-        apiCallOptions.namespace
-      );
-      expect(options.baseClient.bulkGet).toHaveBeenCalledWith(objects, apiCallOptions);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
-        username,
-        'bulk_get',
-        [type1, type2],
-        { objects, options: apiCallOptions }
-      );
-    });
-  });
-
-  describe('#get', () => {
-    test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
-      const type = 'foo';
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(
-        new Error('An actual error would happen here')
-      );
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      await expect(client.get(type, 'bar')).rejects.toThrowError(options.generalError);
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'get')],
-        undefined
-      );
-      expect(options.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when unauthorized`, async () => {
-      const type = 'foo';
-      const id = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type, 'get')]: false,
-        },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.get(type, id, apiCallOptions)).rejects.toThrowError(
-        options.forbiddenError
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'get')],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'get',
-        [type],
-        [options.actions.savedObject.get(type, 'get')],
-        { type, id, options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`returns result of baseClient.get when authorized`, async () => {
-      const type = 'foo';
-      const id = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: true,
-        username,
-        privileges: { [options.actions.savedObject.get(type, 'get')]: true },
-      });
-
-      const apiCallReturnValue = Symbol();
-      options.baseClient.get.mockReturnValue(apiCallReturnValue as any);
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.get(type, id, apiCallOptions)).resolves.toBe(apiCallReturnValue);
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'get')],
-        apiCallOptions.namespace
-      );
-      expect(options.baseClient.get).toHaveBeenCalledWith(type, id, apiCallOptions);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
-        username,
-        'get',
-        [type],
-        { type, id, options: apiCallOptions }
-      );
-    });
-  });
-
-  describe('#update', () => {
-    test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
-      const type = 'foo';
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(
-        new Error('An actual error would happen here')
-      );
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      await expect(client.update(type, 'bar', {})).rejects.toThrowError(options.generalError);
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'update')],
-        undefined
-      );
-      expect(options.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when unauthorized`, async () => {
-      const type = 'foo';
-      const id = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type, 'update')]: false,
-        },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const attributes = { some: 'attr' };
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.update(type, id, attributes, apiCallOptions)).rejects.toThrowError(
-        options.forbiddenError
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'update')],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'update',
-        [type],
-        [options.actions.savedObject.get(type, 'update')],
-        { type, id, attributes, options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`returns result of baseClient.update when authorized`, async () => {
-      const type = 'foo';
-      const id = 'bar';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: true,
-        username,
-        privileges: { [options.actions.savedObject.get(type, 'update')]: true },
-      });
-
-      const apiCallReturnValue = Symbol();
-      options.baseClient.update.mockReturnValue(apiCallReturnValue as any);
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const attributes = { some: 'attr' };
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.update(type, id, attributes, apiCallOptions)).resolves.toBe(
-        apiCallReturnValue
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'update')],
-        apiCallOptions.namespace
-      );
-      expect(options.baseClient.update).toHaveBeenCalledWith(type, id, attributes, apiCallOptions);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
-        username,
-        'update',
-        [type],
-        { type, id, attributes, options: apiCallOptions }
-      );
-    });
-  });
-
-  describe('#bulkUpdate', () => {
-    test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
-      const type = 'foo';
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockRejectedValue(
-        new Error('An actual error would happen here')
-      );
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      await expect(client.bulkUpdate([{ id: 'bar', type, attributes: {} }])).rejects.toThrowError(
-        options.generalError
-      );
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'bulk_update')],
-        undefined
-      );
-      expect(options.errors.decorateGeneralError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`throws decorated ForbiddenError when unauthorized`, async () => {
-      const type = 'foo';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: false,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type, 'bulk_update')]: false,
-        },
-      });
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const objects = [{ type, id: `bar-${type}`, attributes: {} }];
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.bulkUpdate(objects, apiCallOptions)).rejects.toThrowError(
-        options.forbiddenError
-      );
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'bulk_update')],
-        apiCallOptions.namespace
-      );
-      expect(options.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
-        username,
-        'bulk_update',
-        [type],
-        [options.actions.savedObject.get(type, 'bulk_update')],
-        { objects, options: apiCallOptions }
-      );
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
-    });
-
-    test(`returns result of baseClient.bulkUpdate when authorized`, async () => {
-      const type = 'foo';
-      const username = Symbol();
-      const options = createSecureSavedObjectsClientWrapperOptions();
-      options.checkSavedObjectsPrivilegesAsCurrentUser.mockResolvedValue({
-        hasAllRequested: true,
-        username,
-        privileges: {
-          [options.actions.savedObject.get(type, 'bulk_update')]: true,
-        },
-      });
-
-      const apiCallReturnValue = Symbol();
-      options.baseClient.bulkUpdate.mockReturnValue(apiCallReturnValue as any);
-
-      const client = new SecureSavedObjectsClientWrapper(options);
-
-      const objects = [{ type, id: `id-${type}`, attributes: {} }];
-      const apiCallOptions = Object.freeze({ namespace: 'some-ns' });
-      await expect(client.bulkUpdate(objects, apiCallOptions)).resolves.toBe(apiCallReturnValue);
-
-      expect(options.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
-        [options.actions.savedObject.get(type, 'bulk_update')],
-        apiCallOptions.namespace
-      );
-      expect(options.baseClient.bulkUpdate).toHaveBeenCalledWith(objects, apiCallOptions);
-      expect(options.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
-      expect(options.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
-        username,
-        'bulk_update',
-        [type],
-        { objects, options: apiCallOptions }
-      );
-    });
+describe('#delete', () => {
+  const type = 'foo';
+  const id = `${type}-id`;
+  const options = Object.freeze({ namespace: 'some-ns' });
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    await expectGeneralError(client.delete, { type, id });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    await expectForbiddenError(client.delete, { type, id, options });
+  });
+
+  test(`returns result of internalRepository.delete when authorized`, async () => {
+    const apiCallReturnValue = Symbol();
+    clientOpts.baseClient.delete.mockReturnValue(apiCallReturnValue as any);
+
+    const result = await expectSuccess(client.delete, { type, id, options });
+    expect(result).toBe(apiCallReturnValue);
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    await expectPrivilegeCheck(client.delete, { type, id, options });
+  });
+});
+
+describe('#find', () => {
+  const type1 = 'foo';
+  const type2 = 'bar';
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    await expectGeneralError(client.find, { type: type1 });
+  });
+
+  test(`throws decorated ForbiddenError when type's singular and unauthorized`, async () => {
+    const options = Object.freeze({ type: type1, namespace: 'some-ns' });
+    await expectForbiddenError(client.find, { options });
+  });
+
+  test(`throws decorated ForbiddenError when type's an array and unauthorized`, async () => {
+    const options = Object.freeze({ type: [type1, type2], namespace: 'some-ns' });
+    await expectForbiddenError(client.find, { options });
+  });
+
+  test(`returns result of baseClient.find when authorized`, async () => {
+    const apiCallReturnValue = { saved_objects: [], foo: 'bar' };
+    clientOpts.baseClient.find.mockReturnValue(apiCallReturnValue as any);
+
+    const options = Object.freeze({ type: type1, namespace: 'some-ns' });
+    const result = await expectSuccess(client.find, { options });
+    expect(result).toEqual(apiCallReturnValue);
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    const options = Object.freeze({ type: [type1, type2], namespace: 'some-ns' });
+    await expectPrivilegeCheck(client.find, { options });
+  });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    const options = Object.freeze({ type: [type1, type2], namespace: 'some-ns' });
+    await expectObjectsNamespaceFiltering(client.find, { options });
+  });
+});
+
+describe('#get', () => {
+  const type = 'foo';
+  const id = `${type}-id`;
+  const options = Object.freeze({ namespace: 'some-ns' });
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    await expectGeneralError(client.get, { type, id });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    await expectForbiddenError(client.get, { type, id, options });
+  });
+
+  test(`returns result of baseClient.get when authorized`, async () => {
+    const apiCallReturnValue = Symbol();
+    clientOpts.baseClient.get.mockReturnValue(apiCallReturnValue as any);
+
+    const result = await expectSuccess(client.get, { type, id, options });
+    expect(result).toBe(apiCallReturnValue);
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    await expectPrivilegeCheck(client.get, { type, id, options });
+  });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    await expectObjectNamespaceFiltering(client.get, { type, id, options });
+  });
+});
+
+describe('#deleteFromNamespaces', () => {
+  const type = 'foo';
+  const id = `${type}-id`;
+  const namespace1 = 'foo-namespace';
+  const namespace2 = 'bar-namespace';
+  const namespaces = [namespace1, namespace2];
+  const privilege = `mock-saved_object:${type}/delete`;
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    await expectGeneralError(client.deleteFromNamespaces, { type, id, namespaces });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+      getMockCheckPrivilegesFailure
+    );
+
+    await expect(client.deleteFromNamespaces(type, id, namespaces)).rejects.toThrowError(
+      clientOpts.forbiddenError
+    );
+
+    expect(clientOpts.errors.decorateForbiddenError).toHaveBeenCalledTimes(1);
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledTimes(1);
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
+      USERNAME,
+      'deleteFromNamespaces', // action for privilege check is 'delete', but auditAction is 'deleteFromNamespaces'
+      [type],
+      namespaces.sort(),
+      [{ privilege, spaceId: namespace1 }],
+      { type, id, namespaces, options: {} }
+    );
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
+  });
+
+  test(`returns result of baseClient.deleteFromNamespaces when authorized`, async () => {
+    const apiCallReturnValue = Symbol();
+    clientOpts.baseClient.deleteFromNamespaces.mockReturnValue(apiCallReturnValue as any);
+
+    const result = await client.deleteFromNamespaces(type, id, namespaces);
+    expect(result).toBe(apiCallReturnValue);
+
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).not.toHaveBeenCalled();
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledTimes(1);
+    expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
+      USERNAME,
+      'deleteFromNamespaces', // action for privilege check is 'delete', but auditAction is 'deleteFromNamespaces'
+      [type],
+      namespaces.sort(),
+      { type, id, namespaces, options: {} }
+    );
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
+      getMockCheckPrivilegesFailure
+    );
+
+    await expect(client.deleteFromNamespaces(type, id, namespaces)).rejects.toThrow(); // test is simpler with error case
+
+    expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledTimes(1);
+    expect(clientOpts.checkSavedObjectsPrivilegesAsCurrentUser).toHaveBeenCalledWith(
+      [privilege],
+      namespaces
+    );
+  });
+});
+
+describe('#update', () => {
+  const type = 'foo';
+  const id = `${type}-id`;
+  const attributes = { some: 'attr' };
+  const options = Object.freeze({ namespace: 'some-ns' });
+
+  test(`throws decorated GeneralError when hasPrivileges rejects promise`, async () => {
+    await expectGeneralError(client.update, { type, id, attributes });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    await expectForbiddenError(client.update, { type, id, attributes, options });
+  });
+
+  test(`returns result of baseClient.update when authorized`, async () => {
+    const apiCallReturnValue = Symbol();
+    clientOpts.baseClient.update.mockReturnValue(apiCallReturnValue as any);
+
+    const result = await expectSuccess(client.update, { type, id, attributes, options });
+    expect(result).toBe(apiCallReturnValue);
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    await expectPrivilegeCheck(client.update, { type, id, attributes, options });
+  });
+
+  test(`filters namespaces that the user doesn't have access to`, async () => {
+    await expectObjectNamespaceFiltering(client.update, { type, id, attributes, options });
+  });
+});
+
+describe('other', () => {
+  test(`assigns errors from constructor to .errors`, () => {
+    expect(client.errors).toBe(clientOpts.errors);
   });
 });
diff --git a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
index 2209e7fb66fcb..29503d475be73 100644
--- a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
@@ -13,9 +13,13 @@ import {
   SavedObjectsCreateOptions,
   SavedObjectsFindOptions,
   SavedObjectsUpdateOptions,
+  SavedObjectsAddToNamespacesOptions,
+  SavedObjectsDeleteFromNamespacesOptions,
 } from '../../../../../src/core/server';
 import { SecurityAuditLogger } from '../audit';
 import { Actions, CheckSavedObjectsPrivileges } from '../authorization';
+import { CheckPrivilegesResponse } from '../authorization/check_privileges';
+import { SpacesService } from '../plugin';
 
 interface SecureSavedObjectsClientWrapperOptions {
   actions: Actions;
@@ -23,6 +27,19 @@ interface SecureSavedObjectsClientWrapperOptions {
   baseClient: SavedObjectsClientContract;
   errors: SavedObjectsClientContract['errors'];
   checkSavedObjectsPrivilegesAsCurrentUser: CheckSavedObjectsPrivileges;
+  getSpacesService(): SpacesService | undefined;
+}
+
+interface SavedObjectNamespaces {
+  namespaces?: string[];
+}
+
+interface SavedObjectsNamespaces {
+  saved_objects: SavedObjectNamespaces[];
+}
+
+function uniq<T>(arr: T[]): T[] {
+  return Array.from(new Set<T>(arr));
 }
 
 export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContract {
@@ -30,19 +47,23 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
   private readonly auditLogger: PublicMethodsOf<SecurityAuditLogger>;
   private readonly baseClient: SavedObjectsClientContract;
   private readonly checkSavedObjectsPrivilegesAsCurrentUser: CheckSavedObjectsPrivileges;
+  private getSpacesService: () => SpacesService | undefined;
   public readonly errors: SavedObjectsClientContract['errors'];
+
   constructor({
     actions,
     auditLogger,
     baseClient,
     checkSavedObjectsPrivilegesAsCurrentUser,
     errors,
+    getSpacesService,
   }: SecureSavedObjectsClientWrapperOptions) {
     this.errors = errors;
     this.actions = actions;
     this.auditLogger = auditLogger;
     this.baseClient = baseClient;
     this.checkSavedObjectsPrivilegesAsCurrentUser = checkSavedObjectsPrivilegesAsCurrentUser;
+    this.getSpacesService = getSpacesService;
   }
 
   public async create<T = unknown>(
@@ -52,7 +73,8 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
   ) {
     await this.ensureAuthorized(type, 'create', options.namespace, { type, attributes, options });
 
-    return await this.baseClient.create(type, attributes, options);
+    const savedObject = await this.baseClient.create(type, attributes, options);
+    return await this.redactSavedObjectNamespaces(savedObject);
   }
 
   public async bulkCreate<T = unknown>(
@@ -66,7 +88,8 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
       { objects, options }
     );
 
-    return await this.baseClient.bulkCreate(objects, options);
+    const response = await this.baseClient.bulkCreate(objects, options);
+    return await this.redactSavedObjectsNamespaces(response);
   }
 
   public async delete(type: string, id: string, options: SavedObjectsBaseOptions = {}) {
@@ -78,7 +101,8 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
   public async find<T = unknown>(options: SavedObjectsFindOptions) {
     await this.ensureAuthorized(options.type, 'find', options.namespace, { options });
 
-    return this.baseClient.find<T>(options);
+    const response = await this.baseClient.find<T>(options);
+    return await this.redactSavedObjectsNamespaces(response);
   }
 
   public async bulkGet<T = unknown>(
@@ -90,13 +114,15 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
       options,
     });
 
-    return await this.baseClient.bulkGet<T>(objects, options);
+    const response = await this.baseClient.bulkGet<T>(objects, options);
+    return await this.redactSavedObjectsNamespaces(response);
   }
 
   public async get<T = unknown>(type: string, id: string, options: SavedObjectsBaseOptions = {}) {
     await this.ensureAuthorized(type, 'get', options.namespace, { type, id, options });
 
-    return await this.baseClient.get<T>(type, id, options);
+    const savedObject = await this.baseClient.get<T>(type, id, options);
+    return await this.redactSavedObjectNamespaces(savedObject);
   }
 
   public async update<T = unknown>(
@@ -105,14 +131,44 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
     attributes: Partial<T>,
     options: SavedObjectsUpdateOptions = {}
   ) {
-    await this.ensureAuthorized(type, 'update', options.namespace, {
-      type,
-      id,
-      attributes,
-      options,
-    });
+    const args = { type, id, attributes, options };
+    await this.ensureAuthorized(type, 'update', options.namespace, args);
 
-    return await this.baseClient.update(type, id, attributes, options);
+    const savedObject = await this.baseClient.update(type, id, attributes, options);
+    return await this.redactSavedObjectNamespaces(savedObject);
+  }
+
+  public async addToNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options: SavedObjectsAddToNamespacesOptions = {}
+  ) {
+    const args = { type, id, namespaces, options };
+    const { namespace } = options;
+    // To share an object, the user must have the "create" permission in each of the destination namespaces.
+    await this.ensureAuthorized(type, 'create', namespaces, args, 'addToNamespacesCreate');
+
+    // To share an object, the user must also have the "update" permission in one or more of the source namespaces. Because the
+    // `addToNamespaces` operation is scoped to the current namespace, we can just check if the user has the "update" permission in the
+    // current namespace. If the user has permission, but the saved object doesn't exist in this namespace, the base client operation will
+    // result in a 404 error.
+    await this.ensureAuthorized(type, 'update', namespace, args, 'addToNamespacesUpdate');
+
+    return await this.baseClient.addToNamespaces(type, id, namespaces, options);
+  }
+
+  public async deleteFromNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options: SavedObjectsDeleteFromNamespacesOptions = {}
+  ) {
+    const args = { type, id, namespaces, options };
+    // To un-share an object, the user must have the "delete" permission in each of the target namespaces.
+    await this.ensureAuthorized(type, 'delete', namespaces, args, 'deleteFromNamespaces');
+
+    return await this.baseClient.deleteFromNamespaces(type, id, namespaces, options);
   }
 
   public async bulkUpdate<T = unknown>(
@@ -126,12 +182,16 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
       { objects, options }
     );
 
-    return await this.baseClient.bulkUpdate<T>(objects, options);
+    const response = await this.baseClient.bulkUpdate<T>(objects, options);
+    return await this.redactSavedObjectsNamespaces(response);
   }
 
-  private async checkPrivileges(actions: string | string[], namespace?: string) {
+  private async checkPrivileges(
+    actions: string | string[],
+    namespaceOrNamespaces?: string | string[]
+  ) {
     try {
-      return await this.checkSavedObjectsPrivilegesAsCurrentUser(actions, namespace);
+      return await this.checkSavedObjectsPrivilegesAsCurrentUser(actions, namespaceOrNamespaces);
     } catch (error) {
       throw this.errors.decorateGeneralError(error, error.body && error.body.reason);
     }
@@ -140,43 +200,133 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
   private async ensureAuthorized(
     typeOrTypes: string | string[],
     action: string,
-    namespace?: string,
-    args?: Record<string, unknown>
+    namespaceOrNamespaces?: string | string[],
+    args?: Record<string, unknown>,
+    auditAction: string = action,
+    requiresAll = true
   ) {
     const types = Array.isArray(typeOrTypes) ? typeOrTypes : [typeOrTypes];
     const actionsToTypesMap = new Map(
       types.map(type => [this.actions.savedObject.get(type, action), type])
     );
     const actions = Array.from(actionsToTypesMap.keys());
-    const { hasAllRequested, username, privileges } = await this.checkPrivileges(
-      actions,
-      namespace
-    );
+    const result = await this.checkPrivileges(actions, namespaceOrNamespaces);
+
+    const { hasAllRequested, username, privileges } = result;
+    const spaceIds = uniq(
+      privileges.map(({ resource }) => resource).filter(x => x !== undefined)
+    ).sort() as string[];
 
-    if (hasAllRequested) {
-      this.auditLogger.savedObjectsAuthorizationSuccess(username, action, types, args);
+    const isAuthorized =
+      (requiresAll && hasAllRequested) ||
+      (!requiresAll && privileges.some(({ authorized }) => authorized));
+    if (isAuthorized) {
+      this.auditLogger.savedObjectsAuthorizationSuccess(
+        username,
+        auditAction,
+        types,
+        spaceIds,
+        args
+      );
     } else {
       const missingPrivileges = this.getMissingPrivileges(privileges);
       this.auditLogger.savedObjectsAuthorizationFailure(
         username,
-        action,
+        auditAction,
         types,
+        spaceIds,
         missingPrivileges,
         args
       );
-      const msg = `Unable to ${action} ${missingPrivileges
-        .map(privilege => actionsToTypesMap.get(privilege))
-        .sort()
-        .join(',')}`;
+      const targetTypes = uniq(
+        missingPrivileges.map(({ privilege }) => actionsToTypesMap.get(privilege)).sort()
+      ).join(',');
+      const msg = `Unable to ${action} ${targetTypes}`;
       throw this.errors.decorateForbiddenError(new Error(msg));
     }
   }
 
-  private getMissingPrivileges(privileges: Record<string, boolean>) {
-    return Object.keys(privileges).filter(privilege => !privileges[privilege]);
+  private getMissingPrivileges(privileges: CheckPrivilegesResponse['privileges']) {
+    return privileges
+      .filter(({ authorized }) => !authorized)
+      .map(({ resource, privilege }) => ({ spaceId: resource, privilege }));
   }
 
   private getUniqueObjectTypes(objects: Array<{ type: string }>) {
-    return [...new Set(objects.map(o => o.type))];
+    return uniq(objects.map(o => o.type));
+  }
+
+  private async getNamespacesPrivilegeMap(namespaces: string[]) {
+    const action = this.actions.login;
+    const checkPrivilegesResult = await this.checkPrivileges(action, namespaces);
+    // check if the user can log into each namespace
+    const map = checkPrivilegesResult.privileges.reduce(
+      (acc: Record<string, boolean>, { resource, authorized }) => {
+        // there should never be a case where more than one privilege is returned for a given space
+        // if there is, fail-safe (authorized + unauthorized = unauthorized)
+        if (resource && (!authorized || !acc.hasOwnProperty(resource))) {
+          acc[resource] = authorized;
+        }
+        return acc;
+      },
+      {}
+    );
+    return map;
+  }
+
+  private redactAndSortNamespaces(spaceIds: string[], privilegeMap: Record<string, boolean>) {
+    const comparator = (a: string, b: string) => {
+      const _a = a.toLowerCase();
+      const _b = b.toLowerCase();
+      if (_a === '?') {
+        return 1;
+      } else if (_a < _b) {
+        return -1;
+      } else if (_a > _b) {
+        return 1;
+      }
+      return 0;
+    };
+    return spaceIds.map(spaceId => (privilegeMap[spaceId] ? spaceId : '?')).sort(comparator);
+  }
+
+  private async redactSavedObjectNamespaces<T extends SavedObjectNamespaces>(
+    savedObject: T
+  ): Promise<T> {
+    if (this.getSpacesService() === undefined || savedObject.namespaces == null) {
+      return savedObject;
+    }
+
+    const privilegeMap = await this.getNamespacesPrivilegeMap(savedObject.namespaces);
+
+    return {
+      ...savedObject,
+      namespaces: this.redactAndSortNamespaces(savedObject.namespaces, privilegeMap),
+    };
+  }
+
+  private async redactSavedObjectsNamespaces<T extends SavedObjectsNamespaces>(
+    response: T
+  ): Promise<T> {
+    if (this.getSpacesService() === undefined) {
+      return response;
+    }
+    const { saved_objects: savedObjects } = response;
+    const namespaces = uniq(savedObjects.flatMap(savedObject => savedObject.namespaces || []));
+    if (namespaces.length === 0) {
+      return response;
+    }
+
+    const privilegeMap = await this.getNamespacesPrivilegeMap(namespaces);
+
+    return {
+      ...response,
+      saved_objects: savedObjects.map(savedObject => ({
+        ...savedObject,
+        namespaces:
+          savedObject.namespaces &&
+          this.redactAndSortNamespaces(savedObject.namespaces, privilegeMap),
+      })),
+    };
   }
 }
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index 28e45bc8cfd2a..ea63905e27b26 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -99,10 +99,14 @@ export class DeleteSpacesButton extends Component<Props, State> {
   public deleteSpaces = async () => {
     const { spacesManager, space } = this.props;
 
+    this.setState({
+      showConfirmDeleteModal: false,
+    });
+
     try {
       await spacesManager.deleteSpace(space);
     } catch (error) {
-      const { message: errorMessage = '' } = error.data || {};
+      const { message: errorMessage = '' } = error.data || error.body || {};
 
       this.props.notifications.toasts.addDanger(
         i18n.translate('xpack.spaces.management.deleteSpacesButton.deleteSpaceErrorTitle', {
@@ -110,12 +114,9 @@ export class DeleteSpacesButton extends Component<Props, State> {
           values: { errorMessage },
         })
       );
+      return;
     }
 
-    this.setState({
-      showConfirmDeleteModal: false,
-    });
-
     const message = i18n.translate(
       'xpack.spaces.management.deleteSpacesButton.spaceSuccessfullyDeletedNotificationMessage',
       {
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index ff4be84207832..df5e6a2ca34af 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -176,10 +176,14 @@ export class SpacesGridPage extends Component<Props, State> {
       return;
     }
 
+    this.setState({
+      showConfirmDeleteModal: false,
+    });
+
     try {
       await spacesManager.deleteSpace(space);
     } catch (error) {
-      const { message: errorMessage = '' } = error.data || {};
+      const { message: errorMessage = '' } = error.data || error.body || {};
 
       this.props.notifications.toasts.addDanger(
         i18n.translate('xpack.spaces.management.spacesGridPage.errorDeletingSpaceErrorMessage', {
@@ -189,12 +193,9 @@ export class SpacesGridPage extends Component<Props, State> {
           },
         })
       );
+      return;
     }
 
-    this.setState({
-      showConfirmDeleteModal: false,
-    });
-
     this.loadGrid();
 
     const message = i18n.translate(
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
index 59e157c3fc2db..72faab0d2c892 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
@@ -188,11 +188,13 @@ describe('copySavedObjectsToSpaces', () => {
               },
             ],
             "savedObjectsClient": Object {
+              "addToNamespaces": [MockFunction],
               "bulkCreate": [MockFunction],
               "bulkGet": [MockFunction],
               "bulkUpdate": [MockFunction],
               "create": [MockFunction],
               "delete": [MockFunction],
+              "deleteFromNamespaces": [MockFunction],
               "errors": [Function],
               "find": [MockFunction],
               "get": [MockFunction],
@@ -252,11 +254,13 @@ describe('copySavedObjectsToSpaces', () => {
               "readable": false,
             },
             "savedObjectsClient": Object {
+              "addToNamespaces": [MockFunction],
               "bulkCreate": [MockFunction],
               "bulkGet": [MockFunction],
               "bulkUpdate": [MockFunction],
               "create": [MockFunction],
               "delete": [MockFunction],
+              "deleteFromNamespaces": [MockFunction],
               "errors": [Function],
               "find": [MockFunction],
               "get": [MockFunction],
@@ -315,11 +319,13 @@ describe('copySavedObjectsToSpaces', () => {
               "readable": false,
             },
             "savedObjectsClient": Object {
+              "addToNamespaces": [MockFunction],
               "bulkCreate": [MockFunction],
               "bulkGet": [MockFunction],
               "bulkUpdate": [MockFunction],
               "create": [MockFunction],
               "delete": [MockFunction],
+              "deleteFromNamespaces": [MockFunction],
               "errors": [Function],
               "find": [MockFunction],
               "get": [MockFunction],
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
index 7809f1f8be66f..aa1d5e9a47832 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
@@ -204,11 +204,13 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
               },
             ],
             "savedObjectsClient": Object {
+              "addToNamespaces": [MockFunction],
               "bulkCreate": [MockFunction],
               "bulkGet": [MockFunction],
               "bulkUpdate": [MockFunction],
               "create": [MockFunction],
               "delete": [MockFunction],
+              "deleteFromNamespaces": [MockFunction],
               "errors": [Function],
               "find": [MockFunction],
               "get": [MockFunction],
@@ -275,11 +277,13 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
               },
             ],
             "savedObjectsClient": Object {
+              "addToNamespaces": [MockFunction],
               "bulkCreate": [MockFunction],
               "bulkGet": [MockFunction],
               "bulkUpdate": [MockFunction],
               "create": [MockFunction],
               "delete": [MockFunction],
+              "deleteFromNamespaces": [MockFunction],
               "errors": [Function],
               "find": [MockFunction],
               "get": [MockFunction],
@@ -345,11 +349,13 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
               },
             ],
             "savedObjectsClient": Object {
+              "addToNamespaces": [MockFunction],
               "bulkCreate": [MockFunction],
               "bulkGet": [MockFunction],
               "bulkUpdate": [MockFunction],
               "create": [MockFunction],
               "delete": [MockFunction],
+              "deleteFromNamespaces": [MockFunction],
               "errors": [Function],
               "find": [MockFunction],
               "get": [MockFunction],
diff --git a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
index 74e75fb8f12c7..c83830f6feace 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
@@ -250,14 +250,10 @@ describe('#getAll', () => {
           mockAuthorization.mode.useRbacForRequest.mockReturnValue(true);
           mockCheckPrivilegesAtSpaces.mockReturnValue({
             username,
-            spacePrivileges: {
-              [savedObjects[0].id]: {
-                [privilege]: false,
-              },
-              [savedObjects[1].id]: {
-                [privilege]: false,
-              },
-            },
+            privileges: [
+              { resource: savedObjects[0].id, privilege, authorized: false },
+              { resource: savedObjects[1].id, privilege, authorized: false },
+            ],
           });
           const maxSpaces = 1234;
           const mockConfig = createMockConfig({
@@ -314,14 +310,10 @@ describe('#getAll', () => {
           mockAuthorization.mode.useRbacForRequest.mockReturnValue(true);
           mockCheckPrivilegesAtSpaces.mockReturnValue({
             username,
-            spacePrivileges: {
-              [savedObjects[0].id]: {
-                [privilege]: true,
-              },
-              [savedObjects[1].id]: {
-                [privilege]: false,
-              },
-            },
+            privileges: [
+              { resource: savedObjects[0].id, privilege, authorized: true },
+              { resource: savedObjects[1].id, privilege, authorized: false },
+            ],
           });
           const mockInternalRepository = {
             find: jest.fn().mockReturnValue({
diff --git a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
index 22c34c03368e3..0c066fb76994f 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
@@ -74,16 +74,14 @@ export class SpacesClient {
 
       const privilege = privilegeFactory(this.authorization!);
 
-      const { username, spacePrivileges } = await checkPrivileges.atSpaces(spaceIds, privilege);
+      const { username, privileges } = await checkPrivileges.atSpaces(spaceIds, privilege);
 
-      const authorized = Object.keys(spacePrivileges).filter(spaceId => {
-        return spacePrivileges[spaceId][privilege];
-      });
+      const authorized = privileges.filter(x => x.authorized).map(x => x.resource);
 
       this.debugLogger(
         `SpacesClient.getAll(), authorized for ${
           authorized.length
-        } spaces, derived from ES privilege check: ${JSON.stringify(spacePrivileges)}`
+        } spaces, derived from ES privilege check: ${JSON.stringify(privileges)}`
       );
 
       if (authorized.length === 0) {
@@ -94,7 +92,7 @@ export class SpacesClient {
         throw Boom.forbidden();
       }
 
-      this.auditLogger.spacesAuthorizationSuccess(username, 'getAll', authorized);
+      this.auditLogger.spacesAuthorizationSuccess(username, 'getAll', authorized as string[]);
       const filteredSpaces: Space[] = spaces.filter((space: any) => authorized.includes(space.id));
       this.debugLogger(
         `SpacesClient.getAll(), using RBAC. returning spaces: ${filteredSpaces
@@ -211,9 +209,9 @@ export class SpacesClient {
       throw Boom.badRequest('This Space cannot be deleted because it is reserved.');
     }
 
-    await repository.delete('space', id);
-
     await repository.deleteByNamespace(id);
+
+    await repository.delete('space', id);
   }
 
   private useRbac(): boolean {
diff --git a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
index f2ba8785f5a3f..511e9676940d2 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
@@ -11,7 +11,13 @@ import {
   mockRouteContext,
   mockRouteContextWithInvalidLicense,
 } from '../__fixtures__';
-import { CoreSetup, IRouter, kibanaResponseFactory, RouteValidatorConfig } from 'src/core/server';
+import {
+  CoreSetup,
+  IRouter,
+  kibanaResponseFactory,
+  RouteValidatorConfig,
+  SavedObjectsErrorHelpers,
+} from 'src/core/server';
 import {
   loggingServiceMock,
   httpServiceMock,
@@ -75,6 +81,7 @@ describe('Spaces Public API', () => {
     return {
       routeValidation: routeDefinition.validate as RouteValidatorConfig<{}, {}, {}>,
       routeHandler,
+      savedObjectsRepositoryMock,
     };
   };
 
@@ -143,6 +150,27 @@ describe('Spaces Public API', () => {
     expect(status).toEqual(404);
   });
 
+  it(`returns http/400 when scripts cannot be executed in Elasticsearch`, async () => {
+    const { routeHandler, savedObjectsRepositoryMock } = await setup();
+
+    const request = httpServerMock.createKibanaRequest({
+      params: {
+        id: 'a-space',
+      },
+      method: 'delete',
+    });
+    // @ts-ignore
+    savedObjectsRepositoryMock.deleteByNamespace.mockRejectedValue(
+      SavedObjectsErrorHelpers.decorateEsCannotExecuteScriptError(new Error())
+    );
+    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+
+    const { status, payload } = response;
+
+    expect(status).toEqual(400);
+    expect(payload.message).toEqual('Cannot execute script in Elasticsearch query');
+  });
+
   it(`DELETE spaces/{id}' cannot delete reserved spaces`, async () => {
     const { routeHandler } = await setup();
 
diff --git a/x-pack/plugins/spaces/server/routes/api/external/delete.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.ts
index 4b7e6b00182ac..150f1d198cdf6 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/delete.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/delete.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import Boom from 'boom';
 import { schema } from '@kbn/config-schema';
 import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
 import { wrapError } from '../../../lib/errors';
@@ -12,7 +13,7 @@ import { ExternalRouteDeps } from '.';
 import { createLicensedRouteHandler } from '../../lib';
 
 export function initDeleteSpacesApi(deps: ExternalRouteDeps) {
-  const { externalRouter, spacesService } = deps;
+  const { externalRouter, log, spacesService } = deps;
 
   externalRouter.delete(
     {
@@ -33,6 +34,13 @@ export function initDeleteSpacesApi(deps: ExternalRouteDeps) {
       } catch (error) {
         if (SavedObjectsErrorHelpers.isNotFoundError(error)) {
           return response.notFound();
+        } else if (SavedObjectsErrorHelpers.isEsCannotExecuteScriptError(error)) {
+          log.error(
+            `Failed to delete space '${id}', cannot execute script in Elasticsearch query: ${error.message}`
+          );
+          return response.customError(
+            wrapError(Boom.badRequest('Cannot execute script in Elasticsearch query'))
+          );
         }
         return response.customError(wrapError(error));
       }
diff --git a/x-pack/plugins/spaces/server/routes/api/external/index.ts b/x-pack/plugins/spaces/server/routes/api/external/index.ts
index 1bdb7ceb8a3f7..079f690bfe546 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/index.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/index.ts
@@ -12,6 +12,8 @@ import { initPostSpacesApi } from './post';
 import { initPutSpacesApi } from './put';
 import { SpacesServiceSetup } from '../../../spaces_service/spaces_service';
 import { initCopyToSpacesApi } from './copy_to_space';
+import { initShareAddSpacesApi } from './share_add_spaces';
+import { initShareRemoveSpacesApi } from './share_remove_spaces';
 
 export interface ExternalRouteDeps {
   externalRouter: IRouter;
@@ -28,4 +30,6 @@ export function initExternalSpacesApi(deps: ExternalRouteDeps) {
   initPostSpacesApi(deps);
   initPutSpacesApi(deps);
   initCopyToSpacesApi(deps);
+  initShareAddSpacesApi(deps);
+  initShareRemoveSpacesApi(deps);
 }
diff --git a/x-pack/plugins/spaces/server/routes/api/external/share_add_spaces.ts b/x-pack/plugins/spaces/server/routes/api/external/share_add_spaces.ts
new file mode 100644
index 0000000000000..f40cc5cc50572
--- /dev/null
+++ b/x-pack/plugins/spaces/server/routes/api/external/share_add_spaces.ts
@@ -0,0 +1,62 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { wrapError } from '../../../lib/errors';
+import { ExternalRouteDeps } from '.';
+import { SPACE_ID_REGEX } from '../../../lib/space_schema';
+import { createLicensedRouteHandler } from '../../lib';
+
+const uniq = <T>(arr: T[]): T[] => Array.from(new Set<T>(arr));
+export function initShareAddSpacesApi(deps: ExternalRouteDeps) {
+  const { externalRouter, getStartServices } = deps;
+
+  externalRouter.post(
+    {
+      path: '/api/spaces/_share_saved_object_add',
+      validate: {
+        body: schema.object({
+          spaces: schema.arrayOf(
+            schema.string({
+              validate: value => {
+                if (!SPACE_ID_REGEX.test(value)) {
+                  return `lower case, a-z, 0-9, "_", and "-" are allowed`;
+                }
+              },
+            }),
+            {
+              validate: spaceIds => {
+                if (!spaceIds.length) {
+                  return 'must specify one or more space ids';
+                } else if (uniq(spaceIds).length !== spaceIds.length) {
+                  return 'duplicate space ids are not allowed';
+                }
+              },
+            }
+          ),
+          object: schema.object({
+            type: schema.string(),
+            id: schema.string(),
+          }),
+        }),
+      },
+    },
+    createLicensedRouteHandler(async (_context, request, response) => {
+      const [startServices] = await getStartServices();
+      const scopedClient = startServices.savedObjects.getScopedClient(request);
+
+      const spaces = request.body.spaces;
+      const { type, id } = request.body.object;
+
+      try {
+        await scopedClient.addToNamespaces(type, id, spaces);
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+      return response.noContent();
+    })
+  );
+}
diff --git a/x-pack/plugins/spaces/server/routes/api/external/share_remove_spaces.ts b/x-pack/plugins/spaces/server/routes/api/external/share_remove_spaces.ts
new file mode 100644
index 0000000000000..5f58a5dfd5e5f
--- /dev/null
+++ b/x-pack/plugins/spaces/server/routes/api/external/share_remove_spaces.ts
@@ -0,0 +1,62 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { wrapError } from '../../../lib/errors';
+import { ExternalRouteDeps } from '.';
+import { SPACE_ID_REGEX } from '../../../lib/space_schema';
+import { createLicensedRouteHandler } from '../../lib';
+
+const uniq = <T>(arr: T[]): T[] => Array.from(new Set<T>(arr));
+export function initShareRemoveSpacesApi(deps: ExternalRouteDeps) {
+  const { externalRouter, getStartServices } = deps;
+
+  externalRouter.post(
+    {
+      path: '/api/spaces/_share_saved_object_remove',
+      validate: {
+        body: schema.object({
+          spaces: schema.arrayOf(
+            schema.string({
+              validate: value => {
+                if (!SPACE_ID_REGEX.test(value)) {
+                  return `lower case, a-z, 0-9, "_", and "-" are allowed`;
+                }
+              },
+            }),
+            {
+              validate: spaceIds => {
+                if (!spaceIds.length) {
+                  return 'must specify one or more space ids';
+                } else if (uniq(spaceIds).length !== spaceIds.length) {
+                  return 'duplicate space ids are not allowed';
+                }
+              },
+            }
+          ),
+          object: schema.object({
+            type: schema.string(),
+            id: schema.string(),
+          }),
+        }),
+      },
+    },
+    createLicensedRouteHandler(async (_context, request, response) => {
+      const [startServices] = await getStartServices();
+      const scopedClient = startServices.savedObjects.getScopedClient(request);
+
+      const spaces = request.body.spaces;
+      const { type, id } = request.body.object;
+
+      try {
+        await scopedClient.deleteFromNamespaces(type, id, spaces);
+      } catch (error) {
+        return response.customError(wrapError(error));
+      }
+      return response.noContent();
+    })
+  );
+}
diff --git a/x-pack/plugins/spaces/server/saved_objects/__snapshots__/spaces_saved_objects_client.test.ts.snap b/x-pack/plugins/spaces/server/saved_objects/__snapshots__/spaces_saved_objects_client.test.ts.snap
deleted file mode 100644
index 8b1a258138355..0000000000000
--- a/x-pack/plugins/spaces/server/saved_objects/__snapshots__/spaces_saved_objects_client.test.ts.snap
+++ /dev/null
@@ -1,29 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`default space #bulkCreate throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`default space #bulkGet throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`default space #create throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`default space #delete throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`default space #find throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`default space #get throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`default space #update throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`space_1 space #bulkCreate throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`space_1 space #bulkGet throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`space_1 space #create throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`space_1 space #delete throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`space_1 space #find throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`space_1 space #get throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
-
-exports[`space_1 space #update throws error if options.namespace is specified 1`] = `"Spaces currently determines the namespaces"`;
diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
index 2d6fe36792c40..f9961329c088b 100644
--- a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
@@ -50,42 +50,41 @@ const createMockResponse = () => ({
   references: [],
 });
 
+const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
+
 [
   { id: DEFAULT_SPACE_ID, expectedNamespace: undefined },
   { id: 'space_1', expectedNamespace: 'space_1' },
 ].forEach(currentSpace => {
   describe(`${currentSpace.id} space`, () => {
+    const createSpacesSavedObjectsClient = async () => {
+      const request = createMockRequest();
+      const baseClient = createMockClient();
+      const spacesService = await createSpacesService(currentSpace.id);
+
+      const client = new SpacesSavedObjectsClient({
+        request,
+        baseClient,
+        spacesService,
+        typeRegistry,
+      });
+      return { client, baseClient };
+    };
+
     describe('#get', () => {
       test(`throws error if options.namespace is specified`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
+        const { client } = await createSpacesSavedObjectsClient();
 
-        await expect(
-          client.get('foo', '', { namespace: 'bar' })
-        ).rejects.toThrowErrorMatchingSnapshot();
+        await expect(client.get('foo', '', { namespace: 'bar' })).rejects.toThrow(
+          ERROR_NAMESPACE_SPECIFIED
+        );
       });
 
-      test(`supplements options with undefined namespace`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
         const expectedReturnValue = createMockResponse();
         baseClient.get.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
 
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
         const type = Symbol();
         const id = Symbol();
         const options = Object.freeze({ foo: 'bar' });
@@ -102,37 +101,17 @@ const createMockResponse = () => ({
 
     describe('#bulkGet', () => {
       test(`throws error if options.namespace is specified`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
+        const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
           client.bulkGet([{ id: '', type: 'foo' }], { namespace: 'bar' })
-        ).rejects.toThrowErrorMatchingSnapshot();
+        ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
 
-      test(`supplements options with undefined namespace`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const expectedReturnValue = {
-          saved_objects: [createMockResponse()],
-        };
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
+        const expectedReturnValue = { saved_objects: [createMockResponse()] };
         baseClient.bulkGet.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
 
         const objects = [{ type: 'foo' }];
         const options = Object.freeze({ foo: 'bar' });
@@ -149,25 +128,15 @@ const createMockResponse = () => ({
 
     describe('#find', () => {
       test(`throws error if options.namespace is specified`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
+        const { client } = await createSpacesSavedObjectsClient();
 
-        await expect(
-          client.find({ type: 'foo', namespace: 'bar' })
-        ).rejects.toThrowErrorMatchingSnapshot();
+        await expect(client.find({ type: 'foo', namespace: 'bar' })).rejects.toThrow(
+          ERROR_NAMESPACE_SPECIFIED
+        );
       });
 
       test(`passes options.type to baseClient if valid singular type specified`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
         const expectedReturnValue = {
           saved_objects: [createMockResponse()],
           total: 1,
@@ -175,16 +144,8 @@ const createMockResponse = () => ({
           page: 0,
         };
         baseClient.find.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
 
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
         const options = Object.freeze({ type: 'foo' });
-
         const actualReturnValue = await client.find(options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
@@ -194,9 +155,8 @@ const createMockResponse = () => ({
         });
       });
 
-      test(`supplements options with undefined namespace`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
         const expectedReturnValue = {
           saved_objects: [createMockResponse()],
           total: 1,
@@ -204,14 +164,6 @@ const createMockResponse = () => ({
           page: 0,
         };
         baseClient.find.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
 
         const options = Object.freeze({ type: ['foo', 'bar'] });
         const actualReturnValue = await client.find(options);
@@ -226,35 +178,17 @@ const createMockResponse = () => ({
 
     describe('#create', () => {
       test(`throws error if options.namespace is specified`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
+        const { client } = await createSpacesSavedObjectsClient();
 
-        await expect(
-          client.create('foo', {}, { namespace: 'bar' })
-        ).rejects.toThrowErrorMatchingSnapshot();
+        await expect(client.create('foo', {}, { namespace: 'bar' })).rejects.toThrow(
+          ERROR_NAMESPACE_SPECIFIED
+        );
       });
 
-      test(`supplements options with undefined namespace`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
         const expectedReturnValue = createMockResponse();
         baseClient.create.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
 
         const type = Symbol();
         const attributes = Symbol();
@@ -272,37 +206,17 @@ const createMockResponse = () => ({
 
     describe('#bulkCreate', () => {
       test(`throws error if options.namespace is specified`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
+        const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
           client.bulkCreate([{ id: '', type: 'foo', attributes: {} }], { namespace: 'bar' })
-        ).rejects.toThrowErrorMatchingSnapshot();
+        ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
 
-      test(`supplements options with undefined namespace`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const expectedReturnValue = {
-          saved_objects: [createMockResponse()],
-        };
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
+        const expectedReturnValue = { saved_objects: [createMockResponse()] };
         baseClient.bulkCreate.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
 
         const objects = [{ type: 'foo' }];
         const options = Object.freeze({ foo: 'bar' });
@@ -319,36 +233,18 @@ const createMockResponse = () => ({
 
     describe('#update', () => {
       test(`throws error if options.namespace is specified`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
+        const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
           // @ts-ignore
           client.update(null, null, null, { namespace: 'bar' })
-        ).rejects.toThrowErrorMatchingSnapshot();
+        ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
 
-      test(`supplements options with undefined namespace`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
         const expectedReturnValue = createMockResponse();
         baseClient.update.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
 
         const type = Symbol();
         const id = Symbol();
@@ -366,21 +262,19 @@ const createMockResponse = () => ({
     });
 
     describe('#bulkUpdate', () => {
-      test(`supplements options with the spaces namespace`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const expectedReturnValue = {
-          saved_objects: [createMockResponse()],
-        };
-        baseClient.bulkUpdate.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
+      test(`throws error if options.namespace is specified`, async () => {
+        const { client } = await createSpacesSavedObjectsClient();
 
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
+        await expect(
+          // @ts-ignore
+          client.bulkUpdate(null, { namespace: 'bar' })
+        ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
+      });
+
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
+        const expectedReturnValue = { saved_objects: [createMockResponse()] };
+        baseClient.bulkUpdate.mockReturnValue(Promise.resolve(expectedReturnValue));
 
         const actualReturnValue = await client.bulkUpdate([
           { id: 'id', type: 'foo', attributes: {}, references: [] },
@@ -403,36 +297,18 @@ const createMockResponse = () => ({
 
     describe('#delete', () => {
       test(`throws error if options.namespace is specified`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
+        const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
           // @ts-ignore
           client.delete(null, null, { namespace: 'bar' })
-        ).rejects.toThrowErrorMatchingSnapshot();
+        ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
 
-      test(`supplements options with undefined namespace`, async () => {
-        const request = createMockRequest();
-        const baseClient = createMockClient();
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
         const expectedReturnValue = createMockResponse();
         baseClient.delete.mockReturnValue(Promise.resolve(expectedReturnValue));
-        const spacesService = await createSpacesService(currentSpace.id);
-
-        const client = new SpacesSavedObjectsClient({
-          request,
-          baseClient,
-          spacesService,
-          typeRegistry,
-        });
 
         const type = Symbol();
         const id = Symbol();
@@ -447,5 +323,65 @@ const createMockResponse = () => ({
         });
       });
     });
+
+    describe('#addToNamespaces', () => {
+      test(`throws error if options.namespace is specified`, async () => {
+        const { client } = await createSpacesSavedObjectsClient();
+
+        await expect(
+          // @ts-ignore
+          client.addToNamespaces(null, null, null, { namespace: 'bar' })
+        ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
+      });
+
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
+        const expectedReturnValue = createMockResponse();
+        baseClient.addToNamespaces.mockReturnValue(Promise.resolve(expectedReturnValue));
+
+        const type = Symbol();
+        const id = Symbol();
+        const namespaces = Symbol();
+        const options = Object.freeze({ foo: 'bar' });
+        // @ts-ignore
+        const actualReturnValue = await client.addToNamespaces(type, id, namespaces, options);
+
+        expect(actualReturnValue).toBe(expectedReturnValue);
+        expect(baseClient.addToNamespaces).toHaveBeenCalledWith(type, id, namespaces, {
+          foo: 'bar',
+          namespace: currentSpace.expectedNamespace,
+        });
+      });
+    });
+
+    describe('#deleteFromNamespaces', () => {
+      test(`throws error if options.namespace is specified`, async () => {
+        const { client } = await createSpacesSavedObjectsClient();
+
+        await expect(
+          // @ts-ignore
+          client.deleteFromNamespaces(null, null, null, { namespace: 'bar' })
+        ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
+      });
+
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
+        const expectedReturnValue = createMockResponse();
+        baseClient.deleteFromNamespaces.mockReturnValue(Promise.resolve(expectedReturnValue));
+
+        const type = Symbol();
+        const id = Symbol();
+        const namespaces = Symbol();
+        const options = Object.freeze({ foo: 'bar' });
+        // @ts-ignore
+        const actualReturnValue = await client.deleteFromNamespaces(type, id, namespaces, options);
+
+        expect(actualReturnValue).toBe(expectedReturnValue);
+        expect(baseClient.deleteFromNamespaces).toHaveBeenCalledWith(type, id, namespaces, {
+          foo: 'bar',
+          namespace: currentSpace.expectedNamespace,
+        });
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
index f216d5743cf89..e31bc7cef6900 100644
--- a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
@@ -13,6 +13,8 @@ import {
   SavedObjectsCreateOptions,
   SavedObjectsFindOptions,
   SavedObjectsUpdateOptions,
+  SavedObjectsAddToNamespacesOptions,
+  SavedObjectsDeleteFromNamespacesOptions,
   ISavedObjectTypeRegistry,
 } from 'src/core/server';
 import { SpacesServiceSetup } from '../spaces_service/spaces_service';
@@ -213,6 +215,50 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
     });
   }
 
+  /**
+   * Adds namespaces to a SavedObject
+   *
+   * @param type
+   * @param id
+   * @param namespaces
+   * @param options
+   */
+  public async addToNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options: SavedObjectsAddToNamespacesOptions = {}
+  ) {
+    throwErrorIfNamespaceSpecified(options);
+
+    return await this.client.addToNamespaces(type, id, namespaces, {
+      ...options,
+      namespace: spaceIdToNamespace(this.spaceId),
+    });
+  }
+
+  /**
+   * Removes namespaces from a SavedObject
+   *
+   * @param type
+   * @param id
+   * @param namespaces
+   * @param options
+   */
+  public async deleteFromNamespaces(
+    type: string,
+    id: string,
+    namespaces: string[],
+    options: SavedObjectsDeleteFromNamespacesOptions = {}
+  ) {
+    throwErrorIfNamespaceSpecified(options);
+
+    return await this.client.deleteFromNamespaces(type, id, namespaces, {
+      ...options,
+      namespace: spaceIdToNamespace(this.spaceId),
+    });
+  }
+
   /**
    * Updates an array of objects by id
    *
diff --git a/x-pack/plugins/uptime/server/rest_api/types.ts b/x-pack/plugins/uptime/server/rest_api/types.ts
index aecb099b7bed5..e05e7a4d7faf1 100644
--- a/x-pack/plugins/uptime/server/rest_api/types.ts
+++ b/x-pack/plugins/uptime/server/rest_api/types.ts
@@ -10,7 +10,7 @@ import {
   RouteConfig,
   RouteMethod,
   CallAPIOptions,
-  SavedObjectsClient,
+  SavedObjectsClientContract,
   RequestHandlerContext,
   KibanaRequest,
   KibanaResponseFactory,
@@ -69,18 +69,7 @@ export interface UMRouteParams {
     options?: CallAPIOptions | undefined
   ) => Promise<any>;
   dynamicSettings: DynamicSettings;
-  savedObjectsClient: Pick<
-    SavedObjectsClient,
-    | 'errors'
-    | 'create'
-    | 'bulkCreate'
-    | 'delete'
-    | 'find'
-    | 'bulkGet'
-    | 'get'
-    | 'update'
-    | 'bulkUpdate'
-  >;
+  savedObjectsClient: SavedObjectsClientContract;
 }
 
 /**
diff --git a/x-pack/test/api_integration/apis/spaces/saved_objects.ts b/x-pack/test/api_integration/apis/spaces/saved_objects.ts
index 05f14a50f2170..7584be7fd8498 100644
--- a/x-pack/test/api_integration/apis/spaces/saved_objects.ts
+++ b/x-pack/test/api_integration/apis/spaces/saved_objects.ts
@@ -89,7 +89,7 @@ export default function({ getService }: FtrProviderContext) {
           .expect(404)
           .then((response: Record<string, any>) => {
             expect(response.body).to.eql({
-              message: 'Not Found',
+              message: 'Saved object [space/default] not found',
               statusCode: 404,
               error: 'Not Found',
             });
diff --git a/x-pack/test/saved_object_api_integration/common/config.ts b/x-pack/test/saved_object_api_integration/common/config.ts
index dda7934ce875a..eaf7230a832a8 100644
--- a/x-pack/test/saved_object_api_integration/common/config.ts
+++ b/x-pack/test/saved_object_api_integration/common/config.ts
@@ -56,8 +56,10 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           ...config.xpack.api.get('kbnTestServer.serverArgs'),
           '--optimize.enabled=false',
           '--server.xsrf.disableProtection=true',
+          `--plugin-path=${path.join(__dirname, 'fixtures', 'isolated_type_plugin')}`,
           `--plugin-path=${path.join(__dirname, 'fixtures', 'namespace_agnostic_type_plugin')}`,
           `--plugin-path=${path.join(__dirname, 'fixtures', 'hidden_type_plugin')}`,
+          `--plugin-path=${path.join(__dirname, 'fixtures', 'shared_type_plugin')}`,
           ...disabledPlugins.map(key => `--xpack.${key}.enabled=false`),
         ],
       },
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
index 34361ad9df542..d2c14189e2529 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -53,7 +53,7 @@
 {
   "type": "doc",
   "value": {
-    "id": "index-pattern:91200a00-9efd-11e7-acb3-3dab96693fab",
+    "id": "index-pattern:defaultspace-index-pattern-id",
     "index": ".kibana",
     "source": {
       "index-pattern": {
@@ -76,7 +76,7 @@
     "source": {
       "config": {
         "buildNum": 8467,
-        "defaultIndex": "91200a00-9efd-11e7-acb3-3dab96693fab"
+        "defaultIndex": "defaultspace-index-pattern-id"
       },
       "type": "config",
       "updated_at": "2017-09-21T18:49:16.302Z"
@@ -88,15 +88,15 @@
 {
   "type": "doc",
   "value": {
-    "id": "visualization:dd7caf20-9efd-11e7-acb3-3dab96693fab",
+    "id": "isolatedtype:defaultspace-isolatedtype-id",
     "index": ".kibana",
     "source": {
-      "type": "visualization",
+      "type": "isolatedtype",
       "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
+      "isolatedtype": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"91200a00-9efd-11e7-acb3-3dab96693fab\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"defaultspace-index-pattern-id\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
         },
         "title": "Count of requests",
         "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
@@ -111,7 +111,7 @@
 {
   "type": "doc",
   "value": {
-    "id": "dashboard:be3733a0-9efe-11e7-acb3-3dab96693fab",
+    "id": "dashboard:defaultspace-dashboard-id",
     "index": ".kibana",
     "source": {
       "dashboard": {
@@ -121,7 +121,7 @@
           "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
         },
         "optionsJSON": "{}",
-        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
+        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"isolatedtype\",\"id\":\"defaultspace-isolatedtype-id\",\"col\":1,\"row\":1}]",
         "refreshInterval": {
           "display": "Off",
           "pause": false,
@@ -144,7 +144,7 @@
 {
   "type": "doc",
   "value": {
-    "id": "space_1:index-pattern:space_1-91200a00-9efd-11e7-acb3-3dab96693fab",
+    "id": "space_1:index-pattern:space1-index-pattern-id",
     "index": ".kibana",
     "source": {
       "index-pattern": {
@@ -168,7 +168,7 @@
     "source": {
       "config": {
         "buildNum": 8467,
-        "defaultIndex": "91200a00-9efd-11e7-acb3-3dab96693fab"
+        "defaultIndex": "defaultspace-index-pattern-id"
       },
       "namespace": "space_1",
       "type": "config",
@@ -181,16 +181,16 @@
 {
   "type": "doc",
   "value": {
-    "id": "space_1:visualization:space_1-dd7caf20-9efd-11e7-acb3-3dab96693fab",
+    "id": "space_1:isolatedtype:space1-isolatedtype-id",
     "index": ".kibana",
     "source": {
       "namespace": "space_1",
-      "type": "visualization",
+      "type": "isolatedtype",
       "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
+      "isolatedtype": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"space_1-91200a00-9efd-11e7-acb3-3dab96693fab\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"space1-index-pattern-id\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
         },
         "title": "Count of requests",
         "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
@@ -205,7 +205,7 @@
 {
   "type": "doc",
   "value": {
-    "id": "space_1:dashboard:space_1-be3733a0-9efe-11e7-acb3-3dab96693fab",
+    "id": "space_1:dashboard:space1-dashboard-id",
     "index": ".kibana",
     "source": {
       "dashboard": {
@@ -215,7 +215,7 @@
           "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
         },
         "optionsJSON": "{}",
-        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"space_1-dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
+        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"isolatedtype\",\"id\":\"space1-isolatedtype-id\",\"col\":1,\"row\":1}]",
         "refreshInterval": {
           "display": "Off",
           "pause": false,
@@ -239,7 +239,7 @@
 {
   "type": "doc",
   "value": {
-    "id": "space_2:index-pattern:space_2-91200a00-9efd-11e7-acb3-3dab96693fab",
+    "id": "space_2:index-pattern:space2-index-pattern-id",
     "index": ".kibana",
     "source": {
       "index-pattern": {
@@ -263,7 +263,7 @@
     "source": {
       "config": {
         "buildNum": 8467,
-        "defaultIndex": "91200a00-9efd-11e7-acb3-3dab96693fab"
+        "defaultIndex": "defaultspace-index-pattern-id"
       },
       "namespace": "space_2",
       "type": "config",
@@ -276,16 +276,16 @@
 {
   "type": "doc",
   "value": {
-    "id": "space_2:visualization:space_2-dd7caf20-9efd-11e7-acb3-3dab96693fab",
+    "id": "space_2:isolatedtype:space2-isolatedtype-id",
     "index": ".kibana",
     "source": {
       "namespace": "space_2",
-      "type": "visualization",
+      "type": "isolatedtype",
       "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
+      "isolatedtype": {
         "description": "",
         "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"space_2-91200a00-9efd-11e7-acb3-3dab96693fab\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+          "searchSourceJSON": "{\"index\":\"space2-index-pattern-id\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
         },
         "title": "Count of requests",
         "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
@@ -300,7 +300,7 @@
 {
   "type": "doc",
   "value": {
-    "id": "space_2:dashboard:space_2-be3733a0-9efe-11e7-acb3-3dab96693fab",
+    "id": "space_2:dashboard:space2-dashboard-id",
     "index": ".kibana",
     "source": {
       "dashboard": {
@@ -310,7 +310,7 @@
           "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
         },
         "optionsJSON": "{}",
-        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"space_2-dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
+        "panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"isolatedtype\",\"id\":\"space2-isolatedtype-id\",\"col\":1,\"row\":1}]",
         "refreshInterval": {
           "display": "Off",
           "pause": false,
@@ -334,11 +334,11 @@
 {
   "type": "doc",
   "value": {
-    "id": "globaltype:8121a00-8efd-21e7-1cb3-34ab966434445",
+    "id": "globaltype:globaltype-id",
     "index": ".kibana",
     "source": {
       "globaltype": {
-        "name": "My favorite global object"
+        "title": "My favorite global object"
       },
       "type": "globaltype",
       "updated_at": "2017-09-21T18:59:16.270Z"
@@ -346,3 +346,54 @@
     "type": "doc"
   }
 }
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:default_and_space_1",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in the default and space_1 spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:only_space_1",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object only in space_1"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_1"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:only_space_2",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object only in space_2"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
index c2489f2a906c8..7b5b1d86f6bcc 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
@@ -82,7 +82,7 @@
         },
         "globaltype": {
           "properties": {
-            "name": {
+            "title": {
               "fields": {
                 "keyword": {
                   "ignore_above": 2048,
@@ -147,9 +147,41 @@
             }
           }
         },
+        "isolatedtype": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchId": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        },
         "namespace": {
           "type": "keyword"
         },
+        "namespaces": {
+          "type": "keyword"
+        },
         "search": {
           "properties": {
             "columns": {
@@ -186,6 +218,19 @@
             }
           }
         },
+        "sharedtype": {
+          "properties": {
+            "title": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 2048
+                }
+              }
+            }
+          }
+        },
         "space": {
           "properties": {
             "_reserved": {
@@ -282,35 +327,6 @@
               "type": "text"
             }
           }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchId": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
         }
       }
     },
@@ -322,4 +338,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/hidden_type_plugin/index.js b/x-pack/test/saved_object_api_integration/common/fixtures/hidden_type_plugin/index.js
index ea32811794c47..5989db84e2290 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/hidden_type_plugin/index.js
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/hidden_type_plugin/index.js
@@ -21,5 +21,7 @@ export default function(kibana) {
     },
 
     config() {},
+
+    init() {}, // need empty init for plugin to load
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/hidden_type_plugin/mappings.json b/x-pack/test/saved_object_api_integration/common/fixtures/hidden_type_plugin/mappings.json
index e4815273964a1..45f898e10e2ba 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/hidden_type_plugin/mappings.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/hidden_type_plugin/mappings.json
@@ -1,7 +1,7 @@
 {
   "hiddentype": {
     "properties": {
-      "name": {
+      "title": {
         "type": "text",
         "fields": {
           "keyword": {
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/index.js b/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/index.js
new file mode 100644
index 0000000000000..a406c6737da5f
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/index.js
@@ -0,0 +1,26 @@
+/*
+ * 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 mappings from './mappings.json';
+
+export default function(kibana) {
+  return new kibana.Plugin({
+    require: ['kibana', 'elasticsearch', 'xpack_main'],
+    name: 'isolated_type_plugin',
+    uiExports: {
+      savedObjectsManagement: {
+        isolatedtype: {
+          isImportableAndExportable: true,
+        },
+      },
+      mappings,
+    },
+
+    config() {},
+
+    init() {}, // need empty init for plugin to load
+  });
+}
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/mappings.json b/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/mappings.json
new file mode 100644
index 0000000000000..141ebbc93c290
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/mappings.json
@@ -0,0 +1,31 @@
+{
+  "isolatedtype": {
+    "properties": {
+      "description": {
+        "type": "text"
+      },
+      "kibanaSavedObjectMeta": {
+        "properties": {
+          "searchSourceJSON": {
+            "type": "text"
+          }
+        }
+      },
+      "savedSearchId": {
+        "type": "keyword"
+      },
+      "title": {
+        "type": "text"
+      },
+      "uiStateJSON": {
+        "type": "text"
+      },
+      "version": {
+        "type": "integer"
+      },
+      "visState": {
+        "type": "text"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/package.json b/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/package.json
new file mode 100644
index 0000000000000..665ecb1b31d7e
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/isolated_type_plugin/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "isolated_type_plugin",
+  "version": "0.0.0",
+  "kibana": {
+    "version": "kibana"
+  }
+}
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json
index b30a2c3877b88..64d309b4209a2 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json
@@ -1,7 +1,7 @@
 {
   "globaltype": {
     "properties": {
-      "name": {
+      "title": {
         "type": "text",
         "fields": {
           "keyword": {
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/index.js b/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/index.js
new file mode 100644
index 0000000000000..91a24fb9f4f56
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/index.js
@@ -0,0 +1,27 @@
+/*
+ * 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 mappings from './mappings.json';
+
+export default function(kibana) {
+  return new kibana.Plugin({
+    require: ['kibana', 'elasticsearch', 'xpack_main'],
+    name: 'shared_type_plugin',
+    uiExports: {
+      savedObjectsManagement: {},
+      savedObjectSchemas: {
+        sharedtype: {
+          multiNamespace: true,
+        },
+      },
+      mappings,
+    },
+
+    config() {},
+
+    init() {}, // need empty init for plugin to load
+  });
+}
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/mappings.json b/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/mappings.json
new file mode 100644
index 0000000000000..918958aec0d6d
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/mappings.json
@@ -0,0 +1,15 @@
+{
+  "sharedtype": {
+    "properties": {
+      "title": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 2048
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/package.json b/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/package.json
new file mode 100644
index 0000000000000..c52f4256c5c06
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/shared_type_plugin/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "shared_type_plugin",
+  "version": "0.0.0",
+  "kibana": {
+    "version": "kibana"
+  }
+}
diff --git a/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_cases.ts b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_cases.ts
new file mode 100644
index 0000000000000..b32950538f8e5
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_cases.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 const SAVED_OBJECT_TEST_CASES = Object.freeze({
+  SINGLE_NAMESPACE_DEFAULT_SPACE: Object.freeze({
+    type: 'isolatedtype',
+    id: 'defaultspace-isolatedtype-id',
+  }),
+  SINGLE_NAMESPACE_SPACE_1: Object.freeze({
+    type: 'isolatedtype',
+    id: 'space1-isolatedtype-id',
+  }),
+  SINGLE_NAMESPACE_SPACE_2: Object.freeze({
+    type: 'isolatedtype',
+    id: 'space2-isolatedtype-id',
+  }),
+  MULTI_NAMESPACE_DEFAULT_AND_SPACE_1: Object.freeze({
+    type: 'sharedtype',
+    id: 'default_and_space_1',
+  }),
+  MULTI_NAMESPACE_ONLY_SPACE_1: Object.freeze({
+    type: 'sharedtype',
+    id: 'only_space_1',
+  }),
+  MULTI_NAMESPACE_ONLY_SPACE_2: Object.freeze({
+    type: 'sharedtype',
+    id: 'only_space_2',
+  }),
+  NAMESPACE_AGNOSTIC: Object.freeze({
+    type: 'globaltype',
+    id: 'globaltype-id',
+  }),
+  HIDDEN: Object.freeze({
+    type: 'hiddentype',
+    id: 'any',
+  }),
+});
diff --git a/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
new file mode 100644
index 0000000000000..5640dfefa4f8d
--- /dev/null
+++ b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
@@ -0,0 +1,302 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SAVED_OBJECT_TEST_CASES as CASES } from './saved_object_test_cases';
+import { SPACES } from './spaces';
+import { AUTHENTICATION } from './authentication';
+import { TestCase, TestUser, ExpectResponseBody } from './types';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const {
+  NOT_A_KIBANA_USER,
+  SUPERUSER,
+  KIBANA_LEGACY_USER,
+  KIBANA_DUAL_PRIVILEGES_USER,
+  KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
+  KIBANA_RBAC_USER,
+  KIBANA_RBAC_DASHBOARD_ONLY_USER,
+  KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
+  KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
+  KIBANA_RBAC_SPACE_1_ALL_USER,
+  KIBANA_RBAC_SPACE_1_READ_USER,
+} = AUTHENTICATION;
+
+export function getUrlPrefix(spaceId: string) {
+  return spaceId && spaceId !== DEFAULT_SPACE_ID ? `/s/${spaceId}` : ``;
+}
+
+export function getExpectedSpaceIdProperty(spaceId: string) {
+  if (spaceId === DEFAULT_SPACE_ID) {
+    return {};
+  }
+  return {
+    spaceId,
+  };
+}
+
+export const getTestTitle = (
+  testCaseOrCases: TestCase | TestCase[],
+  bulkStatusCode?: 200 | 403 // only used for bulk test suites; other suites specify forbidden/permitted in each test case
+) => {
+  const testCases = Array.isArray(testCaseOrCases) ? testCaseOrCases : [testCaseOrCases];
+  const stringify = (array: TestCase[]) => array.map(x => `${x.type}/${x.id}`).join();
+  if (bulkStatusCode === 403 || (testCases.length === 1 && testCases[0].failure === 403)) {
+    return `forbidden [${stringify(testCases)}]`;
+  }
+  if (testCases.find(x => x.failure === 403)) {
+    throw new Error(
+      'Cannot create test title for multiple forbidden test cases; specify individual tests for each of these test cases'
+    );
+  }
+  // permitted
+  const list: string[] = [];
+  Object.entries({
+    success: undefined,
+    'bad request': 400,
+    'not found': 404,
+    conflict: 409,
+  }).forEach(([descriptor, failure]) => {
+    const filtered = testCases.filter(x => x.failure === failure);
+    if (filtered.length) {
+      list.push(`${descriptor} [${stringify(filtered)}]`);
+    }
+  });
+  return `${list.join(' and ')}`;
+};
+
+export const testCaseFailures = {
+  // test suites need explicit return types for number primitives
+  fail400: (condition?: boolean): { failure?: 400 } =>
+    condition !== false ? { failure: 400 } : {},
+  fail404: (condition?: boolean): { failure?: 404 } =>
+    condition !== false ? { failure: 404 } : {},
+  fail409: (condition?: boolean): { failure?: 409 } =>
+    condition !== false ? { failure: 409 } : {},
+};
+
+/**
+ * Test cases have additional properties that we don't want to send in HTTP Requests
+ */
+export const createRequest = ({ type, id }: TestCase) => ({ type, id });
+
+const uniq = <T>(arr: T[]): T[] => Array.from(new Set<T>(arr));
+const isNamespaceAgnostic = (type: string) => type === 'globaltype';
+const isMultiNamespace = (type: string) => type === 'sharedtype';
+export const expectResponses = {
+  forbidden: (action: string) => (typeOrTypes: string | string[]): ExpectResponseBody => async (
+    response: Record<string, any>
+  ) => {
+    const types = Array.isArray(typeOrTypes) ? typeOrTypes : [typeOrTypes];
+    const uniqueSorted = uniq(types).sort();
+    expect(response.body).to.eql({
+      statusCode: 403,
+      error: 'Forbidden',
+      message: `Unable to ${action} ${uniqueSorted.join()}`,
+    });
+  },
+  permitted: async (object: Record<string, any>, testCase: TestCase) => {
+    const { type, id, failure } = testCase;
+    if (failure) {
+      let error: ReturnType<typeof SavedObjectsErrorHelpers['decorateGeneralError']>;
+      if (failure === 400) {
+        error = SavedObjectsErrorHelpers.createUnsupportedTypeError(type);
+      } else if (failure === 404) {
+        error = SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
+      } else if (failure === 409) {
+        error = SavedObjectsErrorHelpers.createConflictError(type, id);
+      } else {
+        throw new Error(`Encountered unexpected error code ${failure}`);
+      }
+      // should not call permitted with a 403 failure case
+      if (object.type && object.id) {
+        // bulk request error
+        expect(object.type).to.eql(type);
+        expect(object.id).to.eql(id);
+        expect(object.error).to.eql(error.output.payload);
+      } else {
+        // non-bulk request error
+        expect(object.error).to.eql(error.output.payload.error);
+        expect(object.statusCode).to.eql(error.output.payload.statusCode);
+        // ignore the error.message, because it can vary for decorated non-bulk errors (e.g., conflict)
+      }
+    } else {
+      // fall back to default behavior of testing the success outcome
+      expect(object.type).to.eql(type);
+      if (id) {
+        expect(object.id).to.eql(id);
+      } else {
+        // created an object without specifying the ID, so it was auto-generated
+        expect(object.id).to.match(/^[0-9a-f-]{36}$/);
+      }
+      expect(object).not.to.have.property('error');
+      expect(object.updated_at).to.match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+      // don't test attributes, version, or references
+    }
+  },
+  /**
+   * Additional assertions that we use in `bulk_create` and `create` to ensure that
+   * newly-created (or overwritten) objects don't have unexpected properties
+   */
+  successCreated: async (es: any, spaceId: string, type: string, id: string) => {
+    const isNamespaceUndefined =
+      spaceId === SPACES.DEFAULT.spaceId || isNamespaceAgnostic(type) || isMultiNamespace(type);
+    const expectedSpacePrefix = isNamespaceUndefined ? '' : `${spaceId}:`;
+    const savedObject = await es.get({
+      id: `${expectedSpacePrefix}${type}:${id}`,
+      index: '.kibana',
+    });
+    const { namespace: actualNamespace, namespaces: actualNamespaces } = savedObject._source;
+    if (isNamespaceUndefined) {
+      expect(actualNamespace).to.eql(undefined);
+    } else {
+      expect(actualNamespace).to.eql(spaceId);
+    }
+    if (isMultiNamespace(type)) {
+      if (id === CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1.id) {
+        expect(actualNamespaces).to.eql([DEFAULT_SPACE_ID, SPACE_1_ID]);
+      } else if (id === CASES.MULTI_NAMESPACE_ONLY_SPACE_1.id) {
+        expect(actualNamespaces).to.eql([SPACE_1_ID]);
+      } else if (id === CASES.MULTI_NAMESPACE_ONLY_SPACE_2.id) {
+        expect(actualNamespaces).to.eql([SPACE_2_ID]);
+      } else {
+        // newly created in this space
+        expect(actualNamespaces).to.eql([spaceId]);
+      }
+    }
+    return savedObject;
+  },
+};
+
+/**
+ * Get test scenarios for each type of suite.
+ * @param modifier Use this to generate additional permutations of test scenarios.
+ *  For instance, a modifier of ['foo', 'bar'] would return
+ *  a `securityAndSpaces` of: [
+ *    { spaceId: DEFAULT_SPACE_ID, users: {...}, modifier: 'foo' },
+ *    { spaceId: DEFAULT_SPACE_ID, users: {...}, modifier: 'bar' },
+ *    { spaceId: SPACE_1_ID, users: {...}, modifier: 'foo' },
+ *    { spaceId: SPACE_1_ID, users: {...}, modifier: 'bar' },
+ *  ]
+ */
+export const getTestScenarios = <T>(modifiers?: T[]) => {
+  const commonUsers = {
+    noAccess: { ...NOT_A_KIBANA_USER, description: 'user with no access' },
+    superuser: { ...SUPERUSER, description: 'superuser' },
+    legacyAll: { ...KIBANA_LEGACY_USER, description: 'legacy user' },
+    allGlobally: { ...KIBANA_RBAC_USER, description: 'rbac user with all globally' },
+    readGlobally: {
+      ...KIBANA_RBAC_DASHBOARD_ONLY_USER,
+      description: 'rbac user with read globally',
+    },
+    dualAll: { ...KIBANA_DUAL_PRIVILEGES_USER, description: 'dual-privileges user' },
+    dualRead: {
+      ...KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
+      description: 'dual-privileges readonly user',
+    },
+  };
+
+  interface Security {
+    modifier?: T;
+    users: Record<
+      | keyof typeof commonUsers
+      | 'allAtDefaultSpace'
+      | 'readAtDefaultSpace'
+      | 'allAtSpace1'
+      | 'readAtSpace1',
+      TestUser
+    >;
+  }
+  interface SecurityAndSpaces {
+    modifier?: T;
+    users: Record<
+      keyof typeof commonUsers | 'allAtSpace' | 'readAtSpace' | 'allAtOtherSpace',
+      TestUser
+    >;
+    spaceId: string;
+  }
+  interface Spaces {
+    modifier?: T;
+    spaceId: string;
+  }
+
+  let spaces: Spaces[] = [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID].map(x => ({ spaceId: x }));
+  let security: Security[] = [
+    {
+      users: {
+        ...commonUsers,
+        allAtDefaultSpace: {
+          ...KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
+          description: 'rbac user with all at default space',
+        },
+        readAtDefaultSpace: {
+          ...KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
+          description: 'rbac user with read at default space',
+        },
+        allAtSpace1: {
+          ...KIBANA_RBAC_SPACE_1_ALL_USER,
+          description: 'rbac user with all at space_1',
+        },
+        readAtSpace1: {
+          ...KIBANA_RBAC_SPACE_1_READ_USER,
+          description: 'rbac user with read at space_1',
+        },
+      },
+    },
+  ];
+  let securityAndSpaces: SecurityAndSpaces[] = [
+    {
+      spaceId: DEFAULT_SPACE_ID,
+      users: {
+        ...commonUsers,
+        allAtSpace: {
+          ...KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
+          description: 'user with all at the space',
+        },
+        readAtSpace: {
+          ...KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
+          description: 'user with read at the space',
+        },
+        allAtOtherSpace: {
+          ...KIBANA_RBAC_SPACE_1_ALL_USER,
+          description: 'user with all at other space',
+        },
+      },
+    },
+    {
+      spaceId: SPACE_1_ID,
+      users: {
+        ...commonUsers,
+        allAtSpace: { ...KIBANA_RBAC_SPACE_1_ALL_USER, description: 'user with all at the space' },
+        readAtSpace: {
+          ...KIBANA_RBAC_SPACE_1_READ_USER,
+          description: 'user with read at the space',
+        },
+        allAtOtherSpace: {
+          ...KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
+          description: 'user with all at other space',
+        },
+      },
+    },
+  ];
+  if (modifiers) {
+    const addModifier = <T>(list: T[]) =>
+      list.map(x => modifiers.map(modifier => ({ ...x, modifier }))).flat();
+    spaces = addModifier(spaces);
+    security = addModifier(security);
+    securityAndSpaces = addModifier(securityAndSpaces);
+  }
+  return {
+    spaces,
+    security,
+    securityAndSpaces,
+  };
+};
diff --git a/x-pack/test/saved_object_api_integration/common/lib/space_test_utils.ts b/x-pack/test/saved_object_api_integration/common/lib/space_test_utils.ts
deleted file mode 100644
index 1619d77761c84..0000000000000
--- a/x-pack/test/saved_object_api_integration/common/lib/space_test_utils.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-
-export function getUrlPrefix(spaceId: string) {
-  return spaceId && spaceId !== DEFAULT_SPACE_ID ? `/s/${spaceId}` : ``;
-}
-
-export function getIdPrefix(spaceId: string) {
-  return spaceId === DEFAULT_SPACE_ID ? '' : `${spaceId}-`;
-}
-
-export function getExpectedSpaceIdProperty(spaceId: string) {
-  if (spaceId === DEFAULT_SPACE_ID) {
-    return {};
-  }
-  return {
-    spaceId,
-  };
-}
diff --git a/x-pack/test/saved_object_api_integration/common/lib/types.ts b/x-pack/test/saved_object_api_integration/common/lib/types.ts
index 487afff1494c0..f6e6d391ae905 100644
--- a/x-pack/test/saved_object_api_integration/common/lib/types.ts
+++ b/x-pack/test/saved_object_api_integration/common/lib/types.ts
@@ -4,9 +4,28 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export type DescribeFn = (text: string, fn: () => void) => void;
+export type ExpectResponseBody = (response: Record<string, any>) => Promise<void>;
 
-export interface TestDefinitionAuthentication {
-  username?: string;
-  password?: string;
+export interface TestDefinition {
+  title: string;
+  responseStatusCode: number;
+  responseBody: ExpectResponseBody;
+}
+
+export interface TestSuite<T> {
+  user?: TestUser;
+  spaceId?: string;
+  tests: T[];
+}
+
+export interface TestCase {
+  type: string;
+  id: string;
+  failure?: 400 | 403 | 404 | 409;
+}
+
+export interface TestUser {
+  username: string;
+  password: string;
+  description: string;
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
index b6f1bb956d72d..0dafe6b7b386d 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
@@ -6,224 +6,137 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
-
-interface BulkCreateTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
-}
-
-interface BulkCreateCustomTest extends BulkCreateTest {
-  description: string;
-  requestBody: {
-    [key: string]: any;
-  };
-}
-
-interface BulkCreateTests {
-  default: BulkCreateTest;
-  includingSpace: BulkCreateTest;
-  custom?: BulkCreateCustomTest;
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+
+export interface BulkCreateTestDefinition extends TestDefinition {
+  request: Array<{ type: string; id: string }>;
+  overwrite: boolean;
 }
-
-interface BulkCreateTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  tests: BulkCreateTests;
+export type BulkCreateTestSuite = TestSuite<BulkCreateTestDefinition>;
+export interface BulkCreateTestCase extends TestCase {
+  failure?: 400 | 409; // only used for permitted response case
 }
 
-const createBulkRequests = (spaceId: string) => [
-  {
-    type: 'visualization',
-    id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-    attributes: {
-      title: 'An existing visualization',
-    },
-  },
-  {
-    type: 'dashboard',
-    id: `${getIdPrefix(spaceId)}a01b2f57-fcfd-4864-b735-09e28f0d815e`,
-    attributes: {
-      title: 'A great new dashboard',
-    },
-  },
-  {
-    type: 'globaltype',
-    id: '05976c65-1145-4858-bbf0-d225cc78a06e',
-    attributes: {
-      name: 'A new globaltype object',
-    },
-  },
-  {
-    type: 'globaltype',
-    id: '8121a00-8efd-21e7-1cb3-34ab966434445',
-    attributes: {
-      name: 'An existing globaltype',
-    },
-  },
-];
+const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
+const NEW_ATTRIBUTE_VAL = `New attribute value ${Date.now()}`;
 
-const isGlobalType = (type: string) => type === 'globaltype';
+const NEW_SINGLE_NAMESPACE_OBJ = Object.freeze({ type: 'dashboard', id: 'new-dashboard-id' });
+const NEW_MULTI_NAMESPACE_OBJ = Object.freeze({ type: 'sharedtype', id: 'new-sharedtype-id' });
+const NEW_NAMESPACE_AGNOSTIC_OBJ = Object.freeze({ type: 'globaltype', id: 'new-globaltype-id' });
+export const TEST_CASES = Object.freeze({
+  ...CASES,
+  NEW_SINGLE_NAMESPACE_OBJ,
+  NEW_MULTI_NAMESPACE_OBJ,
+  NEW_NAMESPACE_AGNOSTIC_OBJ,
+});
 
 export function bulkCreateTestSuiteFactory(es: any, esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectResults = (spaceId = DEFAULT_SPACE_ID) => async (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      saved_objects: [
-        {
-          type: 'visualization',
-          id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-          error: {
-            message: 'version conflict, document already exists',
-            statusCode: 409,
-          },
-        },
-        {
-          type: 'dashboard',
-          id: `${getIdPrefix(spaceId)}a01b2f57-fcfd-4864-b735-09e28f0d815e`,
-          updated_at: resp.body.saved_objects[1].updated_at,
-          version: resp.body.saved_objects[1].version,
-          attributes: {
-            title: 'A great new dashboard',
-          },
-          references: [],
-        },
-        {
-          type: 'globaltype',
-          id: `05976c65-1145-4858-bbf0-d225cc78a06e`,
-          updated_at: resp.body.saved_objects[2].updated_at,
-          version: resp.body.saved_objects[2].version,
-          attributes: {
-            name: 'A new globaltype object',
-          },
-          references: [],
-        },
-        {
-          type: 'globaltype',
-          id: '8121a00-8efd-21e7-1cb3-34ab966434445',
-          error: {
-            message: 'version conflict, document already exists',
-            statusCode: 409,
-          },
-        },
-      ],
-    });
-
-    for (const savedObject of createBulkRequests(spaceId)) {
-      const expectedSpacePrefix =
-        spaceId === DEFAULT_SPACE_ID || isGlobalType(savedObject.type) ? '' : `${spaceId}:`;
-
-      // query ES directory to ensure namespace was or wasn't specified
-      const { _source } = await es.get({
-        id: `${expectedSpacePrefix}${savedObject.type}:${savedObject.id}`,
-        index: '.kibana',
-      });
-
-      const { namespace: actualNamespace } = _source;
-
-      if (spaceId === DEFAULT_SPACE_ID || isGlobalType(savedObject.type)) {
-        expect(actualNamespace).to.eql(undefined);
-      } else {
-        expect(actualNamespace).to.eql(spaceId);
+  const expectForbidden = expectResponses.forbidden('bulk_create');
+  const expectResponseBody = (
+    testCases: BulkCreateTestCase | BulkCreateTestCase[],
+    statusCode: 200 | 403,
+    spaceId = SPACES.DEFAULT.spaceId
+  ): ExpectResponseBody => async (response: Record<string, any>) => {
+    const testCaseArray = Array.isArray(testCases) ? testCases : [testCases];
+    if (statusCode === 403) {
+      const types = testCaseArray.map(x => x.type);
+      await expectForbidden(types)(response);
+    } else {
+      // permitted
+      const savedObjects = response.body.saved_objects;
+      expect(savedObjects).length(testCaseArray.length);
+      for (let i = 0; i < savedObjects.length; i++) {
+        const object = savedObjects[i];
+        const testCase = testCaseArray[i];
+        await expectResponses.permitted(object, testCase);
+        if (!testCase.failure) {
+          expect(object.attributes[NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+          await expectResponses.successCreated(es, spaceId, object.type, object.id);
+        }
       }
     }
   };
-
-  const expectBadRequestForHiddenType = (resp: { [key: string]: any }) => {
-    const spaceEntry = resp.body.saved_objects.find(
-      (entry: any) => entry.id === 'my-hiddentype' && entry.type === 'hiddentype'
-    );
-    expect(spaceEntry).to.eql({
-      id: 'my-hiddentype',
-      type: 'hiddentype',
-      error: {
-        message: "Unsupported saved object type: 'hiddentype': Bad Request",
-        statusCode: 400,
-        error: 'Bad Request',
+  const createTestDefinitions = (
+    testCases: BulkCreateTestCase | BulkCreateTestCase[],
+    forbidden: boolean,
+    overwrite: boolean,
+    options?: {
+      spaceId?: string;
+      singleRequest?: boolean;
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): BulkCreateTestDefinition[] => {
+    const cases = Array.isArray(testCases) ? testCases : [testCases];
+    const responseStatusCode = forbidden ? 403 : 200;
+    if (!options?.singleRequest) {
+      // if we are testing cases that should result in a forbidden response, we can do each case individually
+      // this ensures that multiple test cases of a single type will each result in a forbidden error
+      return cases.map(x => ({
+        title: getTestTitle(x, responseStatusCode),
+        request: [createRequest(x)],
+        responseStatusCode,
+        responseBody:
+          options?.responseBodyOverride ||
+          expectResponseBody(x, responseStatusCode, options?.spaceId),
+        overwrite,
+      }));
+    }
+    // batch into a single request to save time during test execution
+    return [
+      {
+        title: getTestTitle(cases, responseStatusCode),
+        request: cases.map(x => createRequest(x)),
+        responseStatusCode,
+        responseBody:
+          options?.responseBodyOverride ||
+          expectResponseBody(cases, responseStatusCode, options?.spaceId),
+        overwrite,
       },
-    });
+    ];
   };
 
-  const expectedForbiddenTypes = ['dashboard', 'globaltype', 'visualization'];
-  const expectedForbiddenTypesWithHiddenType = [
-    'dashboard',
-    'globaltype',
-    'hiddentype',
-    'visualization',
-  ];
-  const createExpectRbacForbidden = (types: string[] = expectedForbiddenTypes) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to bulk_create ${types.join(',')}`,
-    });
-  };
-
-  const makeBulkCreateTest = (describeFn: DescribeFn) => (
+  const makeBulkCreateTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: BulkCreateTestDefinition
+    definition: BulkCreateTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, tests } = definition;
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
 
-      it(`should return ${tests.default.statusCode}`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_create`)
-          .auth(user.username, user.password)
-          .send(createBulkRequests(spaceId))
-          .expect(tests.default.statusCode)
-          .then(tests.default.response);
-      });
-
-      it(`including a hiddentype saved object should return ${tests.includingSpace.statusCode}`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_create`)
-          .auth(user.username, user.password)
-          .send(
-            createBulkRequests(spaceId).concat([
-              {
-                type: 'hiddentype',
-                id: `my-hiddentype`,
-                attributes: {
-                  name: 'My awesome hiddentype',
-                },
-              },
-            ])
-          )
-          .expect(tests.includingSpace.statusCode)
-          .then(tests.includingSpace.response);
-      });
+      const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
 
-      if (tests.custom) {
-        it(tests.custom!.description, async () => {
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const requestBody = test.request.map(x => ({ ...x, ...attrs }));
+          const query = test.overwrite ? '?overwrite=true' : '';
           await supertest
-            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_create`)
-            .auth(user.username, user.password)
-            .send(tests.custom!.requestBody)
-            .expect(tests.custom!.statusCode)
-            .then(tests.custom!.response);
+            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_create${query}`)
+            .auth(user?.username, user?.password)
+            .send(requestBody)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
       }
     });
   };
 
-  const bulkCreateTest = makeBulkCreateTest(describe);
+  const addTests = makeBulkCreateTest(describe);
   // @ts-ignore
-  bulkCreateTest.only = makeBulkCreateTest(describe.only);
+  addTests.only = makeBulkCreateTest(describe.only);
 
   return {
-    bulkCreateTest,
-    createExpectResults,
-    createExpectRbacForbidden,
-    expectBadRequestForHiddenType,
-    expectedForbiddenTypesWithHiddenType,
+    addTests,
+    createTestDefinitions,
+    expectForbidden,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts
index 9c5cc375502d1..f03dac597294c 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts
@@ -6,203 +6,110 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
 
-interface BulkGetTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
+export interface BulkGetTestDefinition extends TestDefinition {
+  request: Array<{ type: string; id: string }>;
 }
-
-interface BulkGetTests {
-  default: BulkGetTest;
-  includingHiddenType: BulkGetTest;
-}
-
-interface BulkGetTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  otherSpaceId?: string;
-  tests: BulkGetTests;
+export type BulkGetTestSuite = TestSuite<BulkGetTestDefinition>;
+export interface BulkGetTestCase extends TestCase {
+  failure?: 400 | 404; // only used for permitted response case
 }
 
-const createBulkRequests = (spaceId: string) => [
-  {
-    type: 'visualization',
-    id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-  },
-  {
-    type: 'dashboard',
-    id: `${getIdPrefix(spaceId)}does not exist`,
-  },
-  {
-    type: 'globaltype',
-    id: '8121a00-8efd-21e7-1cb3-34ab966434445',
-  },
-];
+const DOES_NOT_EXIST = Object.freeze({ type: 'dashboard', id: 'does-not-exist' });
+export const TEST_CASES = Object.freeze({ ...CASES, DOES_NOT_EXIST });
 
 export function bulkGetTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectNotFoundResults = (spaceId: string) => (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      saved_objects: [
-        {
-          id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-          type: 'visualization',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
-        },
-        {
-          id: `${getIdPrefix(spaceId)}does not exist`,
-          type: 'dashboard',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
-        },
-        {
-          id: `8121a00-8efd-21e7-1cb3-34ab966434445`,
-          type: 'globaltype',
-          updated_at: '2017-09-21T18:59:16.270Z',
-          version: resp.body.saved_objects[2].version,
-          attributes: {
-            name: 'My favorite global object',
-          },
-          references: [],
-        },
-      ],
-    });
+  const expectForbidden = expectResponses.forbidden('bulk_get');
+  const expectResponseBody = (
+    testCases: BulkGetTestCase | BulkGetTestCase[],
+    statusCode: 200 | 403
+  ): ExpectResponseBody => async (response: Record<string, any>) => {
+    const testCaseArray = Array.isArray(testCases) ? testCases : [testCases];
+    if (statusCode === 403) {
+      const types = testCaseArray.map(x => x.type);
+      await expectForbidden(types)(response);
+    } else {
+      // permitted
+      const savedObjects = response.body.saved_objects;
+      expect(savedObjects).length(testCaseArray.length);
+      for (let i = 0; i < savedObjects.length; i++) {
+        const object = savedObjects[i];
+        const testCase = testCaseArray[i];
+        await expectResponses.permitted(object, testCase);
+      }
+    }
   };
-
-  const expectBadRequestForHiddenType = (resp: { [key: string]: any }) => {
-    const spaceEntry = resp.body.saved_objects.find(
-      (entry: any) => entry.id === 'my-hiddentype' && entry.type === 'hiddentype'
-    );
-    expect(spaceEntry).to.eql({
-      id: 'my-hiddentype',
-      type: 'hiddentype',
-      error: {
-        message: "Unsupported saved object type: 'hiddentype': Bad Request",
-        statusCode: 400,
-        error: 'Bad Request',
+  const createTestDefinitions = (
+    testCases: BulkGetTestCase | BulkGetTestCase[],
+    forbidden: boolean,
+    options?: {
+      singleRequest?: boolean;
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): BulkGetTestDefinition[] => {
+    const cases = Array.isArray(testCases) ? testCases : [testCases];
+    const responseStatusCode = forbidden ? 403 : 200;
+    if (!options?.singleRequest) {
+      // if we are testing cases that should result in a forbidden response, we can do each case individually
+      // this ensures that multiple test cases of a single type will each result in a forbidden error
+      return cases.map(x => ({
+        title: getTestTitle(x, responseStatusCode),
+        request: [createRequest(x)],
+        responseStatusCode,
+        responseBody: options?.responseBodyOverride || expectResponseBody(x, responseStatusCode),
+      }));
+    }
+    // batch into a single request to save time during test execution
+    return [
+      {
+        title: getTestTitle(cases, responseStatusCode),
+        request: cases.map(x => createRequest(x)),
+        responseStatusCode,
+        responseBody:
+          options?.responseBodyOverride || expectResponseBody(cases, responseStatusCode),
       },
-    });
+    ];
   };
 
-  const expectedForbiddenTypes = ['dashboard', 'globaltype', 'visualization'];
-  const expectedForbiddenTypesWithHiddenType = [
-    'dashboard',
-    'globaltype',
-    'hiddentype',
-    'visualization',
-  ];
-  const createExpectRbacForbidden = (types: string[] = expectedForbiddenTypes) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to bulk_get ${types.join(',')}`,
-    });
-  };
-
-  const createExpectResults = (spaceId = DEFAULT_SPACE_ID) => (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      saved_objects: [
-        {
-          id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-          type: 'visualization',
-          migrationVersion: resp.body.saved_objects[0].migrationVersion,
-          updated_at: '2017-09-21T18:51:23.794Z',
-          version: resp.body.saved_objects[0].version,
-          attributes: {
-            title: 'Count of requests',
-            description: '',
-            version: 1,
-            // cheat for some of the more complex attributes
-            visState: resp.body.saved_objects[0].attributes.visState,
-            uiStateJSON: resp.body.saved_objects[0].attributes.uiStateJSON,
-            kibanaSavedObjectMeta: resp.body.saved_objects[0].attributes.kibanaSavedObjectMeta,
-          },
-          references: [
-            {
-              name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-              type: 'index-pattern',
-              id: `${getIdPrefix(spaceId)}91200a00-9efd-11e7-acb3-3dab96693fab`,
-            },
-          ],
-        },
-        {
-          id: `${getIdPrefix(spaceId)}does not exist`,
-          type: 'dashboard',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
-        },
-        {
-          id: `8121a00-8efd-21e7-1cb3-34ab966434445`,
-          type: 'globaltype',
-          updated_at: '2017-09-21T18:59:16.270Z',
-          version: resp.body.saved_objects[2].version,
-          attributes: {
-            name: 'My favorite global object',
-          },
-          references: [],
-        },
-      ],
-    });
-  };
-
-  const makeBulkGetTest = (describeFn: DescribeFn) => (
+  const makeBulkGetTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: BulkGetTestDefinition
+    definition: BulkGetTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, otherSpaceId, tests } = definition;
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
 
-      it(`should return ${tests.default.statusCode}`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_get`)
-          .auth(user.username, user.password)
-          .send(createBulkRequests(otherSpaceId || spaceId))
-          .expect(tests.default.statusCode)
-          .then(tests.default.response);
-      });
-
-      it(`with a hiddentype saved object included should return ${tests.includingHiddenType.statusCode}`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_get`)
-          .auth(user.username, user.password)
-          .send(
-            createBulkRequests(otherSpaceId || spaceId).concat([
-              {
-                type: 'hiddentype',
-                id: `my-hiddentype`,
-              },
-            ])
-          )
-          .expect(tests.includingHiddenType.statusCode)
-          .then(tests.includingHiddenType.response);
-      });
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          await supertest
+            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_get`)
+            .auth(user?.username, user?.password)
+            .send(test.request)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
+        });
+      }
     });
   };
 
-  const bulkGetTest = makeBulkGetTest(describe);
+  const addTests = makeBulkGetTest(describe);
   // @ts-ignore
-  bulkGetTest.only = makeBulkGetTest(describe.only);
+  addTests.only = makeBulkGetTest(describe.only);
 
   return {
-    bulkGetTest,
-    createExpectNotFoundResults,
-    createExpectResults,
-    createExpectRbacForbidden,
-    expectBadRequestForHiddenType,
-    expectedForbiddenTypesWithHiddenType,
+    addTests,
+    createTestDefinitions,
+    expectForbidden,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts
index d14c5ccbd1d0e..e0e2118300ef4 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts
@@ -6,234 +6,119 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
-
-interface BulkUpdateTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
-}
-
-interface BulkUpdateTests {
-  spaceAware: BulkUpdateTest;
-  notSpaceAware: BulkUpdateTest;
-  hiddenType: BulkUpdateTest;
-  doesntExist: BulkUpdateTest;
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+
+export interface BulkUpdateTestDefinition extends TestDefinition {
+  request: Array<{ type: string; id: string }>;
 }
-
-interface BulkUpdateTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  otherSpaceId?: string;
-  tests: BulkUpdateTests;
+export type BulkUpdateTestSuite = TestSuite<BulkUpdateTestDefinition>;
+export interface BulkUpdateTestCase extends TestCase {
+  failure?: 404; // only used for permitted response case
 }
 
-export function bulkUpdateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectNotFound = (type: string, id: string, spaceId = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    const [, savedObject] = resp.body.saved_objects;
-    expect(savedObject.error).eql({
-      statusCode: 404,
-      error: 'Not Found',
-      message: `Saved object [${type}/${getIdPrefix(spaceId)}${id}] not found`,
-    });
-  };
-
-  const createExpectDoesntExistNotFound = (spaceId?: string) => {
-    return createExpectNotFound('visualization', 'not an id', spaceId);
-  };
-
-  const createExpectSpaceAwareNotFound = (spaceId?: string) => {
-    return createExpectNotFound('visualization', 'dd7caf20-9efd-11e7-acb3-3dab96693fab', spaceId);
-  };
-
-  const expectHiddenTypeNotFound = createExpectNotFound(
-    'hiddentype',
-    'hiddentype_1',
-    DEFAULT_SPACE_ID
-  );
-
-  const createExpectRbacForbidden = (types: string[]) => (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to bulk_update ${types.join()}`,
-    });
-  };
-
-  const expectDoesntExistRbacForbidden = createExpectRbacForbidden(['globaltype', 'visualization']);
+const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
+const NEW_ATTRIBUTE_VAL = `Updated attribute value ${Date.now()}`;
 
-  const expectNotSpaceAwareRbacForbidden = createExpectRbacForbidden(['globaltype']);
+const DOES_NOT_EXIST = Object.freeze({ type: 'dashboard', id: 'does-not-exist' });
+export const TEST_CASES = Object.freeze({ ...CASES, DOES_NOT_EXIST });
 
-  const expectHiddenTypeRbacForbidden = createExpectRbacForbidden(['globaltype', 'hiddentype']);
-  const expectHiddenTypeRbacForbiddenWithGlobalAllowed = createExpectRbacForbidden(['hiddentype']);
-
-  const expectSpaceAwareRbacForbidden = createExpectRbacForbidden(['globaltype', 'visualization']);
-
-  const expectNotSpaceAwareResults = (resp: { [key: string]: any }) => {
-    const [, savedObject] = resp.body.saved_objects;
-    // loose uuid validation
-    expect(savedObject)
-      .to.have.property('id')
-      .match(/^[0-9a-f-]{36}$/);
-
-    // loose ISO8601 UTC time with milliseconds validation
-    expect(savedObject)
-      .to.have.property('updated_at')
-      .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-
-    expect(savedObject).to.eql({
-      id: savedObject.id,
-      type: 'globaltype',
-      updated_at: savedObject.updated_at,
-      version: savedObject.version,
-      attributes: {
-        name: 'My second favorite',
-      },
-    });
+export function bulkUpdateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
+  const expectForbidden = expectResponses.forbidden('bulk_update');
+  const expectResponseBody = (
+    testCases: BulkUpdateTestCase | BulkUpdateTestCase[],
+    statusCode: 200 | 403
+  ): ExpectResponseBody => async (response: Record<string, any>) => {
+    const testCaseArray = Array.isArray(testCases) ? testCases : [testCases];
+    if (statusCode === 403) {
+      const types = testCaseArray.map(x => x.type);
+      await expectForbidden(types)(response);
+    } else {
+      // permitted
+      const savedObjects = response.body.saved_objects;
+      expect(savedObjects).length(testCaseArray.length);
+      for (let i = 0; i < savedObjects.length; i++) {
+        const object = savedObjects[i];
+        const testCase = testCaseArray[i];
+        await expectResponses.permitted(object, testCase);
+        if (!testCase.failure) {
+          expect(object.attributes[NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+        }
+      }
+    }
   };
-
-  const expectSpaceAwareResults = (resp: { [key: string]: any }) => {
-    const [, savedObject] = resp.body.saved_objects;
-    // loose uuid validation ignoring prefix
-    expect(savedObject)
-      .to.have.property('id')
-      .match(/[0-9a-f-]{36}$/);
-
-    // loose ISO8601 UTC time with milliseconds validation
-    expect(savedObject)
-      .to.have.property('updated_at')
-      .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-
-    expect(savedObject).to.eql({
-      id: savedObject.id,
-      type: 'visualization',
-      updated_at: savedObject.updated_at,
-      version: savedObject.version,
-      attributes: {
-        title: 'My second favorite vis',
+  const createTestDefinitions = (
+    testCases: BulkUpdateTestCase | BulkUpdateTestCase[],
+    forbidden: boolean,
+    options?: {
+      singleRequest?: boolean;
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): BulkUpdateTestDefinition[] => {
+    const cases = Array.isArray(testCases) ? testCases : [testCases];
+    const responseStatusCode = forbidden ? 403 : 200;
+    if (!options?.singleRequest) {
+      // if we are testing cases that should result in a forbidden response, we can do each case individually
+      // this ensures that multiple test cases of a single type will each result in a forbidden error
+      return cases.map(x => ({
+        title: getTestTitle(x, responseStatusCode),
+        request: [createRequest(x)],
+        responseStatusCode,
+        responseBody: options?.responseBodyOverride || expectResponseBody(x, responseStatusCode),
+      }));
+    }
+    // batch into a single request to save time during test execution
+    return [
+      {
+        title: getTestTitle(cases, responseStatusCode),
+        request: cases.map(x => createRequest(x)),
+        responseStatusCode,
+        responseBody:
+          options?.responseBodyOverride || expectResponseBody(cases, responseStatusCode),
       },
-    });
+    ];
   };
 
-  const makeBulkUpdateTest = (describeFn: DescribeFn) => (
+  const makeBulkUpdateTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: BulkUpdateTestDefinition
+    definition: BulkUpdateTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, otherSpaceId, tests } = definition;
-
-    // We add this type into all bulk updates
-    // to ensure that having additional items in the bulk
-    // update doesn't change the expected outcome overall
-    let updateCount = 0;
-    const generateNonSpaceAwareGlobalSavedObject = () => ({
-      type: 'globaltype',
-      id: `8121a00-8efd-21e7-1cb3-34ab966434445`,
-      attributes: {
-        name: `Update #${++updateCount}`,
-      },
-    });
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
-      it(`should return ${tests.spaceAware.statusCode} for a space-aware doc`, async () => {
-        await supertest
-          .put(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_update`)
-          .auth(user.username, user.password)
-          .send([
-            generateNonSpaceAwareGlobalSavedObject(),
-            {
-              type: 'visualization',
-              id: `${getIdPrefix(otherSpaceId || spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-              attributes: {
-                title: 'My second favorite vis',
-              },
-            },
-            generateNonSpaceAwareGlobalSavedObject(),
-          ])
-          .expect(tests.spaceAware.statusCode)
-          .then(tests.spaceAware.response);
-      });
-
-      it(`should return ${tests.notSpaceAware.statusCode} for a non space-aware doc`, async () => {
-        await supertest
-          .put(`${getUrlPrefix(otherSpaceId || spaceId)}/api/saved_objects/_bulk_update`)
-          .auth(user.username, user.password)
-          .send([
-            generateNonSpaceAwareGlobalSavedObject(),
-            {
-              type: 'globaltype',
-              id: `8121a00-8efd-21e7-1cb3-34ab966434445`,
-              attributes: {
-                name: 'My second favorite',
-              },
-            },
-            generateNonSpaceAwareGlobalSavedObject(),
-          ])
-          .expect(tests.notSpaceAware.statusCode)
-          .then(tests.notSpaceAware.response);
-      });
 
-      it(`should return ${tests.hiddenType.statusCode} for hiddentype doc`, async () => {
-        await supertest
-          .put(`${getUrlPrefix(otherSpaceId || spaceId)}/api/saved_objects/_bulk_update`)
-          .auth(user.username, user.password)
-          .send([
-            generateNonSpaceAwareGlobalSavedObject(),
-            {
-              type: 'hiddentype',
-              id: 'hiddentype_1',
-              attributes: {
-                name: 'My favorite hidden type',
-              },
-            },
-            generateNonSpaceAwareGlobalSavedObject(),
-          ])
-          .expect(tests.hiddenType.statusCode)
-          .then(tests.hiddenType.response);
-      });
+      const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
 
-      describe('unknown id', () => {
-        it(`should return ${tests.doesntExist.statusCode}`, async () => {
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const requestBody = test.request.map(x => ({ ...x, ...attrs }));
           await supertest
             .put(`${getUrlPrefix(spaceId)}/api/saved_objects/_bulk_update`)
-            .auth(user.username, user.password)
-            .send([
-              generateNonSpaceAwareGlobalSavedObject(),
-              {
-                type: 'visualization',
-                id: `${getIdPrefix(spaceId)}not an id`,
-                attributes: {
-                  title: 'My second favorite vis',
-                },
-              },
-              generateNonSpaceAwareGlobalSavedObject(),
-            ])
-            .expect(tests.doesntExist.statusCode)
-            .then(tests.doesntExist.response);
+            .auth(user?.username, user?.password)
+            .send(requestBody)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
-      });
+      }
     });
   };
 
-  const bulkUpdateTest = makeBulkUpdateTest(describe);
+  const addTests = makeBulkUpdateTest(describe);
   // @ts-ignore
-  bulkUpdateTest.only = makeBulkUpdateTest(describe.only);
+  addTests.only = makeBulkUpdateTest(describe.only);
 
   return {
-    createExpectDoesntExistNotFound,
-    createExpectSpaceAwareNotFound,
-    expectSpaceNotFound: expectHiddenTypeNotFound,
-    expectDoesntExistRbacForbidden,
-    expectNotSpaceAwareRbacForbidden,
-    expectNotSpaceAwareResults,
-    expectSpaceAwareRbacForbidden,
-    expectSpaceAwareResults,
-    expectHiddenTypeRbacForbidden,
-    expectHiddenTypeRbacForbiddenWithGlobalAllowed,
-    bulkUpdateTest,
+    addTests,
+    createTestDefinitions,
+    expectForbidden,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/create.ts b/x-pack/test/saved_object_api_integration/common/suites/create.ts
index 29960c513d40f..f657756be92cd 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/create.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/create.ts
@@ -3,206 +3,117 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
-
-interface CreateTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
-}
-
-interface CreateCustomTest extends CreateTest {
-  type: string;
-  description: string;
-  requestBody: any;
-}
-
-interface CreateTests {
-  spaceAware: CreateTest;
-  notSpaceAware: CreateTest;
-  hiddenType: CreateTest;
-  custom?: CreateCustomTest;
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+
+export interface CreateTestDefinition extends TestDefinition {
+  request: { type: string; id: string };
+  overwrite: boolean;
 }
-
-interface CreateTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  tests: CreateTests;
+export type CreateTestSuite = TestSuite<CreateTestDefinition>;
+export interface CreateTestCase extends TestCase {
+  failure?: 400 | 403 | 409;
 }
 
-const spaceAwareType = 'visualization';
-const notSpaceAwareType = 'globaltype';
+const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
+const NEW_ATTRIBUTE_VAL = `New attribute value ${Date.now()}`;
+
+// ID intentionally left blank on NEW_SINGLE_NAMESPACE_OBJ to ensure we can create saved objects without specifying the ID
+// we could create six separate test cases to test every permutation, but there's no real value in doing so
+const NEW_SINGLE_NAMESPACE_OBJ = Object.freeze({ type: 'dashboard', id: '' });
+const NEW_MULTI_NAMESPACE_OBJ = Object.freeze({ type: 'sharedtype', id: 'new-sharedtype-id' });
+const NEW_NAMESPACE_AGNOSTIC_OBJ = Object.freeze({ type: 'globaltype', id: 'new-globaltype-id' });
+export const TEST_CASES = Object.freeze({
+  ...CASES,
+  NEW_SINGLE_NAMESPACE_OBJ,
+  NEW_MULTI_NAMESPACE_OBJ,
+  NEW_NAMESPACE_AGNOSTIC_OBJ,
+});
 
 export function createTestSuiteFactory(es: any, esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectRbacForbidden = (type: string) => (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to create ${type}`,
-    });
-  };
-
-  const expectBadRequestForHiddenType = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      message: "Unsupported saved object type: 'hiddentype': Bad Request",
-      statusCode: 400,
-      error: 'Bad Request',
-    });
-  };
-
-  const createExpectSpaceAwareResults = (spaceId = DEFAULT_SPACE_ID) => async (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body)
-      .to.have.property('id')
-      .match(/^[0-9a-f-]{36}$/);
-
-    // loose ISO8601 UTC time with milliseconds validation
-    expect(resp.body)
-      .to.have.property('updated_at')
-      .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-
-    expect(resp.body).to.eql({
-      id: resp.body.id,
-      migrationVersion: resp.body.migrationVersion,
-      type: spaceAwareType,
-      updated_at: resp.body.updated_at,
-      version: resp.body.version,
-      attributes: {
-        title: 'My favorite vis',
-      },
-      references: [],
-    });
-
-    const expectedSpacePrefix = spaceId === DEFAULT_SPACE_ID ? '' : `${spaceId}:`;
-
-    // query ES directory to ensure namespace was or wasn't specified
-    const { _source } = await es.get({
-      id: `${expectedSpacePrefix}${spaceAwareType}:${resp.body.id}`,
-      index: '.kibana',
-    });
-
-    const { namespace: actualNamespace } = _source;
-
-    if (spaceId === DEFAULT_SPACE_ID) {
-      expect(actualNamespace).to.eql(undefined);
+  const expectForbidden = expectResponses.forbidden('create');
+  const expectResponseBody = (
+    testCase: CreateTestCase,
+    spaceId = SPACES.DEFAULT.spaceId
+  ): ExpectResponseBody => async (response: Record<string, any>) => {
+    if (testCase.failure === 403) {
+      await expectForbidden(testCase.type)(response);
     } else {
-      expect(actualNamespace).to.eql(spaceId);
+      // permitted
+      const object = response.body;
+      await expectResponses.permitted(object, testCase);
+      if (!testCase.failure) {
+        expect(object.attributes[NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+        await expectResponses.successCreated(es, spaceId, object.type, object.id);
+      }
     }
   };
-
-  const expectNotSpaceAwareRbacForbidden = createExpectRbacForbidden(notSpaceAwareType);
-
-  const expectNotSpaceAwareResults = async (resp: { [key: string]: any }) => {
-    expect(resp.body)
-      .to.have.property('id')
-      .match(/^[0-9a-f-]{36}$/);
-
-    // loose ISO8601 UTC time with milliseconds validation
-    expect(resp.body)
-      .to.have.property('updated_at')
-      .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-
-    expect(resp.body).to.eql({
-      id: resp.body.id,
-      type: notSpaceAwareType,
-      updated_at: resp.body.updated_at,
-      version: resp.body.version,
-      attributes: {
-        name: `Can't be contained to a space`,
-      },
-      references: [],
-    });
-
-    // query ES directory to ensure namespace wasn't specified
-    const { _source } = await es.get({
-      id: `${notSpaceAwareType}:${resp.body.id}`,
-      index: '.kibana',
-    });
-
-    const { namespace: actualNamespace } = _source;
-
-    expect(actualNamespace).to.eql(undefined);
+  const createTestDefinitions = (
+    testCases: CreateTestCase | CreateTestCase[],
+    forbidden: boolean,
+    overwrite: boolean,
+    options?: {
+      spaceId?: string;
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): CreateTestDefinition[] => {
+    let cases = Array.isArray(testCases) ? testCases : [testCases];
+    if (forbidden) {
+      // override the expected result in each test case
+      cases = cases.map(x => ({ ...x, failure: 403 }));
+    }
+    return cases.map(x => ({
+      title: getTestTitle(x),
+      responseStatusCode: x.failure ?? 200,
+      request: createRequest(x),
+      responseBody: options?.responseBodyOverride || expectResponseBody(x, options?.spaceId),
+      overwrite,
+    }));
   };
 
-  const expectSpaceAwareRbacForbidden = createExpectRbacForbidden(spaceAwareType);
-
-  const expectHiddenTypeRbacForbidden = createExpectRbacForbidden('hiddentype');
-
-  const makeCreateTest = (describeFn: DescribeFn) => (
+  const makeCreateTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: CreateTestDefinition
+    definition: CreateTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, tests } = definition;
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
+
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
-      it(`should return ${tests.spaceAware.statusCode} for a space-aware type`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/${spaceAwareType}`)
-          .auth(user.username, user.password)
-          .send({
-            attributes: {
-              title: 'My favorite vis',
-            },
-          })
-          .expect(tests.spaceAware.statusCode)
-          .then(tests.spaceAware.response);
-      });
-
-      it(`should return ${tests.notSpaceAware.statusCode} for a non space-aware type`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/${notSpaceAwareType}`)
-          .auth(user.username, user.password)
-          .send({
-            attributes: {
-              name: `Can't be contained to a space`,
-            },
-          })
-          .expect(tests.notSpaceAware.statusCode)
-          .then(tests.notSpaceAware.response);
-      });
-
-      it(`should return ${tests.hiddenType.statusCode} for the hiddentype`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/hiddentype`)
-          .auth(user.username, user.password)
-          .send({
-            attributes: {
-              name: `Can't be created via the Saved Objects API`,
-            },
-          })
-          .expect(tests.hiddenType.statusCode)
-          .then(tests.hiddenType.response);
-      });
 
-      if (tests.custom) {
-        it(tests.custom.description, async () => {
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const { type, id } = test.request;
+          const path = `${type}${id ? `/${id}` : ''}`;
+          const requestBody = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
+          const query = test.overwrite ? '?overwrite=true' : '';
           await supertest
-            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/${tests.custom!.type}`)
-            .auth(user.username, user.password)
-            .send(tests.custom!.requestBody)
-            .expect(tests.custom!.statusCode)
-            .then(tests.custom!.response);
+            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/${path}${query}`)
+            .auth(user?.username, user?.password)
+            .send(requestBody)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
       }
     });
   };
 
-  const createTest = makeCreateTest(describe);
+  const addTests = makeCreateTest(describe);
   // @ts-ignore
-  createTest.only = makeCreateTest(describe.only);
+  addTests.only = makeCreateTest(describe.only);
 
   return {
-    createExpectSpaceAwareResults,
-    createTest,
-    expectNotSpaceAwareRbacForbidden,
-    expectNotSpaceAwareResults,
-    expectSpaceAwareRbacForbidden,
-    expectBadRequestForHiddenType,
-    expectHiddenTypeRbacForbidden,
+    addTests,
+    createTestDefinitions,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/delete.ts b/x-pack/test/saved_object_api_integration/common/suites/delete.ts
index d96ae5446d732..2222aa0c97267 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/delete.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/delete.ts
@@ -4,147 +4,97 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
-
-interface DeleteTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
+import expect from '@kbn/expect/expect.js';
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+
+export interface DeleteTestDefinition extends TestDefinition {
+  request: { type: string; id: string };
 }
-
-interface DeleteTests {
-  spaceAware: DeleteTest;
-  notSpaceAware: DeleteTest;
-  hiddenType: DeleteTest;
-  invalidId: DeleteTest;
+export type DeleteTestSuite = TestSuite<DeleteTestDefinition>;
+export interface DeleteTestCase extends TestCase {
+  failure?: 403 | 404;
 }
 
-interface DeleteTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  otherSpaceId?: string;
-  tests: DeleteTests;
-}
+const DOES_NOT_EXIST = Object.freeze({ type: 'dashboard', id: 'does-not-exist' });
+export const TEST_CASES = Object.freeze({ ...CASES, DOES_NOT_EXIST });
 
 export function deleteTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectNotFound = (spaceId: string, type: string, id: string) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      statusCode: 404,
-      error: 'Not Found',
-      message: `Saved object [${type}/${getIdPrefix(spaceId)}${id}] not found`,
-    });
-  };
-
-  const createExpectRbacForbidden = (type: string) => (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to delete ${type}`,
-    });
-  };
-
-  const expectGenericNotFound = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 404,
-      error: 'Not Found',
-      message: `Not Found`,
-    });
-  };
-
-  const createExpectSpaceAwareNotFound = (spaceId: string = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    createExpectNotFound(spaceId, 'dashboard', 'be3733a0-9efe-11e7-acb3-3dab96693fab')(resp);
-  };
-
-  const createExpectUnknownDocNotFound = (spaceId: string = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    createExpectNotFound(spaceId, 'dashboard', `not-a-real-id`)(resp);
+  const expectForbidden = expectResponses.forbidden('delete');
+  const expectResponseBody = (testCase: DeleteTestCase): ExpectResponseBody => async (
+    response: Record<string, any>
+  ) => {
+    if (testCase.failure === 403) {
+      await expectForbidden(testCase.type)(response);
+    } else {
+      // permitted
+      const object = response.body;
+      if (testCase.failure) {
+        await expectResponses.permitted(object, testCase);
+      } else {
+        // the success response for `delete` is an empty object
+        expect(object).to.eql({});
+      }
+    }
   };
-
-  const expectEmpty = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({});
+  const createTestDefinitions = (
+    testCases: DeleteTestCase | DeleteTestCase[],
+    forbidden: boolean,
+    options?: {
+      spaceId?: string;
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): DeleteTestDefinition[] => {
+    let cases = Array.isArray(testCases) ? testCases : [testCases];
+    if (forbidden) {
+      // override the expected result in each test case
+      cases = cases.map(x => ({ ...x, failure: 403 }));
+    }
+    return cases.map(x => ({
+      title: getTestTitle(x),
+      responseStatusCode: x.failure ?? 200,
+      request: createRequest(x),
+      responseBody: options?.responseBodyOverride || expectResponseBody(x),
+    }));
   };
 
-  const expectRbacInvalidIdForbidden = createExpectRbacForbidden('dashboard');
-
-  const expectRbacNotSpaceAwareForbidden = createExpectRbacForbidden('globaltype');
-
-  const expectRbacSpaceAwareForbidden = createExpectRbacForbidden('dashboard');
-
-  const expectRbacHiddenTypeForbidden = createExpectRbacForbidden('hiddentype');
-
-  const makeDeleteTest = (describeFn: DescribeFn) => (
+  const makeDeleteTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: DeleteTestDefinition
+    definition: DeleteTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, otherSpaceId, tests } = definition;
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
 
-      it(`should return ${tests.spaceAware.statusCode} when deleting a space-aware doc`, async () =>
-        await supertest
-          .delete(
-            `${getUrlPrefix(spaceId)}/api/saved_objects/dashboard/${getIdPrefix(
-              otherSpaceId || spaceId
-            )}be3733a0-9efe-11e7-acb3-3dab96693fab`
-          )
-          .auth(user.username, user.password)
-          .expect(tests.spaceAware.statusCode)
-          .then(tests.spaceAware.response));
-
-      it(`should return ${tests.notSpaceAware.statusCode} when deleting a non-space-aware doc`, async () =>
-        await supertest
-          .delete(
-            `${getUrlPrefix(
-              spaceId
-            )}/api/saved_objects/globaltype/8121a00-8efd-21e7-1cb3-34ab966434445`
-          )
-          .auth(user.username, user.password)
-          .expect(tests.notSpaceAware.statusCode)
-          .then(tests.notSpaceAware.response));
-
-      it(`should return ${tests.hiddenType.statusCode} when deleting a hiddentype doc`, async () =>
-        await supertest
-          .delete(`${getUrlPrefix(spaceId)}/api/saved_objects/hiddentype/hiddentype_1`)
-          .auth(user.username, user.password)
-          .expect(tests.hiddenType.statusCode)
-          .then(tests.hiddenType.response));
-
-      it(`should return ${tests.invalidId.statusCode} when deleting an unknown doc`, async () =>
-        await supertest
-          .delete(
-            `${getUrlPrefix(spaceId)}/api/saved_objects/dashboard/${getIdPrefix(
-              otherSpaceId || spaceId
-            )}not-a-real-id`
-          )
-          .auth(user.username, user.password)
-          .expect(tests.invalidId.statusCode)
-          .then(tests.invalidId.response));
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const { type, id } = test.request;
+          await supertest
+            .delete(`${getUrlPrefix(spaceId)}/api/saved_objects/${type}/${id}`)
+            .auth(user?.username, user?.password)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
+        });
+      }
     });
   };
 
-  const deleteTest = makeDeleteTest(describe);
+  const addTests = makeDeleteTest(describe);
   // @ts-ignore
-  deleteTest.only = makeDeleteTest(describe.only);
+  addTests.only = makeDeleteTest(describe.only);
 
   return {
-    expectGenericNotFound,
-    createExpectSpaceAwareNotFound,
-    createExpectUnknownDocNotFound,
-    deleteTest,
-    expectEmpty,
-    expectRbacInvalidIdForbidden,
-    expectRbacNotSpaceAwareForbidden,
-    expectRbacSpaceAwareForbidden,
-    expectRbacHiddenTypeForbidden,
+    addTests,
+    createTestDefinitions,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/export.ts b/x-pack/test/saved_object_api_integration/common/suites/export.ts
index e6853096962ec..ddd43d42410ae 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/export.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/export.ts
@@ -5,164 +5,191 @@
  */
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import { expectResponses, getUrlPrefix } from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
 
-interface ExportTest {
-  statusCode: number;
-  description: string;
-  response: (resp: { [key: string]: any }) => void;
-}
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
 
-interface ExportTests {
-  spaceAwareType: ExportTest;
-  hiddenType: ExportTest;
-  noTypeOrObjects: ExportTest;
+export interface ExportTestDefinition extends TestDefinition {
+  request: ReturnType<typeof createRequest>;
 }
-
-interface ExportTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  tests: ExportTests;
+export type ExportTestSuite = TestSuite<ExportTestDefinition>;
+export interface ExportTestCase {
+  title: string;
+  type: string;
+  id?: string;
+  successResult?: TestCase | TestCase[];
+  failure?: 400 | 403;
 }
 
+export const getTestCases = (spaceId?: string) => ({
+  singleNamespaceObject: {
+    title: 'single-namespace object',
+    ...(spaceId === SPACE_1_ID
+      ? CASES.SINGLE_NAMESPACE_SPACE_1
+      : spaceId === SPACE_2_ID
+      ? CASES.SINGLE_NAMESPACE_SPACE_2
+      : CASES.SINGLE_NAMESPACE_DEFAULT_SPACE),
+  } as ExportTestCase,
+  singleNamespaceType: {
+    // this test explicitly ensures that single-namespace objects from other spaces are not returned
+    title: 'single-namespace type',
+    type: 'isolatedtype',
+    successResult:
+      spaceId === SPACE_1_ID
+        ? CASES.SINGLE_NAMESPACE_SPACE_1
+        : spaceId === SPACE_2_ID
+        ? CASES.SINGLE_NAMESPACE_SPACE_2
+        : CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+  } as ExportTestCase,
+  multiNamespaceObject: {
+    title: 'multi-namespace object',
+    ...(spaceId === SPACE_1_ID
+      ? CASES.MULTI_NAMESPACE_ONLY_SPACE_1
+      : spaceId === SPACE_2_ID
+      ? CASES.MULTI_NAMESPACE_ONLY_SPACE_2
+      : CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1),
+    failure: 400, // multi-namespace types cannot be exported yet
+  } as ExportTestCase,
+  multiNamespaceType: {
+    title: 'multi-namespace type',
+    type: 'sharedtype',
+    // successResult:
+    //   spaceId === SPACE_1_ID
+    //     ? [CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, CASES.MULTI_NAMESPACE_ONLY_SPACE_1]
+    //     : spaceId === SPACE_2_ID
+    //     ? CASES.MULTI_NAMESPACE_ONLY_SPACE_2
+    //     : CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    failure: 400, // multi-namespace types cannot be exported yet
+  } as ExportTestCase,
+  namespaceAgnosticObject: {
+    title: 'namespace-agnostic object',
+    ...CASES.NAMESPACE_AGNOSTIC,
+  } as ExportTestCase,
+  namespaceAgnosticType: {
+    title: 'namespace-agnostic type',
+    type: 'globaltype',
+    successResult: CASES.NAMESPACE_AGNOSTIC,
+  } as ExportTestCase,
+  hiddenObject: { title: 'hidden object', ...CASES.HIDDEN, failure: 400 } as ExportTestCase,
+  hiddenType: { title: 'hidden type', type: 'hiddentype', failure: 400 } as ExportTestCase,
+});
+export const createRequest = ({ type, id }: ExportTestCase) =>
+  id ? { objects: [{ type, id }] } : { type };
+const getTestTitle = ({ failure, title }: ExportTestCase) => {
+  let description = 'success';
+  if (failure === 400) {
+    description = 'bad request';
+  } else if (failure === 403) {
+    description = 'forbidden';
+  }
+  return `${description} ["${title}"]`;
+};
+
 export function exportTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectRbacForbidden = (type: string) => (resp: { [key: string]: any }) => {
-    // In export only, the API uses "bulk_get" or "find" depending on the parameters it receives.
-    // The best that could be done here is to have an if statement to ensure at least one of the
-    // two errors has been thrown.
-    if (resp.body.message.indexOf(`bulk_get`) !== -1) {
-      expect(resp.body).to.eql({
-        statusCode: 403,
-        error: 'Forbidden',
-        message: `Unable to bulk_get ${type}`,
+  const expectForbiddenBulkGet = expectResponses.forbidden('bulk_get');
+  const expectForbiddenFind = expectResponses.forbidden('find');
+  const expectResponseBody = (testCase: ExportTestCase): ExpectResponseBody => async (
+    response: Record<string, any>
+  ) => {
+    const { type, id, successResult = { type, id }, failure } = testCase;
+    if (failure === 403) {
+      // In export only, the API uses "bulk_get" or "find" depending on the parameters it receives.
+      // The best that could be done here is to have an if statement to ensure at least one of the
+      // two errors has been thrown.
+      if (id) {
+        await expectForbiddenBulkGet(type)(response);
+      } else {
+        await expectForbiddenFind(type)(response);
+      }
+    } else if (failure === 400) {
+      // 400
+      expect(response.body.error).to.eql('Bad Request');
+      expect(response.body.statusCode).to.eql(failure);
+      if (id) {
+        expect(response.body.message).to.eql(
+          `Trying to export object(s) with non-exportable types: ${type}:${id}`
+        );
+      } else {
+        expect(response.body.message).to.eql(`Trying to export non-exportable type(s): ${type}`);
+      }
+    } else {
+      // 2xx
+      expect(response.body).not.to.have.property('error');
+      const ndjson = response.text.split('\n');
+      const savedObjectsArray = Array.isArray(successResult) ? successResult : [successResult];
+      expect(ndjson.length).to.eql(savedObjectsArray.length + 1);
+      for (let i = 0; i < savedObjectsArray.length; i++) {
+        const object = JSON.parse(ndjson[i]);
+        const { type: expectedType, id: expectedId } = savedObjectsArray[i];
+        expect(object.type).to.eql(expectedType);
+        expect(object.id).to.eql(expectedId);
+        expect(object.updated_at).to.match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+        // don't test attributes, version, or references
+      }
+      const exportDetails = JSON.parse(ndjson[ndjson.length - 1]);
+      expect(exportDetails).to.eql({
+        exportedCount: ndjson.length - 1,
+        missingRefCount: 0,
+        missingReferences: [],
       });
-      return;
     }
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to find ${type}`,
-    });
   };
-
-  const expectTypeOrObjectsRequired = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 400,
-      error: 'Bad Request',
-      message: '[request body]: expected a plain object value, but found [null] instead.',
-    });
-  };
-
-  const expectInvalidTypeSpecified = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 400,
-      error: 'Bad Request',
-      message: `Trying to export object(s) with non-exportable types: hiddentype:hiddentype_1`,
-    });
-  };
-
-  const createExpectVisualizationResults = (spaceId = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    const response = JSON.parse(resp.text);
-    expect(response).to.eql({
-      type: 'visualization',
-      id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-      version: response.version,
-      attributes: response.attributes,
-      references: [
-        {
-          name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-          type: 'index-pattern',
-          id: `${getIdPrefix(spaceId)}91200a00-9efd-11e7-acb3-3dab96693fab`,
-        },
-      ],
-      migrationVersion: response.migrationVersion,
-      updated_at: '2017-09-21T18:51:23.794Z',
-    });
+  const createTestDefinitions = (
+    testCases: ExportTestCase | ExportTestCase[],
+    forbidden: boolean,
+    options?: {
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): ExportTestDefinition[] => {
+    let cases = Array.isArray(testCases) ? testCases : [testCases];
+    if (forbidden) {
+      // override the expected result in each test case
+      cases = cases.map(x => ({ ...x, failure: 403 }));
+    }
+    return cases.map(x => ({
+      title: getTestTitle(x),
+      responseStatusCode: x.failure ?? 200,
+      request: createRequest(x),
+      responseBody: options?.responseBodyOverride || expectResponseBody(x),
+    }));
   };
 
-  const makeExportTest = (describeFn: DescribeFn) => (
+  const makeExportTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: ExportTestDefinition
+    definition: ExportTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, tests } = definition;
+    const { user, spaceId = DEFAULT_SPACE_ID, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
 
-      it(`space aware type should return ${tests.spaceAwareType.statusCode} with ${tests.spaceAwareType.description} when querying by type`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_export`)
-          .send({
-            type: 'visualization',
-            excludeExportDetails: true,
-          })
-          .auth(user.username, user.password)
-          .expect(tests.spaceAwareType.statusCode)
-          .then(tests.spaceAwareType.response);
-      });
-
-      it(`space aware type should return ${tests.spaceAwareType.statusCode} with ${tests.spaceAwareType.description} when querying by objects`, async () => {
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_export`)
-          .send({
-            objects: [
-              {
-                type: 'visualization',
-                id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-              },
-            ],
-            excludeExportDetails: true,
-          })
-          .auth(user.username, user.password)
-          .expect(tests.spaceAwareType.statusCode)
-          .then(tests.spaceAwareType.response);
-      });
-
-      describe('hidden type', () => {
-        it(`should return ${tests.hiddenType.statusCode} with ${tests.hiddenType.description}`, async () => {
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
           await supertest
             .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_export`)
-            .send({
-              objects: [
-                {
-                  type: 'hiddentype',
-                  id: `hiddentype_1`,
-                },
-              ],
-              excludeExportDetails: true,
-            })
-            .auth(user.username, user.password)
-            .expect(tests.hiddenType.statusCode)
-            .then(tests.hiddenType.response);
+            .auth(user?.username, user?.password)
+            .send(test.request)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
-      });
-
-      describe('no type or objects', () => {
-        it(`should return ${tests.noTypeOrObjects.statusCode} with ${tests.noTypeOrObjects.description}`, async () => {
-          await supertest
-            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_export`)
-            .auth(user.username, user.password)
-            .expect(tests.noTypeOrObjects.statusCode)
-            .then(tests.noTypeOrObjects.response);
-        });
-      });
+      }
     });
   };
 
-  const exportTest = makeExportTest(describe);
+  const addTests = makeExportTest(describe);
   // @ts-ignore
-  exportTest.only = makeExportTest(describe.only);
+  addTests.only = makeExportTest(describe.only);
 
   return {
-    createExpectRbacForbidden,
-    expectTypeOrObjectsRequired,
-    expectInvalidTypeSpecified,
-    createExpectVisualizationResults,
-    exportTest,
+    addTests,
+    createTestDefinitions,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/find.ts b/x-pack/test/saved_object_api_integration/common/suites/find.ts
index 5479960634ccb..75d6653365fdf 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/find.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/find.ts
@@ -3,271 +3,190 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
-
-interface FindTest {
-  statusCode: number;
-  description: string;
-  response: (resp: { [key: string]: any }) => void;
+import querystring from 'querystring';
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import { expectResponses, getUrlPrefix } from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+
+export interface FindTestDefinition extends TestDefinition {
+  request: { query: string };
 }
-
-interface FindTests {
-  spaceAwareType: FindTest;
-  notSpaceAwareType: FindTest;
-  unknownType: FindTest;
-  pageBeyondTotal: FindTest;
-  unknownSearchField: FindTest;
-  hiddenType: FindTest;
-  noType: FindTest;
-  filterWithNotSpaceAwareType: FindTest;
-  filterWithHiddenType: FindTest;
-  filterWithUnknownType: FindTest;
-  filterWithNoType: FindTest;
-  filterWithUnAllowedType: FindTest;
+export type FindTestSuite = TestSuite<FindTestDefinition>;
+export interface FindTestCase {
+  title: string;
+  query: string;
+  successResult?: {
+    savedObjects?: TestCase | TestCase[];
+    page?: number;
+    perPage?: number;
+    total?: number;
+  };
+  failure?: 400 | 403;
 }
 
-interface FindTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  tests: FindTests;
-}
+export const getTestCases = (spaceId?: string) => ({
+  singleNamespaceType: {
+    title: 'find single-namespace type',
+    query: 'type=isolatedtype&fields=title',
+    successResult: {
+      savedObjects:
+        spaceId === SPACE_1_ID
+          ? CASES.SINGLE_NAMESPACE_SPACE_1
+          : spaceId === SPACE_2_ID
+          ? CASES.SINGLE_NAMESPACE_SPACE_2
+          : CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    },
+  } as FindTestCase,
+  multiNamespaceType: {
+    title: 'find multi-namespace type',
+    query: 'type=sharedtype&fields=title',
+    successResult: {
+      savedObjects:
+        spaceId === SPACE_1_ID
+          ? [CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, CASES.MULTI_NAMESPACE_ONLY_SPACE_1]
+          : spaceId === SPACE_2_ID
+          ? CASES.MULTI_NAMESPACE_ONLY_SPACE_2
+          : CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    },
+  } as FindTestCase,
+  namespaceAgnosticType: {
+    title: 'find namespace-agnostic type',
+    query: 'type=globaltype&fields=title',
+    successResult: { savedObjects: CASES.NAMESPACE_AGNOSTIC },
+  } as FindTestCase,
+  hiddenType: { title: 'find hidden type', query: 'type=hiddentype&fields=name' } as FindTestCase,
+  unknownType: { title: 'find unknown type', query: 'type=wigwags' } as FindTestCase,
+  pageBeyondTotal: {
+    title: 'find page beyond total',
+    query: 'type=isolatedtype&page=100&per_page=100',
+    successResult: { page: 100, perPage: 100, total: 1, savedObjects: [] },
+  } as FindTestCase,
+  unknownSearchField: {
+    title: 'find unknown search field',
+    query: 'type=url&search_fields=a',
+  } as FindTestCase,
+  filterWithNamespaceAgnosticType: {
+    title: 'filter with namespace-agnostic type',
+    query: 'type=globaltype&filter=globaltype.attributes.title:*global*',
+    successResult: { savedObjects: CASES.NAMESPACE_AGNOSTIC },
+  } as FindTestCase,
+  filterWithHiddenType: {
+    title: 'filter with hidden type',
+    query: `type=hiddentype&fields=name&filter=hiddentype.attributes.title:'hello'`,
+  } as FindTestCase,
+  filterWithUnknownType: {
+    title: 'filter with unknown type',
+    query: `type=wigwags&filter=wigwags.attributes.title:'unknown'`,
+  } as FindTestCase,
+  filterWithDisallowedType: {
+    title: 'filter with disallowed type',
+    query: `type=globaltype&filter=dashboard.title:'Requests'`,
+    failure: 400,
+  } as FindTestCase,
+});
+export const createRequest = ({ query }: FindTestCase) => ({ query });
+const getTestTitle = ({ failure, title }: FindTestCase) => {
+  let description = 'success';
+  if (failure === 400) {
+    description = 'bad request';
+  } else if (failure === 403) {
+    description = 'forbidden';
+  }
+  return `${description} ["${title}"]`;
+};
 
 export function findTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectEmpty = (page: number, perPage: number, total: number) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      page,
-      per_page: perPage,
-      total,
-      saved_objects: [],
-    });
-  };
-
-  const createExpectRbacForbidden = (type?: string) => (resp: { [key: string]: any }) => {
-    const message = type ? `Unable to find ${type}` : `Not authorized to find saved_object`;
-
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message,
-    });
-  };
-
-  const expectNotSpaceAwareResults = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      page: 1,
-      per_page: 20,
-      total: 1,
-      saved_objects: [
-        {
-          type: 'globaltype',
-          id: `8121a00-8efd-21e7-1cb3-34ab966434445`,
-          version: resp.body.saved_objects[0].version,
-          attributes: {
-            name: 'My favorite global object',
-          },
-          references: [],
-          updated_at: '2017-09-21T18:59:16.270Z',
-        },
-      ],
-    });
-  };
-
-  const expectFilterWrongTypeError = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      error: 'Bad Request',
-      message: 'This type dashboard is not allowed: Bad Request',
-      statusCode: 400,
-    });
-  };
-
-  const expectTypeRequired = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      error: 'Bad Request',
-      message: '[request query.type]: expected at least one defined value but got [undefined]',
-      statusCode: 400,
-    });
+  const expectForbidden = expectResponses.forbidden('find');
+  const expectResponseBody = (testCase: FindTestCase): ExpectResponseBody => async (
+    response: Record<string, any>
+  ) => {
+    const { failure, successResult = {}, query } = testCase;
+    const parsedQuery = querystring.parse(query);
+    if (failure === 403) {
+      const type = parsedQuery.type;
+      await expectForbidden(type)(response);
+    } else if (failure === 400) {
+      const type = (parsedQuery.filter as string).split('.')[0];
+      expect(response.body.error).to.eql('Bad Request');
+      expect(response.body.statusCode).to.eql(failure);
+      expect(response.body.message).to.eql(`This type ${type} is not allowed: Bad Request`);
+    } else {
+      // 2xx
+      expect(response.body).not.to.have.property('error');
+      const { page = 1, perPage = 20, total, savedObjects = [] } = successResult;
+      const savedObjectsArray = Array.isArray(savedObjects) ? savedObjects : [savedObjects];
+      expect(response.body.page).to.eql(page);
+      expect(response.body.per_page).to.eql(perPage);
+      expect(response.body.total).to.eql(total || savedObjectsArray.length);
+      for (let i = 0; i < savedObjectsArray.length; i++) {
+        const object = response.body.saved_objects[i];
+        const { type: expectedType, id: expectedId } = savedObjectsArray[i];
+        expect(object.type).to.eql(expectedType);
+        expect(object.id).to.eql(expectedId);
+        expect(object.updated_at).to.match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+        // don't test attributes, version, or references
+      }
+    }
   };
-
-  const createExpectVisualizationResults = (spaceId = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      page: 1,
-      per_page: 20,
-      total: 1,
-      saved_objects: [
-        {
-          type: 'visualization',
-          id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-          version: resp.body.saved_objects[0].version,
-          attributes: {
-            title: 'Count of requests',
-          },
-          migrationVersion: resp.body.saved_objects[0].migrationVersion,
-          references: [
-            {
-              id: `${getIdPrefix(spaceId)}91200a00-9efd-11e7-acb3-3dab96693fab`,
-              name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-              type: 'index-pattern',
-            },
-          ],
-          updated_at: '2017-09-21T18:51:23.794Z',
-        },
-      ],
-    });
+  const createTestDefinitions = (
+    testCases: FindTestCase | FindTestCase[],
+    forbidden: boolean,
+    options?: {
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): FindTestDefinition[] => {
+    let cases = Array.isArray(testCases) ? testCases : [testCases];
+    if (forbidden) {
+      // override the expected result in each test case
+      cases = cases.map(x => ({ ...x, failure: 403 }));
+    }
+    return cases.map(x => ({
+      title: getTestTitle(x),
+      responseStatusCode: x.failure ?? 200,
+      request: createRequest(x),
+      responseBody: options?.responseBodyOverride || expectResponseBody(x),
+    }));
   };
 
-  const makeFindTest = (describeFn: DescribeFn) => (
+  const makeFindTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: FindTestDefinition
+    definition: FindTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, tests } = definition;
+    const { user, spaceId = DEFAULT_SPACE_ID, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
 
-      it(`space aware type should return ${tests.spaceAwareType.statusCode} with ${tests.spaceAwareType.description}`, async () =>
-        await supertest
-          .get(`${getUrlPrefix(spaceId)}/api/saved_objects/_find?type=visualization&fields=title`)
-          .auth(user.username, user.password)
-          .expect(tests.spaceAwareType.statusCode)
-          .then(tests.spaceAwareType.response));
-
-      it(`not space aware type should return ${tests.notSpaceAwareType.statusCode} with ${tests.notSpaceAwareType.description}`, async () =>
-        await supertest
-          .get(`${getUrlPrefix(spaceId)}/api/saved_objects/_find?type=globaltype&fields=name`)
-          .auth(user.username, user.password)
-          .expect(tests.notSpaceAwareType.statusCode)
-          .then(tests.notSpaceAwareType.response));
-
-      it(`finding a hiddentype should return ${tests.hiddenType.statusCode} with ${tests.hiddenType.description}`, async () =>
-        await supertest
-          .get(`${getUrlPrefix(spaceId)}/api/saved_objects/_find?type=hiddentype&fields=name`)
-          .auth(user.username, user.password)
-          .expect(tests.hiddenType.statusCode)
-          .then(tests.hiddenType.response));
-
-      describe('unknown type', () => {
-        it(`should return ${tests.unknownType.statusCode} with ${tests.unknownType.description}`, async () =>
-          await supertest
-            .get(`${getUrlPrefix(spaceId)}/api/saved_objects/_find?type=wigwags`)
-            .auth(user.username, user.password)
-            .expect(tests.unknownType.statusCode)
-            .then(tests.unknownType.response));
-      });
-
-      describe('page beyond total', () => {
-        it(`should return ${tests.pageBeyondTotal.statusCode} with ${tests.pageBeyondTotal.description}`, async () =>
-          await supertest
-            .get(
-              `${getUrlPrefix(
-                spaceId
-              )}/api/saved_objects/_find?type=visualization&page=100&per_page=100`
-            )
-            .auth(user.username, user.password)
-            .expect(tests.pageBeyondTotal.statusCode)
-            .then(tests.pageBeyondTotal.response));
-      });
-
-      describe('unknown search field', () => {
-        it(`should return ${tests.unknownSearchField.statusCode} with ${tests.unknownSearchField.description}`, async () =>
-          await supertest
-            .get(`${getUrlPrefix(spaceId)}/api/saved_objects/_find?type=url&search_fields=a`)
-            .auth(user.username, user.password)
-            .expect(tests.unknownSearchField.statusCode)
-            .then(tests.unknownSearchField.response));
-      });
-
-      describe('no type', () => {
-        it(`should return ${tests.noType.statusCode} with ${tests.noType.description}`, async () =>
-          await supertest
-            .get(`${getUrlPrefix(spaceId)}/api/saved_objects/_find`)
-            .auth(user.username, user.password)
-            .expect(tests.noType.statusCode)
-            .then(tests.noType.response));
-      });
-
-      describe('filter', () => {
-        it(`by wrong type should return ${tests.filterWithUnAllowedType.statusCode} with ${tests.filterWithUnAllowedType.description}`, async () =>
-          await supertest
-            .get(
-              `${getUrlPrefix(
-                spaceId
-              )}/api/saved_objects/_find?type=globaltype&filter=dashboard.title:'Requests'`
-            )
-            .auth(user.username, user.password)
-            .expect(tests.filterWithUnAllowedType.statusCode)
-            .then(tests.filterWithUnAllowedType.response));
-
-        it(`not space aware type should return ${tests.filterWithNotSpaceAwareType.statusCode} with ${tests.filterWithNotSpaceAwareType.description}`, async () =>
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const query = test.request.query ? `?${test.request.query}` : '';
           await supertest
-            .get(
-              `${getUrlPrefix(
-                spaceId
-              )}/api/saved_objects/_find?type=globaltype&filter=globaltype.attributes.name:*global*`
-            )
-            .auth(user.username, user.password)
-            .expect(tests.filterWithNotSpaceAwareType.statusCode)
-            .then(tests.filterWithNotSpaceAwareType.response));
-
-        it(`finding a hiddentype should return ${tests.filterWithHiddenType.statusCode} with ${tests.filterWithHiddenType.description}`, async () =>
-          await supertest
-            .get(
-              `${getUrlPrefix(
-                spaceId
-              )}/api/saved_objects/_find?type=hiddentype&fields=name&filter=hiddentype.attributes.name:'hello'`
-            )
-            .auth(user.username, user.password)
-            .expect(tests.filterWithHiddenType.statusCode)
-            .then(tests.filterWithHiddenType.response));
-
-        describe('unknown type', () => {
-          it(`should return ${tests.filterWithUnknownType.statusCode} with ${tests.filterWithUnknownType.description}`, async () =>
-            await supertest
-              .get(
-                `${getUrlPrefix(
-                  spaceId
-                )}/api/saved_objects/_find?type=wigwags&filter=wigwags.attributes.title:'unknown'`
-              )
-              .auth(user.username, user.password)
-              .expect(tests.filterWithUnknownType.statusCode)
-              .then(tests.filterWithUnknownType.response));
-        });
-
-        describe('no type', () => {
-          it(`should return ${tests.filterWithNoType.statusCode} with ${tests.filterWithNoType.description}`, async () =>
-            await supertest
-              .get(
-                `${getUrlPrefix(
-                  spaceId
-                )}/api/saved_objects/_find?filter=global.attributes.name:*global*`
-              )
-              .auth(user.username, user.password)
-              .expect(tests.filterWithNoType.statusCode)
-              .then(tests.filterWithNoType.response));
+            .get(`${getUrlPrefix(spaceId)}/api/saved_objects/_find${query}`)
+            .auth(user?.username, user?.password)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
-      });
+      }
     });
   };
 
-  const findTest = makeFindTest(describe);
+  const addTests = makeFindTest(describe);
   // @ts-ignore
-  findTest.only = makeFindTest(describe.only);
+  addTests.only = makeFindTest(describe.only);
 
   return {
-    createExpectEmpty,
-    createExpectRbacForbidden,
-    createExpectVisualizationResults,
-    expectFilterWrongTypeError,
-    expectNotSpaceAwareResults,
-    expectTypeRequired,
-    findTest,
+    addTests,
+    createTestDefinitions,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/get.ts b/x-pack/test/saved_object_api_integration/common/suites/get.ts
index c98209ca1e105..d8fa4d91276d7 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/get.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/get.ts
@@ -3,193 +3,89 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
-
-interface GetTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
-}
-
-interface GetTests {
-  spaceAware: GetTest;
-  notSpaceAware: GetTest;
-  hiddenType: GetTest;
-  doesntExist: GetTest;
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+
+export interface GetTestDefinition extends TestDefinition {
+  request: { type: string; id: string };
 }
+export type GetTestSuite = TestSuite<GetTestDefinition>;
+export type GetTestCase = TestCase;
 
-interface GetTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  otherSpaceId?: string;
-  tests: GetTests;
-}
-
-const spaceAwareId = 'dd7caf20-9efd-11e7-acb3-3dab96693fab';
-const notSpaceAwareId = '8121a00-8efd-21e7-1cb3-34ab966434445';
-const doesntExistId = 'foobar';
+const DOES_NOT_EXIST = Object.freeze({ type: 'dashboard', id: 'does-not-exist' });
+export const TEST_CASES = Object.freeze({ ...CASES, DOES_NOT_EXIST });
 
 export function getTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectDoesntExistNotFound = (spaceId = DEFAULT_SPACE_ID) => {
-    return createExpectNotFound('visualization', doesntExistId, spaceId);
-  };
-
-  const createExpectNotFound = (type: string, id: string, spaceId = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      error: 'Not Found',
-      message: `Saved object [${type}/${getIdPrefix(spaceId)}${id}] not found`,
-      statusCode: 404,
-    });
-  };
-
-  const expectHiddenTypeNotFound = createExpectNotFound(
-    'hiddentype',
-    'hiddentype_1',
-    DEFAULT_SPACE_ID
-  );
-
-  const createExpectNotSpaceAwareRbacForbidden = () => (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      error: 'Forbidden',
-      message: `Unable to get globaltype`,
-      statusCode: 403,
-    });
-  };
-
-  const createExpectNotSpaceAwareResults = (spaceId = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      id: `${notSpaceAwareId}`,
-      type: 'globaltype',
-      updated_at: '2017-09-21T18:59:16.270Z',
-      version: resp.body.version,
-      attributes: {
-        name: 'My favorite global object',
-      },
-      references: [],
-    });
-  };
-
-  const createExpectRbacForbidden = (type: string) => (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      error: 'Forbidden',
-      message: `Unable to get ${type}`,
-      statusCode: 403,
-    });
+  const expectForbidden = expectResponses.forbidden('get');
+  const expectResponseBody = (testCase: GetTestCase): ExpectResponseBody => async (
+    response: Record<string, any>
+  ) => {
+    if (testCase.failure === 403) {
+      await expectForbidden(testCase.type)(response);
+    } else {
+      // permitted
+      const object = response.body;
+      await expectResponses.permitted(object, testCase);
+    }
   };
-
-  const createExpectSpaceAwareNotFound = (spaceId = DEFAULT_SPACE_ID) => {
-    return createExpectNotFound('visualization', spaceAwareId, spaceId);
+  const createTestDefinitions = (
+    testCases: GetTestCase | GetTestCase[],
+    forbidden: boolean,
+    options?: {
+      spaceId?: string;
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): GetTestDefinition[] => {
+    let cases = Array.isArray(testCases) ? testCases : [testCases];
+    if (forbidden) {
+      // override the expected result in each test case
+      cases = cases.map(x => ({ ...x, failure: 403 }));
+    }
+    return cases.map(x => ({
+      title: getTestTitle(x),
+      responseStatusCode: x.failure ?? 200,
+      request: createRequest(x),
+      responseBody: options?.responseBodyOverride || expectResponseBody(x),
+    }));
   };
 
-  const expectSpaceAwareRbacForbidden = createExpectRbacForbidden('visualization');
-  const expectNotSpaceAwareRbacForbidden = createExpectRbacForbidden('globaltype');
-  const expectHiddenTypeRbacForbidden = createExpectRbacForbidden('hiddentype');
-  const expectDoesntExistRbacForbidden = createExpectRbacForbidden('visualization');
-
-  const createExpectSpaceAwareResults = (spaceId = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
-      type: 'visualization',
-      migrationVersion: resp.body.migrationVersion,
-      updated_at: '2017-09-21T18:51:23.794Z',
-      version: resp.body.version,
-      attributes: {
-        title: 'Count of requests',
-        description: '',
-        version: 1,
-        // cheat for some of the more complex attributes
-        visState: resp.body.attributes.visState,
-        uiStateJSON: resp.body.attributes.uiStateJSON,
-        kibanaSavedObjectMeta: resp.body.attributes.kibanaSavedObjectMeta,
-      },
-      references: [
-        {
-          name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-          type: 'index-pattern',
-          id: `${getIdPrefix(spaceId)}91200a00-9efd-11e7-acb3-3dab96693fab`,
-        },
-      ],
-    });
-  };
-
-  const makeGetTest = (describeFn: DescribeFn) => (
+  const makeGetTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: GetTestDefinition
+    definition: GetTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, otherSpaceId, tests } = definition;
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
 
-      it(`should return ${tests.spaceAware.statusCode} when getting a space aware doc`, async () => {
-        await supertest
-          .get(
-            `${getUrlPrefix(spaceId)}/api/saved_objects/visualization/${getIdPrefix(
-              otherSpaceId || spaceId
-            )}${spaceAwareId}`
-          )
-          .auth(user.username, user.password)
-          .expect(tests.spaceAware.statusCode)
-          .then(tests.spaceAware.response);
-      });
-
-      it(`should return ${tests.notSpaceAware.statusCode} when getting a non-space-aware doc`, async () => {
-        await supertest
-          .get(`${getUrlPrefix(spaceId)}/api/saved_objects/globaltype/${notSpaceAwareId}`)
-          .auth(user.username, user.password)
-          .expect(tests.notSpaceAware.statusCode)
-          .then(tests.notSpaceAware.response);
-      });
-
-      it(`should return ${tests.hiddenType.statusCode} when getting a hiddentype doc`, async () => {
-        await supertest
-          .get(`${getUrlPrefix(spaceId)}/api/saved_objects/hiddentype/hiddentype_1`)
-          .auth(user.username, user.password)
-          .expect(tests.hiddenType.statusCode)
-          .then(tests.hiddenType.response);
-      });
-
-      describe('document does not exist', () => {
-        it(`should return ${tests.doesntExist.statusCode}`, async () => {
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const { type, id } = test.request;
           await supertest
-            .get(
-              `${getUrlPrefix(spaceId)}/api/saved_objects/visualization/${getIdPrefix(
-                otherSpaceId || spaceId
-              )}${doesntExistId}`
-            )
-            .auth(user.username, user.password)
-            .expect(tests.doesntExist.statusCode)
-            .then(tests.doesntExist.response);
+            .get(`${getUrlPrefix(spaceId)}/api/saved_objects/${type}/${id}`)
+            .auth(user?.username, user?.password)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
-      });
+      }
     });
   };
 
-  const getTest = makeGetTest(describe);
+  const addTests = makeGetTest(describe);
   // @ts-ignore
-  getTest.only = makeGetTest(describe.only);
+  addTests.only = makeGetTest(describe.only);
 
   return {
-    createExpectDoesntExistNotFound,
-    createExpectNotSpaceAwareRbacForbidden,
-    createExpectNotSpaceAwareResults,
-    createExpectSpaceAwareNotFound,
-    createExpectSpaceAwareResults,
-    expectHiddenTypeNotFound,
-    expectSpaceAwareRbacForbidden,
-    expectNotSpaceAwareRbacForbidden,
-    expectDoesntExistRbacForbidden,
-    expectHiddenTypeRbacForbidden,
-    getTest,
+    addTests,
+    createTestDefinitions,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/import.ts b/x-pack/test/saved_object_api_integration/common/suites/import.ts
index f6723c912f82e..2f631221c6955 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/import.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/import.ts
@@ -6,195 +6,152 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
-
-interface ImportTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+
+export interface ImportTestDefinition extends TestDefinition {
+  request: Array<{ type: string; id: string }>;
 }
-
-interface ImportTests {
-  default: ImportTest;
-  hiddenType: ImportTest;
-  unknownType: ImportTest;
+export type ImportTestSuite = TestSuite<ImportTestDefinition>;
+export interface ImportTestCase extends TestCase {
+  failure?: 400 | 409; // only used for permitted response case
 }
 
-interface ImportTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  tests: ImportTests;
-}
+const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
+const NEW_ATTRIBUTE_VAL = `New attribute value ${Date.now()}`;
 
-const createImportData = (spaceId: string) => [
-  {
-    type: 'dashboard',
-    id: `${getIdPrefix(spaceId)}a01b2f57-fcfd-4864-b735-09e28f0d815e`,
-    attributes: {
-      title: 'A great new dashboard',
-    },
-  },
-  {
-    type: 'globaltype',
-    id: '05976c65-1145-4858-bbf0-d225cc78a06e',
-    attributes: {
-      name: 'A new globaltype object',
-    },
-  },
-];
+const NEW_SINGLE_NAMESPACE_OBJ = Object.freeze({ type: 'dashboard', id: 'new-dashboard-id' });
+const NEW_MULTI_NAMESPACE_OBJ = Object.freeze({ type: 'sharedtype', id: 'new-sharedtype-id' });
+const NEW_NAMESPACE_AGNOSTIC_OBJ = Object.freeze({ type: 'globaltype', id: 'new-globaltype-id' });
+export const TEST_CASES = Object.freeze({
+  ...CASES,
+  NEW_SINGLE_NAMESPACE_OBJ,
+  NEW_MULTI_NAMESPACE_OBJ,
+  NEW_NAMESPACE_AGNOSTIC_OBJ,
+});
 
 export function importTestSuiteFactory(es: any, esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectResults = (spaceId = DEFAULT_SPACE_ID) => async (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      success: true,
-      successCount: 2,
-    });
-  };
-
-  const expectResultsWithUnsupportedHiddenType = async (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      success: false,
-      successCount: 2,
-      errors: [
-        {
-          error: {
-            type: 'unsupported_type',
-          },
-          id: '1',
-          type: 'hiddentype',
-        },
-      ],
-    });
+  const expectForbidden = expectResponses.forbidden('bulk_create');
+  const expectResponseBody = (
+    testCases: ImportTestCase | ImportTestCase[],
+    statusCode: 200 | 403,
+    spaceId = SPACES.DEFAULT.spaceId
+  ): ExpectResponseBody => async (response: Record<string, any>) => {
+    const testCaseArray = Array.isArray(testCases) ? testCases : [testCases];
+    if (statusCode === 403) {
+      const types = testCaseArray.map(x => x.type);
+      await expectForbidden(types)(response);
+    } else {
+      // permitted
+      const { success, successCount, errors } = response.body;
+      const expectedSuccesses = testCaseArray.filter(x => !x.failure);
+      const expectedFailures = testCaseArray.filter(x => x.failure);
+      expect(success).to.eql(expectedFailures.length === 0);
+      expect(successCount).to.eql(expectedSuccesses.length);
+      if (expectedFailures.length) {
+        expect(errors).to.have.length(expectedFailures.length);
+      } else {
+        expect(response.body).not.to.have.property('errors');
+      }
+      for (let i = 0; i < expectedSuccesses.length; i++) {
+        const { type, id } = expectedSuccesses[i];
+        const { _source } = await expectResponses.successCreated(es, spaceId, type, id);
+        expect(_source[type][NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+      }
+      for (let i = 0; i < expectedFailures.length; i++) {
+        const { type, id, failure } = expectedFailures[i];
+        // we don't know the order of the returned errors; search for each one
+        const object = (errors as Array<Record<string, unknown>>).find(
+          x => x.type === type && x.id === id
+        );
+        expect(object).not.to.be(undefined);
+        if (failure === 400) {
+          expect(object!.error).to.eql({ type: 'unsupported_type' });
+        } else {
+          // 409
+          expect(object!.error).to.eql({ type: 'conflict' });
+        }
+      }
+    }
   };
-
-  const expectUnknownTypeUnsupported = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      success: false,
-      successCount: 2,
-      errors: [
-        {
-          id: '1',
-          type: 'wigwags',
-          title: 'Wigwags title',
-          error: {
-            type: 'unsupported_type',
-          },
-        },
-      ],
-    });
+  const createTestDefinitions = (
+    testCases: ImportTestCase | ImportTestCase[],
+    forbidden: boolean,
+    options?: {
+      spaceId?: string;
+      singleRequest?: boolean;
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): ImportTestDefinition[] => {
+    const cases = Array.isArray(testCases) ? testCases : [testCases];
+    const responseStatusCode = forbidden ? 403 : 200;
+    if (!options?.singleRequest) {
+      // if we are testing cases that should result in a forbidden response, we can do each case individually
+      // this ensures that multiple test cases of a single type will each result in a forbidden error
+      return cases.map(x => ({
+        title: getTestTitle(x, responseStatusCode),
+        request: [createRequest(x)],
+        responseStatusCode,
+        responseBody:
+          options?.responseBodyOverride ||
+          expectResponseBody(x, responseStatusCode, options?.spaceId),
+      }));
+    }
+    // batch into a single request to save time during test execution
+    return [
+      {
+        title: getTestTitle(cases, responseStatusCode),
+        request: cases.map(x => createRequest(x)),
+        responseStatusCode,
+        responseBody:
+          options?.responseBodyOverride ||
+          expectResponseBody(cases, responseStatusCode, options?.spaceId),
+      },
+    ];
   };
 
-  const expectHiddenTypeUnsupported = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      success: false,
-      successCount: 2,
-      errors: [
-        {
-          id: '1',
-          type: 'hiddentype',
-          error: {
-            type: 'unsupported_type',
-          },
-        },
-      ],
-    });
-  };
-
-  const expectRbacForbidden = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to bulk_create dashboard,globaltype`,
-    });
-  };
-
-  const makeImportTest = (describeFn: DescribeFn) => (
+  const makeImportTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: ImportTestDefinition
+    definition: ImportTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, tests } = definition;
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
 
-      it(`should return ${tests.default.statusCode}`, async () => {
-        const data = createImportData(spaceId);
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_import`)
-          .auth(user.username, user.password)
-          .attach(
-            'file',
-            Buffer.from(data.map(obj => JSON.stringify(obj)).join('\n'), 'utf8'),
-            'export.ndjson'
-          )
-          .expect(tests.default.statusCode)
-          .then(tests.default.response);
-      });
-
-      describe('hiddentype', () => {
-        it(`should return ${tests.hiddenType.statusCode}`, async () => {
-          const data = createImportData(spaceId);
-          data.push({
-            type: 'hiddentype',
-            id: '1',
-            attributes: {
-              name: 'My Hidden Type',
-            },
-          });
-          await supertest
-            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_import`)
-            .query({ overwrite: true })
-            .auth(user.username, user.password)
-            .attach(
-              'file',
-              Buffer.from(data.map(obj => JSON.stringify(obj)).join('\n'), 'utf8'),
-              'export.ndjson'
-            )
-            .expect(tests.hiddenType.statusCode)
-            .then(tests.hiddenType.response);
-        });
-      });
+      const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
 
-      describe('unknown type', () => {
-        it(`should return ${tests.unknownType.statusCode}`, async () => {
-          const data = createImportData(spaceId);
-          data.push({
-            type: 'wigwags',
-            id: '1',
-            attributes: {
-              title: 'Wigwags title',
-            },
-          });
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const requestBody = test.request
+            .map(obj => JSON.stringify({ ...obj, ...attrs }))
+            .join('\n');
           await supertest
             .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_import`)
-            .query({ overwrite: true })
-            .auth(user.username, user.password)
-            .attach(
-              'file',
-              Buffer.from(data.map(obj => JSON.stringify(obj)).join('\n'), 'utf8'),
-              'export.ndjson'
-            )
-            .expect(tests.unknownType.statusCode)
-            .then(tests.unknownType.response);
+            .auth(user?.username, user?.password)
+            .attach('file', Buffer.from(requestBody, 'utf8'), 'export.ndjson')
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
-      });
+      }
     });
   };
 
-  const importTest = makeImportTest(describe);
+  const addTests = makeImportTest(describe);
   // @ts-ignore
-  importTest.only = makeImportTest(describe.only);
+  addTests.only = makeImportTest(describe.only);
 
   return {
-    importTest,
-    createExpectResults,
-    expectResultsWithUnsupportedHiddenType,
-    expectRbacForbidden,
-    expectUnknownTypeUnsupported,
-    expectHiddenTypeUnsupported,
+    addTests,
+    createTestDefinitions,
+    expectForbidden,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
index 1b538b9b1b65d..47c4babc5fcf9 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
@@ -6,219 +6,165 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
 
-interface ResolveImportErrorsTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
+export interface ResolveImportErrorsTestDefinition extends TestDefinition {
+  request: Array<{ type: string; id: string }>;
+  overwrite: boolean;
 }
-
-interface ResolveImportErrorsTests {
-  default: ResolveImportErrorsTest;
-  hiddenType: ResolveImportErrorsTest;
-  unknownType: ResolveImportErrorsTest;
+export type ResolveImportErrorsTestSuite = TestSuite<ResolveImportErrorsTestDefinition>;
+export interface ResolveImportErrorsTestCase extends TestCase {
+  failure?: 400 | 409; // only used for permitted response case
 }
 
-interface ResolveImportErrorsTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  tests: ResolveImportErrorsTests;
-}
+const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
+const NEW_ATTRIBUTE_VAL = `New attribute value ${Date.now()}`;
 
-const createImportData = (spaceId: string) => [
-  {
-    type: 'dashboard',
-    id: `${getIdPrefix(spaceId)}a01b2f57-fcfd-4864-b735-09e28f0d815e`,
-    attributes: {
-      title: 'A great new dashboard',
-    },
-  },
-  {
-    type: 'globaltype',
-    id: '05976c65-1145-4858-bbf0-d225cc78a06e',
-    attributes: {
-      name: 'A new globaltype object',
-    },
-  },
-];
+const NEW_SINGLE_NAMESPACE_OBJ = Object.freeze({ type: 'dashboard', id: 'new-dashboard-id' });
+const NEW_MULTI_NAMESPACE_OBJ = Object.freeze({ type: 'sharedtype', id: 'new-sharedtype-id' });
+const NEW_NAMESPACE_AGNOSTIC_OBJ = Object.freeze({ type: 'globaltype', id: 'new-globaltype-id' });
+export const TEST_CASES = Object.freeze({
+  ...CASES,
+  NEW_SINGLE_NAMESPACE_OBJ,
+  NEW_MULTI_NAMESPACE_OBJ,
+  NEW_NAMESPACE_AGNOSTIC_OBJ,
+});
 
 export function resolveImportErrorsTestSuiteFactory(
   es: any,
   esArchiver: any,
   supertest: SuperTest<any>
 ) {
-  const createExpectResults = (spaceId = DEFAULT_SPACE_ID) => async (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).to.eql({
-      success: true,
-      successCount: 1,
-    });
-  };
-
-  const expectUnknownTypeUnsupported = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      success: false,
-      successCount: 1,
-      errors: [
-        {
-          id: '1',
-          type: 'wigwags',
-          title: 'Wigwags title',
-          error: {
-            type: 'unsupported_type',
-          },
-        },
-      ],
-    });
-  };
-
-  const expectHiddenTypeUnsupported = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      success: false,
-      successCount: 1,
-      errors: [
-        {
-          id: '1',
-          type: 'hiddentype',
-          error: {
-            type: 'unsupported_type',
-          },
-        },
-      ],
-    });
+  const expectForbidden = expectResponses.forbidden('bulk_create');
+  const expectResponseBody = (
+    testCases: ResolveImportErrorsTestCase | ResolveImportErrorsTestCase[],
+    statusCode: 200 | 403,
+    spaceId = SPACES.DEFAULT.spaceId
+  ): ExpectResponseBody => async (response: Record<string, any>) => {
+    const testCaseArray = Array.isArray(testCases) ? testCases : [testCases];
+    if (statusCode === 403) {
+      const types = testCaseArray.map(x => x.type);
+      await expectForbidden(types)(response);
+    } else {
+      // permitted
+      const { success, successCount, errors } = response.body;
+      const expectedSuccesses = testCaseArray.filter(x => !x.failure);
+      const expectedFailures = testCaseArray.filter(x => x.failure);
+      expect(success).to.eql(expectedFailures.length === 0);
+      expect(successCount).to.eql(expectedSuccesses.length);
+      if (expectedFailures.length) {
+        expect(errors).to.have.length(expectedFailures.length);
+      } else {
+        expect(response.body).not.to.have.property('errors');
+      }
+      for (let i = 0; i < expectedSuccesses.length; i++) {
+        const { type, id } = expectedSuccesses[i];
+        const { _source } = await expectResponses.successCreated(es, spaceId, type, id);
+        expect(_source[type][NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+      }
+      for (let i = 0; i < expectedFailures.length; i++) {
+        const { type, id, failure } = expectedFailures[i];
+        // we don't know the order of the returned errors; search for each one
+        const object = (errors as Array<Record<string, unknown>>).find(
+          x => x.type === type && x.id === id
+        );
+        expect(object).not.to.be(undefined);
+        if (failure === 400) {
+          expect(object!.error).to.eql({ type: 'unsupported_type' });
+        } else {
+          // 409
+          expect(object!.error).to.eql({ type: 'conflict' });
+        }
+      }
+    }
   };
-
-  const expectRbacForbidden = (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to bulk_create dashboard`,
-    });
+  const createTestDefinitions = (
+    testCases: ResolveImportErrorsTestCase | ResolveImportErrorsTestCase[],
+    forbidden: boolean,
+    overwrite: boolean,
+    options?: {
+      spaceId?: string;
+      singleRequest?: boolean;
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): ResolveImportErrorsTestDefinition[] => {
+    const cases = Array.isArray(testCases) ? testCases : [testCases];
+    const responseStatusCode = forbidden ? 403 : 200;
+    if (!options?.singleRequest) {
+      // if we are testing cases that should result in a forbidden response, we can do each case individually
+      // this ensures that multiple test cases of a single type will each result in a forbidden error
+      return cases.map(x => ({
+        title: getTestTitle(x, responseStatusCode),
+        request: [createRequest(x)],
+        responseStatusCode,
+        responseBody:
+          options?.responseBodyOverride ||
+          expectResponseBody(x, responseStatusCode, options?.spaceId),
+        overwrite,
+      }));
+    }
+    // batch into a single request to save time during test execution
+    return [
+      {
+        title: getTestTitle(cases, responseStatusCode),
+        request: cases.map(x => createRequest(x)),
+        responseStatusCode,
+        responseBody:
+          options?.responseBodyOverride ||
+          expectResponseBody(cases, responseStatusCode, options?.spaceId),
+        overwrite,
+      },
+    ];
   };
 
-  const makeResolveImportErrorsTest = (describeFn: DescribeFn) => (
+  const makeResolveImportErrorsTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: ResolveImportErrorsTestDefinition
+    definition: ResolveImportErrorsTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, tests } = definition;
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
 
-      it(`should return ${tests.default.statusCode}`, async () => {
-        const data = createImportData(spaceId);
-        await supertest
-          .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_resolve_import_errors`)
-          .auth(user.username, user.password)
-          .field(
-            'retries',
-            JSON.stringify([
-              {
-                type: 'dashboard',
-                id: `${getIdPrefix(spaceId)}a01b2f57-fcfd-4864-b735-09e28f0d815e`,
-                overwrite: true,
-              },
-            ])
-          )
-          .attach(
-            'file',
-            Buffer.from(data.map(obj => JSON.stringify(obj)).join('\n'), 'utf8'),
-            'export.ndjson'
-          )
-          .expect(tests.default.statusCode)
-          .then(tests.default.response);
-      });
+      const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
 
-      describe('unknown type', () => {
-        it(`should return ${tests.unknownType.statusCode}`, async () => {
-          const data = createImportData(spaceId);
-          data.push({
-            type: 'wigwags',
-            id: '1',
-            attributes: {
-              title: 'Wigwags title',
-            },
-          });
-          await supertest
-            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_resolve_import_errors`)
-            .auth(user.username, user.password)
-            .field(
-              'retries',
-              JSON.stringify([
-                {
-                  type: 'wigwags',
-                  id: '1',
-                  overwrite: true,
-                },
-                {
-                  type: 'dashboard',
-                  id: `${getIdPrefix(spaceId)}a01b2f57-fcfd-4864-b735-09e28f0d815e`,
-                  overwrite: true,
-                },
-              ])
-            )
-            .attach(
-              'file',
-              Buffer.from(data.map(obj => JSON.stringify(obj)).join('\n'), 'utf8'),
-              'export.ndjson'
-            )
-            .expect(tests.unknownType.statusCode)
-            .then(tests.unknownType.response);
-        });
-      });
-      describe('hidden type', () => {
-        it(`should return ${tests.hiddenType.statusCode}`, async () => {
-          const data = createImportData(spaceId);
-          data.push({
-            type: 'hiddentype',
-            id: '1',
-            attributes: {
-              name: 'My Hidden Type',
-            },
-          });
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const retryAttrs = test.overwrite ? { overwrite: true } : {};
+          const retries = JSON.stringify(
+            test.request.map(({ type, id }) => ({ type, id, ...retryAttrs }))
+          );
+          const requestBody = test.request
+            .map(obj => JSON.stringify({ ...obj, ...attrs }))
+            .join('\n');
           await supertest
             .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_resolve_import_errors`)
-            .auth(user.username, user.password)
-            .field(
-              'retries',
-              JSON.stringify([
-                {
-                  type: 'hiddentype',
-                  id: '1',
-                  overwrite: true,
-                },
-                {
-                  type: 'dashboard',
-                  id: `${getIdPrefix(spaceId)}a01b2f57-fcfd-4864-b735-09e28f0d815e`,
-                  overwrite: true,
-                },
-              ])
-            )
-            .attach(
-              'file',
-              Buffer.from(data.map(obj => JSON.stringify(obj)).join('\n'), 'utf8'),
-              'export.ndjson'
-            )
-            .expect(tests.hiddenType.statusCode)
-            .then(tests.hiddenType.response);
+            .auth(user?.username, user?.password)
+            .field('retries', retries)
+            .attach('file', Buffer.from(requestBody, 'utf8'), 'export.ndjson')
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
-      });
+      }
     });
   };
 
-  const resolveImportErrorsTest = makeResolveImportErrorsTest(describe);
+  const addTests = makeResolveImportErrorsTest(describe);
   // @ts-ignore
-  resolveImportErrorsTest.only = makeResolveImportErrorsTest(describe.only);
+  addTests.only = makeResolveImportErrorsTest(describe.only);
 
   return {
-    resolveImportErrorsTest,
-    createExpectResults,
-    expectRbacForbidden,
-    expectUnknownTypeUnsupported,
-    expectHiddenTypeUnsupported,
+    addTests,
+    createTestDefinitions,
+    expectForbidden,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/update.ts b/x-pack/test/saved_object_api_integration/common/suites/update.ts
index d6b7602c0114a..587e8cf320a4f 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/update.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/update.ts
@@ -6,205 +6,97 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { getIdPrefix, getUrlPrefix } from '../lib/space_test_utils';
-import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
-
-interface UpdateTest {
-  statusCode: number;
-  response: (resp: { [key: string]: any }) => void;
-}
-
-interface UpdateTests {
-  spaceAware: UpdateTest;
-  notSpaceAware: UpdateTest;
-  hiddenType: UpdateTest;
-  doesntExist: UpdateTest;
+import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
+import { SPACES } from '../lib/spaces';
+import {
+  createRequest,
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../lib/saved_object_test_utils';
+import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+
+export interface UpdateTestDefinition extends TestDefinition {
+  request: { type: string; id: string };
 }
-
-interface UpdateTestDefinition {
-  user?: TestDefinitionAuthentication;
-  spaceId?: string;
-  otherSpaceId?: string;
-  tests: UpdateTests;
+export type UpdateTestSuite = TestSuite<UpdateTestDefinition>;
+export interface UpdateTestCase extends TestCase {
+  failure?: 403 | 404;
 }
 
-export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
-  const createExpectNotFound = (type: string, id: string, spaceId = DEFAULT_SPACE_ID) => (resp: {
-    [key: string]: any;
-  }) => {
-    expect(resp.body).eql({
-      statusCode: 404,
-      error: 'Not Found',
-      message: `Saved object [${type}/${getIdPrefix(spaceId)}${id}] not found`,
-    });
-  };
-
-  const createExpectDoesntExistNotFound = (spaceId?: string) => {
-    return createExpectNotFound('visualization', 'not an id', spaceId);
-  };
-
-  const createExpectSpaceAwareNotFound = (spaceId?: string) => {
-    return createExpectNotFound('visualization', 'dd7caf20-9efd-11e7-acb3-3dab96693fab', spaceId);
-  };
-
-  const expectHiddenTypeNotFound = createExpectNotFound(
-    'hiddentype',
-    'hiddentype_1',
-    DEFAULT_SPACE_ID
-  );
-
-  const createExpectRbacForbidden = (type: string) => (resp: { [key: string]: any }) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: `Unable to update ${type}`,
-    });
-  };
+const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
+const NEW_ATTRIBUTE_VAL = `Updated attribute value ${Date.now()}`;
 
-  const expectDoesntExistRbacForbidden = createExpectRbacForbidden('visualization');
+const DOES_NOT_EXIST = Object.freeze({ type: 'dashboard', id: 'does-not-exist' });
+export const TEST_CASES = Object.freeze({ ...CASES, DOES_NOT_EXIST });
 
-  const expectNotSpaceAwareRbacForbidden = createExpectRbacForbidden('globaltype');
-
-  const expectHiddenTypeRbacForbidden = createExpectRbacForbidden('hiddentype');
-
-  const expectNotSpaceAwareResults = (resp: { [key: string]: any }) => {
-    // loose uuid validation
-    expect(resp.body)
-      .to.have.property('id')
-      .match(/^[0-9a-f-]{36}$/);
-
-    // loose ISO8601 UTC time with milliseconds validation
-    expect(resp.body)
-      .to.have.property('updated_at')
-      .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-
-    expect(resp.body).to.eql({
-      id: resp.body.id,
-      type: 'globaltype',
-      updated_at: resp.body.updated_at,
-      version: resp.body.version,
-      attributes: {
-        name: 'My second favorite',
-      },
-    });
+export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
+  const expectForbidden = expectResponses.forbidden('update');
+  const expectResponseBody = (testCase: UpdateTestCase): ExpectResponseBody => async (
+    response: Record<string, any>
+  ) => {
+    if (testCase.failure === 403) {
+      await expectForbidden(testCase.type)(response);
+    } else {
+      // permitted
+      const object = response.body;
+      await expectResponses.permitted(object, testCase);
+      if (!testCase.failure) {
+        expect(object.attributes[NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+      }
+    }
   };
-
-  const expectSpaceAwareRbacForbidden = createExpectRbacForbidden('visualization');
-
-  const expectSpaceAwareResults = (resp: { [key: string]: any }) => {
-    // loose uuid validation ignoring prefix
-    expect(resp.body)
-      .to.have.property('id')
-      .match(/[0-9a-f-]{36}$/);
-
-    // loose ISO8601 UTC time with milliseconds validation
-    expect(resp.body)
-      .to.have.property('updated_at')
-      .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-
-    expect(resp.body).to.eql({
-      id: resp.body.id,
-      type: 'visualization',
-      updated_at: resp.body.updated_at,
-      version: resp.body.version,
-      attributes: {
-        title: 'My second favorite vis',
-      },
-    });
+  const createTestDefinitions = (
+    testCases: UpdateTestCase | UpdateTestCase[],
+    forbidden: boolean,
+    options?: {
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): UpdateTestDefinition[] => {
+    let cases = Array.isArray(testCases) ? testCases : [testCases];
+    if (forbidden) {
+      // override the expected result in each test case
+      cases = cases.map(x => ({ ...x, failure: 403 }));
+    }
+    return cases.map(x => ({
+      title: getTestTitle(x),
+      responseStatusCode: x.failure ?? 200,
+      request: createRequest(x),
+      responseBody: options?.responseBodyOverride || expectResponseBody(x),
+    }));
   };
 
-  const makeUpdateTest = (describeFn: DescribeFn) => (
+  const makeUpdateTest = (describeFn: Mocha.SuiteFunction) => (
     description: string,
-    definition: UpdateTestDefinition
+    definition: UpdateTestSuite
   ) => {
-    const { user = {}, spaceId = DEFAULT_SPACE_ID, otherSpaceId, tests } = definition;
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
       before(() => esArchiver.load('saved_objects/spaces'));
       after(() => esArchiver.unload('saved_objects/spaces'));
-      it(`should return ${tests.spaceAware.statusCode} for a space-aware doc`, async () => {
-        await supertest
-          .put(
-            `${getUrlPrefix(spaceId)}/api/saved_objects/visualization/${getIdPrefix(
-              otherSpaceId || spaceId
-            )}dd7caf20-9efd-11e7-acb3-3dab96693fab`
-          )
-          .auth(user.username, user.password)
-          .send({
-            attributes: {
-              title: 'My second favorite vis',
-            },
-          })
-          .expect(tests.spaceAware.statusCode)
-          .then(tests.spaceAware.response);
-      });
-
-      it(`should return ${tests.notSpaceAware.statusCode} for a non space-aware doc`, async () => {
-        await supertest
-          .put(
-            `${getUrlPrefix(
-              otherSpaceId || spaceId
-            )}/api/saved_objects/globaltype/8121a00-8efd-21e7-1cb3-34ab966434445`
-          )
-          .auth(user.username, user.password)
-          .send({
-            attributes: {
-              name: 'My second favorite',
-            },
-          })
-          .expect(tests.notSpaceAware.statusCode)
-          .then(tests.notSpaceAware.response);
-      });
-
-      it(`should return ${tests.hiddenType.statusCode} for hiddentype doc`, async () => {
-        await supertest
-          .put(`${getUrlPrefix(otherSpaceId || spaceId)}/api/saved_objects/hiddentype/hiddentype_1`)
-          .auth(user.username, user.password)
-          .send({
-            attributes: {
-              name: 'My favorite hidden type',
-            },
-          })
-          .expect(tests.hiddenType.statusCode)
-          .then(tests.hiddenType.response);
-      });
 
-      describe('unknown id', () => {
-        it(`should return ${tests.doesntExist.statusCode}`, async () => {
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const { type, id } = test.request;
+          const requestBody = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
           await supertest
-            .put(
-              `${getUrlPrefix(spaceId)}/api/saved_objects/visualization/${getIdPrefix(
-                spaceId
-              )}not an id`
-            )
-            .auth(user.username, user.password)
-            .send({
-              attributes: {
-                title: 'My second favorite vis',
-              },
-            })
-            .expect(tests.doesntExist.statusCode)
-            .then(tests.doesntExist.response);
+            .put(`${getUrlPrefix(spaceId)}/api/saved_objects/${type}/${id}`)
+            .auth(user?.username, user?.password)
+            .send(requestBody)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
         });
-      });
+      }
     });
   };
 
-  const updateTest = makeUpdateTest(describe);
+  const addTests = makeUpdateTest(describe);
   // @ts-ignore
-  updateTest.only = makeUpdateTest(describe.only);
+  addTests.only = makeUpdateTest(describe.only);
 
   return {
-    createExpectDoesntExistNotFound,
-    createExpectSpaceAwareNotFound,
-    expectSpaceNotFound: expectHiddenTypeNotFound,
-    expectDoesntExistRbacForbidden,
-    expectNotSpaceAwareRbacForbidden,
-    expectNotSpaceAwareResults,
-    expectSpaceAwareRbacForbidden,
-    expectSpaceAwareResults,
-    expectHiddenTypeRbacForbidden,
-    updateTest,
+    addTests,
+    createTestDefinitions,
   };
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
index 7768665f3b941..70d3afbfc9af3 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
@@ -4,206 +4,104 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create';
+import {
+  bulkCreateTestSuiteFactory,
+  TEST_CASES as CASES,
+  BulkCreateTestDefinition,
+} from '../../common/suites/bulk_create';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (overwrite: boolean, spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    {
+      ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+      ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
+    },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail409(!overwrite || (spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID)),
+    },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409(!overwrite || spaceId !== SPACE_1_ID) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409(!overwrite || spaceId !== SPACE_2_ID) },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_MULTI_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail400() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    bulkCreateTest,
-    createExpectResults,
-    createExpectRbacForbidden,
-    expectBadRequestForHiddenType,
-    expectedForbiddenTypesWithHiddenType,
-  } = bulkCreateTestSuiteFactory(es, esArchiver, supertest);
+  const { addTests, createTestDefinitions, expectForbidden } = bulkCreateTestSuiteFactory(
+    es,
+    esArchiver,
+    supertest
+  );
+  const createTests = (overwrite: boolean, spaceId: string) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(overwrite, spaceId);
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: createTestDefinitions(allTypes, true, overwrite, { spaceId }),
+      authorized: [
+        createTestDefinitions(normalTypes, false, overwrite, { spaceId, singleRequest: true }),
+        createTestDefinitions(hiddenType, true, overwrite, { spaceId }),
+        createTestDefinitions(allTypes, true, overwrite, {
+          spaceId,
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['hiddentype']),
+        }),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, overwrite, {
+        spaceId,
+        singleRequest: true,
+      }),
+    };
+  };
 
   describe('_bulk_create', () => {
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      bulkCreateTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
-      });
-
-      bulkCreateTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingSpace: {
-            statusCode: 200,
-            response: expectBadRequestForHiddenType,
-          },
-        },
-      });
-
-      bulkCreateTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
-      });
-
-      bulkCreateTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
-      });
-
-      bulkCreateTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
-      });
-
-      bulkCreateTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
-      });
-
-      bulkCreateTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
-      });
-
-      bulkCreateTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
-      });
-
-      bulkCreateTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
-      });
+    getTestScenarios([false, true]).securityAndSpaces.forEach(
+      ({ spaceId, users, modifier: overwrite }) => {
+        const suffix = ` within the ${spaceId} space${overwrite ? ' with overwrite enabled' : ''}`;
+        const { unauthorized, authorized, superuser } = createTests(overwrite!, spaceId);
+        const _addTests = (user: TestUser, tests: BulkCreateTestDefinition[]) => {
+          addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+        };
 
-      bulkCreateTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingSpace: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
-      });
-    });
+        [
+          users.noAccess,
+          users.legacyAll,
+          users.dualRead,
+          users.readGlobally,
+          users.readAtSpace,
+          users.allAtOtherSpace,
+        ].forEach(user => {
+          _addTests(user, unauthorized);
+        });
+        [users.dualAll, users.allGlobally, users.allAtSpace].forEach(user => {
+          _addTests(user, authorized);
+        });
+        _addTests(users.superuser, superuser);
+      }
+    );
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts
index ec5bce1707569..09ea867bff371 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_get.ts
@@ -4,205 +4,91 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
+import {
+  bulkGetTestSuiteFactory,
+  TEST_CASES as CASES,
+  BulkGetTestDefinition,
+} from '../../common/suites/bulk_get';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail400() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  const {
-    bulkGetTest,
-    createExpectResults,
-    createExpectRbacForbidden,
-    expectBadRequestForHiddenType,
-    expectedForbiddenTypesWithHiddenType,
-  } = bulkGetTestSuiteFactory(esArchiver, supertest);
+  const { addTests, createTestDefinitions, expectForbidden } = bulkGetTestSuiteFactory(
+    esArchiver,
+    supertest
+  );
+  const createTests = (spaceId: string) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(spaceId);
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false, { singleRequest: true }),
+        createTestDefinitions(hiddenType, true),
+        createTestDefinitions(allTypes, true, {
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['hiddentype']),
+        }),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, { singleRequest: true }),
+    };
+  };
 
   describe('_bulk_get', () => {
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      bulkGetTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
-      });
-
-      bulkGetTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingHiddenType: {
-            statusCode: 200,
-            response: expectBadRequestForHiddenType,
-          },
-        },
-      });
-
-      bulkGetTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
-      });
-
-      bulkGetTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
-      });
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` within the ${spaceId} space`;
+      const { unauthorized, authorized, superuser } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: BulkGetTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-      bulkGetTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
+      [users.noAccess, users.legacyAll, users.allAtOtherSpace].forEach(user => {
+        _addTests(user, unauthorized);
       });
-
-      bulkGetTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
-      });
-
-      bulkGetTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
-      });
-
-      bulkGetTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
-      });
-
-      bulkGetTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(['hiddentype']),
-          },
-        },
-      });
-
-      bulkGetTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(),
-          },
-          includingHiddenType: {
-            statusCode: 403,
-            response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-          },
-        },
+      [
+        users.dualAll,
+        users.dualRead,
+        users.allGlobally,
+        users.readGlobally,
+        users.allAtSpace,
+        users.readAtSpace,
+      ].forEach(user => {
+        _addTests(user, authorized);
       });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_update.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_update.ts
index 06240647b37a8..987209653b347 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_update.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_update.ts
@@ -4,290 +4,91 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkUpdateTestSuiteFactory } from '../../common/suites/bulk_update';
+import {
+  bulkUpdateTestSuiteFactory,
+  TEST_CASES as CASES,
+  BulkUpdateTestDefinition,
+} from '../../common/suites/bulk_update';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail404() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('bulkUpdate', () => {
-    const {
-      createExpectDoesntExistNotFound,
-      expectDoesntExistRbacForbidden,
-      expectNotSpaceAwareResults,
-      expectNotSpaceAwareRbacForbidden,
-      expectSpaceAwareRbacForbidden,
-      expectSpaceAwareResults,
-      expectSpaceNotFound,
-      expectHiddenTypeRbacForbidden,
-      expectHiddenTypeRbacForbiddenWithGlobalAllowed,
-      bulkUpdateTest,
-    } = bulkUpdateTestSuiteFactory(esArchiver, supertest);
-
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      bulkUpdateTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      bulkUpdateTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectSpaceAwareResults,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 200,
-            response: expectSpaceNotFound,
-          },
-          doesntExist: {
-            statusCode: 200,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      bulkUpdateTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      bulkUpdateTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectSpaceAwareResults,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbiddenWithGlobalAllowed,
-          },
-          doesntExist: {
-            statusCode: 200,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
+  const { addTests, createTestDefinitions, expectForbidden } = bulkUpdateTestSuiteFactory(
+    esArchiver,
+    supertest
+  );
+  const createTests = (spaceId: string) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(spaceId);
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false, { singleRequest: true }),
+        createTestDefinitions(hiddenType, true),
+        createTestDefinitions(allTypes, true, {
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['hiddentype']),
+        }),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, { singleRequest: true }),
+    };
+  };
 
-      bulkUpdateTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
+  describe('_bulk_update', () => {
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` within the ${spaceId} space`;
+      const { unauthorized, authorized, superuser } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: BulkUpdateTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-      bulkUpdateTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectSpaceAwareResults,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbiddenWithGlobalAllowed,
-          },
-          doesntExist: {
-            statusCode: 200,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.readAtSpace,
+        users.allAtOtherSpace,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
       });
-
-      bulkUpdateTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      bulkUpdateTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectSpaceAwareResults,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbiddenWithGlobalAllowed,
-          },
-          doesntExist: {
-            statusCode: 200,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      bulkUpdateTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      bulkUpdateTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
+      [users.dualAll, users.allGlobally, users.allAtSpace].forEach(user => {
+        _addTests(user, authorized);
       });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts
index e4adaa580c1db..7278504b8f0e8 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts
@@ -4,248 +4,91 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { createTestSuiteFactory } from '../../common/suites/create';
+import {
+  createTestSuiteFactory,
+  TEST_CASES as CASES,
+  CreateTestDefinition,
+} from '../../common/suites/create';
 
-export default function({ getService }: FtrProviderContext) {
-  const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('legacyEs');
-  const esArchiver = getService('esArchiver');
-
-  const {
-    createTest,
-    createExpectSpaceAwareResults,
-    expectNotSpaceAwareResults,
-    expectNotSpaceAwareRbacForbidden,
-    expectSpaceAwareRbacForbidden,
-    expectBadRequestForHiddenType,
-    expectHiddenTypeRbacForbidden,
-  } = createTestSuiteFactory(es, esArchiver, supertestWithoutAuth);
-
-  describe('create', () => {
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      createTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
-
-      createTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 400,
-            response: expectBadRequestForHiddenType,
-          },
-        },
-      });
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail409 } = testCaseFailures;
 
-      createTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
+const createTestCases = (overwrite: boolean, spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    {
+      ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+      ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
+    },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail409(!overwrite || (spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID)),
+    },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409(!overwrite || spaceId !== SPACE_1_ID) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409(!overwrite || spaceId !== SPACE_2_ID) },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_MULTI_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail400() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
-      createTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
-
-      createTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
-
-      createTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
-
-      createTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
+export default function({ getService }: FtrProviderContext) {
+  const supertest = getService('supertestWithoutAuth');
+  const esArchiver = getService('esArchiver');
+  const es = getService('legacyEs');
 
-      createTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
+  const { addTests, createTestDefinitions } = createTestSuiteFactory(es, esArchiver, supertest);
+  const createTests = (overwrite: boolean, spaceId: string) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(overwrite, spaceId);
+    return {
+      unauthorized: createTestDefinitions(allTypes, true, overwrite, { spaceId }),
+      authorized: [
+        createTestDefinitions(normalTypes, false, overwrite, { spaceId }),
+        createTestDefinitions(hiddenType, true, overwrite, { spaceId }),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, overwrite, { spaceId }),
+    };
+  };
 
-      createTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
+  describe('_create', () => {
+    getTestScenarios([false, true]).securityAndSpaces.forEach(
+      ({ spaceId, users, modifier: overwrite }) => {
+        const suffix = ` within the ${spaceId} space${overwrite ? ' with overwrite enabled' : ''}`;
+        const { unauthorized, authorized, superuser } = createTests(overwrite!, spaceId);
+        const _addTests = (user: TestUser, tests: CreateTestDefinition[]) => {
+          addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+        };
 
-      createTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-        },
-      });
-    });
+        [
+          users.noAccess,
+          users.legacyAll,
+          users.dualRead,
+          users.readGlobally,
+          users.readAtSpace,
+          users.allAtOtherSpace,
+        ].forEach(user => {
+          _addTests(user, unauthorized);
+        });
+        [users.dualAll, users.allGlobally, users.allAtSpace].forEach(user => {
+          _addTests(user, authorized);
+        });
+        _addTests(users.superuser, superuser);
+      }
+    );
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts
index bfd2112428db4..995b8fc2422d9 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/delete.ts
@@ -4,288 +4,83 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { deleteTestSuiteFactory } from '../../common/suites/delete';
+import {
+  deleteTestSuiteFactory,
+  TEST_CASES as CASES,
+  DeleteTestDefinition,
+} from '../../common/suites/delete';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail404() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('delete', () => {
-    const {
-      createExpectUnknownDocNotFound,
-      deleteTest,
-      expectEmpty,
-      expectRbacSpaceAwareForbidden,
-      expectRbacNotSpaceAwareForbidden,
-      expectRbacInvalidIdForbidden,
-      expectGenericNotFound,
-      expectRbacHiddenTypeForbidden,
-    } = deleteTestSuiteFactory(esArchiver, supertest);
-
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      deleteTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectRbacSpaceAwareForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectRbacNotSpaceAwareForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 403,
-            response: expectRbacInvalidIdForbidden,
-          },
-        },
-      });
-
-      deleteTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectEmpty,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectEmpty,
-          },
-          hiddenType: {
-            statusCode: 404,
-            response: expectGenericNotFound,
-          },
-          invalidId: {
-            statusCode: 404,
-            response: createExpectUnknownDocNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      deleteTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectRbacSpaceAwareForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectRbacNotSpaceAwareForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 403,
-            response: expectRbacInvalidIdForbidden,
-          },
-        },
-      });
-
-      deleteTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectEmpty,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectEmpty,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 404,
-            response: createExpectUnknownDocNotFound(scenario.spaceId),
-          },
-        },
-      });
+  const { addTests, createTestDefinitions } = deleteTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(spaceId);
+    return {
+      unauthorized: createTestDefinitions(allTypes, true, { spaceId }),
+      authorized: [
+        createTestDefinitions(normalTypes, false, { spaceId }),
+        createTestDefinitions(hiddenType, true, { spaceId }),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, { spaceId }),
+    };
+  };
 
-      deleteTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectRbacSpaceAwareForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectRbacNotSpaceAwareForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 403,
-            response: expectRbacInvalidIdForbidden,
-          },
-        },
-      });
+  describe('_delete', () => {
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` within the ${spaceId} space`;
+      const { unauthorized, authorized, superuser } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: DeleteTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-      deleteTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectEmpty,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectEmpty,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 404,
-            response: createExpectUnknownDocNotFound(scenario.spaceId),
-          },
-        },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.readAtSpace,
+        users.allAtOtherSpace,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
       });
-
-      deleteTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectRbacSpaceAwareForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectRbacNotSpaceAwareForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 403,
-            response: expectRbacInvalidIdForbidden,
-          },
-        },
-      });
-
-      deleteTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectEmpty,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectEmpty,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 404,
-            response: createExpectUnknownDocNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      deleteTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectRbacSpaceAwareForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectRbacNotSpaceAwareForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 403,
-            response: expectRbacInvalidIdForbidden,
-          },
-        },
-      });
-
-      deleteTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectRbacSpaceAwareForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectRbacNotSpaceAwareForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacHiddenTypeForbidden,
-          },
-          invalidId: {
-            statusCode: 403,
-            response: expectRbacInvalidIdForbidden,
-          },
-        },
+      [users.dualAll, users.allGlobally, users.allAtSpace].forEach(user => {
+        _addTests(user, authorized);
       });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
index b64c3ed87c35d..6f2426e55c6a6 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
@@ -4,274 +4,70 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
-import { SPACES } from '../../common/lib/spaces';
+import { getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { exportTestSuiteFactory } from '../../common/suites/export';
+import {
+  exportTestSuiteFactory,
+  getTestCases,
+  ExportTestDefinition,
+} from '../../common/suites/export';
+
+const createTestCases = (spaceId: string) => {
+  const cases = getTestCases(spaceId);
+  const exportableTypes = [
+    cases.singleNamespaceObject,
+    cases.singleNamespaceType,
+    cases.namespaceAgnosticObject,
+    cases.namespaceAgnosticType,
+  ];
+  const nonExportableTypes = [
+    cases.multiNamespaceObject,
+    cases.multiNamespaceType,
+    cases.hiddenObject,
+    cases.hiddenType,
+  ];
+  const allTypes = exportableTypes.concat(nonExportableTypes);
+  return { exportableTypes, nonExportableTypes, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('export', () => {
-    const {
-      createExpectRbacForbidden,
-      expectTypeOrObjectsRequired,
-      createExpectVisualizationResults,
-      expectInvalidTypeSpecified,
-      exportTest,
-    } = exportTestSuiteFactory(esArchiver, supertest);
+  const { addTests, createTestDefinitions } = exportTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const { exportableTypes, nonExportableTypes, allTypes } = createTestCases(spaceId);
+    return {
+      unauthorized: [
+        createTestDefinitions(exportableTypes, true),
+        createTestDefinitions(nonExportableTypes, false),
+      ].flat(),
+      authorized: createTestDefinitions(allTypes, false),
+    };
+  };
 
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      exportTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
-      });
+  describe('_export', () => {
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` within the ${spaceId} space`;
+      const { unauthorized, authorized } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: ExportTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-      exportTest(`superuser with the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
+      [users.noAccess, users.legacyAll, users.allAtOtherSpace].forEach(user => {
+        _addTests(user, unauthorized);
       });
-
-      exportTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
-      });
-
-      exportTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
-      });
-
-      exportTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
-      });
-
-      exportTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
-      });
-
-      exportTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
-      });
-
-      exportTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
-      });
-
-      exportTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
-      });
-
-      exportTest(`rbac user with all at the other space within ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          hiddenType: {
-            description: 'exporting space not allowed',
-            statusCode: 400,
-            response: expectInvalidTypeSpecified,
-          },
-          noTypeOrObjects: {
-            description: 'bad request, type or object is required',
-            statusCode: 400,
-            response: expectTypeOrObjectsRequired,
-          },
-        },
+      [
+        users.dualAll,
+        users.dualRead,
+        users.allGlobally,
+        users.readGlobally,
+        users.allAtSpace,
+        users.readAtSpace,
+        users.superuser,
+      ].forEach(user => {
+        _addTests(user, authorized);
       });
     });
   });
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts
index 366b8b44585cd..7c16c01d203c0 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/find.ts
@@ -4,727 +4,71 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
-import { SPACES } from '../../common/lib/spaces';
+import { getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { findTestSuiteFactory } from '../../common/suites/find';
+import { findTestSuiteFactory, getTestCases, FindTestDefinition } from '../../common/suites/find';
+
+const createTestCases = (spaceId: string) => {
+  const cases = getTestCases(spaceId);
+  const normalTypes = [
+    cases.singleNamespaceType,
+    cases.multiNamespaceType,
+    cases.namespaceAgnosticType,
+    cases.pageBeyondTotal,
+    cases.unknownSearchField,
+    cases.filterWithNamespaceAgnosticType,
+    cases.filterWithDisallowedType,
+  ];
+  const hiddenAndUnknownTypes = [
+    cases.hiddenType,
+    cases.unknownType,
+    cases.filterWithHiddenType,
+    cases.filterWithUnknownType,
+  ];
+  const allTypes = normalTypes.concat(hiddenAndUnknownTypes);
+  return { normalTypes, hiddenAndUnknownTypes, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('find', () => {
-    const {
-      createExpectEmpty,
-      createExpectRbacForbidden,
-      createExpectVisualizationResults,
-      expectFilterWrongTypeError,
-      expectNotSpaceAwareResults,
-      expectTypeRequired,
-      findTest,
-    } = findTestSuiteFactory(esArchiver, supertest);
+  const { addTests, createTestDefinitions } = findTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const { normalTypes, hiddenAndUnknownTypes, allTypes } = createTestCases(spaceId);
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false),
+        createTestDefinitions(hiddenAndUnknownTypes, true),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false),
+    };
+  };
 
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      findTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          notSpaceAwareType: {
-            description: 'forbidden login and find globaltype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          unknownSearchField: {
-            description: 'forbidden login and find url message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('url'),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'forbidden login and find globaltype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'forbidden',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-        },
-      });
+  describe('_find', () => {
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` within the ${spaceId} space`;
+      const { unauthorized, authorized, superuser } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: FindTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-      findTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          notSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          unknownType: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          pageBeyondTotal: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(100, 100, 1),
-          },
-          unknownSearchField: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          filterWithHiddenType: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          filterWithUnknownType: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'Bad Request',
-            statusCode: 400,
-            response: expectFilterWrongTypeError,
-          },
-        },
+      [users.noAccess, users.legacyAll, users.allAtOtherSpace].forEach(user => {
+        _addTests(user, unauthorized);
       });
-
-      findTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          notSpaceAwareType: {
-            description: 'forbidden login and find globaltype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          unknownSearchField: {
-            description: 'forbidden login and find url message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('url'),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'forbidden login and find globaltype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'forbidden',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-        },
-      });
-
-      findTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          notSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(100, 100, 1),
-          },
-          unknownSearchField: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'Bad Request',
-            statusCode: 400,
-            response: expectFilterWrongTypeError,
-          },
-        },
-      });
-
-      findTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          notSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(100, 100, 1),
-          },
-          unknownSearchField: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'Bad Request',
-            statusCode: 400,
-            response: expectFilterWrongTypeError,
-          },
-        },
-      });
-
-      findTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          notSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(100, 100, 1),
-          },
-          unknownSearchField: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'Bad Request',
-            statusCode: 400,
-            response: expectFilterWrongTypeError,
-          },
-        },
-      });
-
-      findTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          notSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(100, 100, 1),
-          },
-          unknownSearchField: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'Bad Request',
-            statusCode: 400,
-            response: expectFilterWrongTypeError,
-          },
-        },
-      });
-
-      findTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          notSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(100, 100, 1),
-          },
-          unknownSearchField: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'Bad Request',
-            statusCode: 400,
-            response: expectFilterWrongTypeError,
-          },
-        },
-      });
-
-      findTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'only the visualization',
-            statusCode: 200,
-            response: createExpectVisualizationResults(scenario.spaceId),
-          },
-          notSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(100, 100, 1),
-          },
-          unknownSearchField: {
-            description: 'empty result',
-            statusCode: 200,
-            response: createExpectEmpty(1, 20, 0),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'only the globaltype',
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'Bad Request',
-            statusCode: 400,
-            response: expectFilterWrongTypeError,
-          },
-        },
-      });
-
-      findTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAwareType: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          notSpaceAwareType: {
-            description: 'forbidden login and find globaltype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-          hiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          unknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          pageBeyondTotal: {
-            description: 'forbidden login and find visualization message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('visualization'),
-          },
-          unknownSearchField: {
-            description: 'forbidden login and find url message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('url'),
-          },
-          noType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithNotSpaceAwareType: {
-            description: 'forbidden login and find globaltype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-          filterWithHiddenType: {
-            description: 'forbidden find hiddentype message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('hiddentype'),
-          },
-          filterWithUnknownType: {
-            description: 'forbidden find wigwags message',
-            statusCode: 403,
-            response: createExpectRbacForbidden('wigwags'),
-          },
-          filterWithNoType: {
-            description: 'bad request, type is required',
-            statusCode: 400,
-            response: expectTypeRequired,
-          },
-          filterWithUnAllowedType: {
-            description: 'forbidden',
-            statusCode: 403,
-            response: createExpectRbacForbidden('globaltype'),
-          },
-        },
+      [
+        users.dualAll,
+        users.dualRead,
+        users.allGlobally,
+        users.readGlobally,
+        users.allAtSpace,
+        users.readAtSpace,
+      ].forEach(user => {
+        _addTests(user, authorized);
       });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts
index 9667abcc5e57a..9e3203e147493 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/get.ts
@@ -4,289 +4,84 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { getTestSuiteFactory } from '../../common/suites/get';
+import {
+  getTestSuiteFactory,
+  TEST_CASES as CASES,
+  GetTestDefinition,
+} from '../../common/suites/get';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail404() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  const {
-    createExpectDoesntExistNotFound,
-    createExpectSpaceAwareResults,
-    createExpectNotSpaceAwareResults,
-    expectSpaceAwareRbacForbidden,
-    expectNotSpaceAwareRbacForbidden,
-    expectDoesntExistRbacForbidden,
-    expectHiddenTypeRbacForbidden,
-    expectHiddenTypeNotFound,
-    getTest,
-  } = getTestSuiteFactory(esArchiver, supertest);
-
-  describe('get', () => {
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      getTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      getTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: createExpectNotSpaceAwareResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 404,
-            response: expectHiddenTypeNotFound,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      getTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      getTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: createExpectNotSpaceAwareResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
+  const { addTests, createTestDefinitions } = getTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(spaceId);
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false),
+        createTestDefinitions(hiddenType, true),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false),
+    };
+  };
 
-      getTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: createExpectNotSpaceAwareResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
+  describe('_get', () => {
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` within the ${spaceId} space`;
+      const { unauthorized, authorized, superuser } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: GetTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-      getTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: createExpectNotSpaceAwareResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
+      [users.noAccess, users.legacyAll, users.allAtOtherSpace].forEach(user => {
+        _addTests(user, unauthorized);
       });
-
-      getTest(`rbac user with read globall within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: createExpectNotSpaceAwareResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      getTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: createExpectNotSpaceAwareResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      getTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: createExpectSpaceAwareResults(scenario.spaceId),
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: createExpectNotSpaceAwareResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      getTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
+      [
+        users.dualAll,
+        users.dualRead,
+        users.allGlobally,
+        users.readGlobally,
+        users.allAtSpace,
+        users.readAtSpace,
+      ].forEach(user => {
+        _addTests(user, authorized);
       });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
index 58859c292ce35..10c7f61dce5cc 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
@@ -4,245 +4,92 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { importTestSuiteFactory } from '../../common/suites/import';
+import {
+  importTestSuiteFactory,
+  TEST_CASES as CASES,
+  ImportTestDefinition,
+} from '../../common/suites/import';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const importableTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(spaceId === DEFAULT_SPACE_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(spaceId === SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(spaceId === SPACE_2_ID) },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409() },
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const nonImportableTypes = [
+    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
+    { ...CASES.HIDDEN, ...fail400() },
+    { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  ];
+  const allTypes = importableTypes.concat(nonImportableTypes);
+  return { importableTypes, nonImportableTypes, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    importTest,
-    createExpectResults,
-    expectRbacForbidden,
-    expectUnknownTypeUnsupported: expectUnknownTypeUnsupported,
-    expectHiddenTypeUnsupported,
-  } = importTestSuiteFactory(es, esArchiver, supertest);
+  const { addTests, createTestDefinitions, expectForbidden } = importTestSuiteFactory(
+    es,
+    esArchiver,
+    supertest
+  );
+  const createTests = (spaceId: string) => {
+    const { importableTypes, nonImportableTypes, allTypes } = createTestCases(spaceId);
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: [
+        createTestDefinitions(importableTypes, true, { spaceId }),
+        createTestDefinitions(nonImportableTypes, false, { spaceId, singleRequest: true }),
+        createTestDefinitions(allTypes, true, {
+          spaceId,
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['dashboard', 'globaltype', 'isolatedtype']),
+        }),
+      ].flat(),
+      authorized: createTestDefinitions(allTypes, false, { spaceId, singleRequest: true }),
+    };
+  };
 
   describe('_import', () => {
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      importTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
-      });
-
-      importTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 200,
-            response: expectHiddenTypeUnsupported,
-          },
-          unknownType: {
-            statusCode: 200,
-            response: expectUnknownTypeUnsupported,
-          },
-        },
-      });
-
-      importTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
-      });
-
-      importTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 200,
-            response: expectHiddenTypeUnsupported,
-          },
-          unknownType: {
-            statusCode: 200,
-            response: expectUnknownTypeUnsupported,
-          },
-        },
-      });
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` within the ${spaceId} space`;
+      const { unauthorized, authorized } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: ImportTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-      importTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.readAtSpace,
+        users.allAtOtherSpace,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
       });
-
-      importTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 200,
-            response: expectHiddenTypeUnsupported,
-          },
-          unknownType: {
-            statusCode: 200,
-            response: expectUnknownTypeUnsupported,
-          },
-        },
-      });
-
-      importTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
-      });
-
-      importTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 200,
-            response: expectHiddenTypeUnsupported,
-          },
-          unknownType: {
-            statusCode: 200,
-            response: expectUnknownTypeUnsupported,
-          },
-        },
-      });
-
-      importTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
-      });
-
-      importTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
+      [users.dualAll, users.allGlobally, users.allAtSpace, users.superuser].forEach(user => {
+        _addTests(user, authorized);
       });
     });
   });
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts
index bb42c5422ece5..46d7ab6425989 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts
@@ -20,6 +20,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./bulk_create'));
     loadTestFile(require.resolve('./bulk_get'));
+    loadTestFile(require.resolve('./bulk_update'));
     loadTestFile(require.resolve('./create'));
     loadTestFile(require.resolve('./delete'));
     loadTestFile(require.resolve('./export'));
@@ -28,6 +29,5 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./import'));
     loadTestFile(require.resolve('./resolve_import_errors'));
     loadTestFile(require.resolve('./update'));
-    loadTestFile(require.resolve('./bulk_update'));
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
index 6c91fe6310170..8e8fe874b4317 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
@@ -4,258 +4,99 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors';
+import {
+  resolveImportErrorsTestSuiteFactory,
+  TEST_CASES as CASES,
+  ResolveImportErrorsTestDefinition,
+} from '../../common/suites/resolve_import_errors';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (overwrite: boolean, spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const importableTypes = [
+    {
+      ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+      ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
+    },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const nonImportableTypes = [
+    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
+    { ...CASES.HIDDEN, ...fail400() },
+    { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  ];
+  const allTypes = importableTypes.concat(nonImportableTypes);
+  return { importableTypes, nonImportableTypes, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    resolveImportErrorsTest,
-    createExpectResults,
-    expectRbacForbidden,
-    expectUnknownTypeUnsupported,
-    expectHiddenTypeUnsupported,
-  } = resolveImportErrorsTestSuiteFactory(es, esArchiver, supertest);
+  const { addTests, createTestDefinitions, expectForbidden } = resolveImportErrorsTestSuiteFactory(
+    es,
+    esArchiver,
+    supertest
+  );
+  const createTests = (overwrite: boolean, spaceId: string) => {
+    const { importableTypes, nonImportableTypes, allTypes } = createTestCases(overwrite, spaceId);
+    const singleRequest = true;
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: [
+        createTestDefinitions(importableTypes, true, overwrite, { spaceId }),
+        createTestDefinitions(nonImportableTypes, false, overwrite, { spaceId, singleRequest }),
+        createTestDefinitions(allTypes, true, overwrite, {
+          spaceId,
+          singleRequest,
+          responseBodyOverride: expectForbidden(['dashboard', 'globaltype', 'isolatedtype']),
+        }),
+      ].flat(),
+      authorized: createTestDefinitions(allTypes, false, overwrite, { spaceId, singleRequest }),
+    };
+  };
 
   describe('_resolve_import_errors', () => {
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      resolveImportErrorsTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
-      });
-
-      resolveImportErrorsTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 200,
-            response: expectHiddenTypeUnsupported,
-          },
-          unknownType: {
-            statusCode: 200,
-            response: expectUnknownTypeUnsupported,
-          },
-        },
-      });
-
-      resolveImportErrorsTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
-      });
-
-      resolveImportErrorsTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 200,
-            response: expectHiddenTypeUnsupported,
-          },
-          unknownType: {
-            statusCode: 200,
-            response: expectUnknownTypeUnsupported,
-          },
-        },
-      });
-
-      resolveImportErrorsTest(
-        `dual-privileges readonly user within the ${scenario.spaceId} space`,
-        {
-          user: scenario.users.dualRead,
-          spaceId: scenario.spaceId,
-          tests: {
-            default: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-            hiddenType: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-            unknownType: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-          },
-        }
-      );
-
-      resolveImportErrorsTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 200,
-            response: createExpectResults(scenario.spaceId),
-          },
-          hiddenType: {
-            statusCode: 200,
-            response: expectHiddenTypeUnsupported,
-          },
-          unknownType: {
-            statusCode: 200,
-            response: expectUnknownTypeUnsupported,
-          },
-        },
-      });
-
-      resolveImportErrorsTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          default: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-          unknownType: {
-            statusCode: 403,
-            response: expectRbacForbidden,
-          },
-        },
-      });
-
-      resolveImportErrorsTest(
-        `rbac user with all at the space within the ${scenario.spaceId} space`,
-        {
-          user: scenario.users.allAtSpace,
-          spaceId: scenario.spaceId,
-          tests: {
-            default: {
-              statusCode: 200,
-              response: createExpectResults(scenario.spaceId),
-            },
-            hiddenType: {
-              statusCode: 200,
-              response: expectHiddenTypeUnsupported,
-            },
-            unknownType: {
-              statusCode: 200,
-              response: expectUnknownTypeUnsupported,
-            },
-          },
-        }
-      );
-
-      resolveImportErrorsTest(
-        `rbac user with read at the space within the ${scenario.spaceId} space`,
-        {
-          user: scenario.users.readAtSpace,
-          spaceId: scenario.spaceId,
-          tests: {
-            default: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-            hiddenType: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-            unknownType: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-          },
-        }
-      );
+    getTestScenarios([false, true]).securityAndSpaces.forEach(
+      ({ spaceId, users, modifier: overwrite }) => {
+        const suffix = ` within the ${spaceId} space${overwrite ? ' with overwrite enabled' : ''}`;
+        const { unauthorized, authorized } = createTests(overwrite!, spaceId);
+        const _addTests = (user: TestUser, tests: ResolveImportErrorsTestDefinition[]) => {
+          addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+        };
 
-      resolveImportErrorsTest(
-        `rbac user with all at other space within the ${scenario.spaceId} space`,
-        {
-          user: scenario.users.allAtOtherSpace,
-          spaceId: scenario.spaceId,
-          tests: {
-            default: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-            hiddenType: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-            unknownType: {
-              statusCode: 403,
-              response: expectRbacForbidden,
-            },
-          },
-        }
-      );
-    });
+        [
+          users.noAccess,
+          users.legacyAll,
+          users.dualRead,
+          users.readGlobally,
+          users.readAtSpace,
+          users.allAtOtherSpace,
+        ].forEach(user => {
+          _addTests(user, unauthorized);
+        });
+        [users.dualAll, users.allGlobally, users.allAtSpace, users.superuser].forEach(user => {
+          _addTests(user, authorized);
+        });
+      }
+    );
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts
index 8eb06e41e2a41..21f354d2a8e76 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/update.ts
@@ -4,289 +4,83 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { updateTestSuiteFactory } from '../../common/suites/update';
+import {
+  updateTestSuiteFactory,
+  TEST_CASES as CASES,
+  UpdateTestDefinition,
+} from '../../common/suites/update';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail404() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('update', () => {
-    const {
-      createExpectDoesntExistNotFound,
-      expectDoesntExistRbacForbidden,
-      expectNotSpaceAwareResults,
-      expectNotSpaceAwareRbacForbidden,
-      expectSpaceAwareRbacForbidden,
-      expectSpaceAwareResults,
-      expectSpaceNotFound,
-      expectHiddenTypeRbacForbidden,
-      updateTest,
-    } = updateTestSuiteFactory(esArchiver, supertest);
-
-    [
-      {
-        spaceId: SPACES.DEFAULT.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-        },
-      },
-      {
-        spaceId: SPACES.SPACE_1.spaceId,
-        users: {
-          noAccess: AUTHENTICATION.NOT_A_KIBANA_USER,
-          superuser: AUTHENTICATION.SUPERUSER,
-          legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
-          allGlobally: AUTHENTICATION.KIBANA_RBAC_USER,
-          readGlobally: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-          dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-          dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-          allAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-          readAtSpace: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-          allAtOtherSpace: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-        },
-      },
-    ].forEach(scenario => {
-      updateTest(`user with no access within the ${scenario.spaceId} space`, {
-        user: scenario.users.noAccess,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      updateTest(`superuser within the ${scenario.spaceId} space`, {
-        user: scenario.users.superuser,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectSpaceAwareResults,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 404,
-            response: expectSpaceNotFound,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      updateTest(`legacy user within the ${scenario.spaceId} space`, {
-        user: scenario.users.legacyAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      updateTest(`dual-privileges user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualAll,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectSpaceAwareResults,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
+  const { addTests, createTestDefinitions } = updateTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(spaceId);
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false),
+        createTestDefinitions(hiddenType, true),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false),
+    };
+  };
 
-      updateTest(`dual-privileges readonly user within the ${scenario.spaceId} space`, {
-        user: scenario.users.dualRead,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
+  describe('_update', () => {
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` within the ${spaceId} space`;
+      const { unauthorized, authorized, superuser } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: UpdateTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-      updateTest(`rbac user with all globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.allGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectSpaceAwareResults,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.readAtSpace,
+        users.allAtOtherSpace,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
       });
-
-      updateTest(`rbac user with read globally within the ${scenario.spaceId} space`, {
-        user: scenario.users.readGlobally,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      updateTest(`rbac user with all at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 200,
-            response: expectSpaceAwareResults,
-          },
-          notSpaceAware: {
-            statusCode: 200,
-            response: expectNotSpaceAwareResults,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 404,
-            response: createExpectDoesntExistNotFound(scenario.spaceId),
-          },
-        },
-      });
-
-      updateTest(`rbac user with read at the space within the ${scenario.spaceId} space`, {
-        user: scenario.users.readAtSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
-      });
-
-      updateTest(`rbac user with all at other space within the ${scenario.spaceId} space`, {
-        user: scenario.users.allAtOtherSpace,
-        spaceId: scenario.spaceId,
-        tests: {
-          spaceAware: {
-            statusCode: 403,
-            response: expectSpaceAwareRbacForbidden,
-          },
-          notSpaceAware: {
-            statusCode: 403,
-            response: expectNotSpaceAwareRbacForbidden,
-          },
-          hiddenType: {
-            statusCode: 403,
-            response: expectHiddenTypeRbacForbidden,
-          },
-          doesntExist: {
-            statusCode: 403,
-            response: expectDoesntExistRbacForbidden,
-          },
-        },
+      [users.dualAll, users.allGlobally, users.allAtSpace].forEach(user => {
+        _addTests(user, authorized);
       });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
index 943a22c4399c7..5b3397c7909ae 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
@@ -4,176 +4,88 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create';
+import {
+  bulkCreateTestSuiteFactory,
+  TEST_CASES as CASES,
+  BulkCreateTestDefinition,
+} from '../../common/suites/bulk_create';
+
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (overwrite: boolean) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(!overwrite) },
+    CASES.SINGLE_NAMESPACE_SPACE_1,
+    CASES.SINGLE_NAMESPACE_SPACE_2,
+    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail409(!overwrite) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409() },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_MULTI_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail400() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    bulkCreateTest,
-    createExpectResults,
-    createExpectRbacForbidden,
-    expectBadRequestForHiddenType,
-    expectedForbiddenTypesWithHiddenType: expectedForbiddenTypesWithHiddenType,
-  } = bulkCreateTestSuiteFactory(es, esArchiver, supertest);
+  const { addTests, createTestDefinitions, expectForbidden } = bulkCreateTestSuiteFactory(
+    es,
+    esArchiver,
+    supertest
+  );
+  const createTests = (overwrite: boolean) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(overwrite);
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: createTestDefinitions(allTypes, true, overwrite),
+      authorized: [
+        createTestDefinitions(normalTypes, false, overwrite, { singleRequest: true }),
+        createTestDefinitions(hiddenType, true, overwrite),
+        createTestDefinitions(allTypes, true, overwrite, {
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['hiddentype']),
+        }),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, overwrite, { singleRequest: true }),
+    };
+  };
 
   describe('_bulk_create', () => {
-    bulkCreateTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkCreateTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        includingSpace: {
-          statusCode: 200,
-          response: expectBadRequestForHiddenType,
-        },
-      },
-    });
-
-    bulkCreateTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkCreateTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(['hiddentype']),
-        },
-      },
-    });
-
-    bulkCreateTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkCreateTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(['hiddentype']),
-        },
-      },
-    });
-
-    bulkCreateTest(`rbac readonly user`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkCreateTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkCreateTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkCreateTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
+    getTestScenarios([false, true]).security.forEach(({ users, modifier: overwrite }) => {
+      const suffix = overwrite ? ' with overwrite enabled' : '';
+      const { unauthorized, authorized, superuser } = createTests(overwrite!);
+      const _addTests = (user: TestUser, tests: BulkCreateTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, tests });
+      };
 
-    bulkCreateTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingSpace: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.allGlobally].forEach(user => {
+        _addTests(user, authorized);
+      });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts
index fde98694fe575..69494ed254669 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_get.ts
@@ -4,175 +4,81 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
+import {
+  bulkGetTestSuiteFactory,
+  TEST_CASES as CASES,
+  BulkGetTestDefinition,
+} from '../../common/suites/bulk_get';
+
+const { fail400, fail404 } = testCaseFailures;
+
+const createTestCases = () => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404() },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404() },
+    CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404() },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail400() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  const {
-    bulkGetTest,
-    createExpectResults,
-    createExpectRbacForbidden,
-    expectedForbiddenTypesWithHiddenType,
-    expectBadRequestForHiddenType,
-  } = bulkGetTestSuiteFactory(esArchiver, supertest);
+  const { addTests, createTestDefinitions, expectForbidden } = bulkGetTestSuiteFactory(
+    esArchiver,
+    supertest
+  );
+  const createTests = () => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases();
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false, { singleRequest: true }),
+        createTestDefinitions(hiddenType, true),
+        createTestDefinitions(allTypes, true, {
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['hiddentype']),
+        }),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, { singleRequest: true }),
+    };
+  };
 
   describe('_bulk_get', () => {
-    bulkGetTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkGetTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        includingHiddenType: {
-          statusCode: 200,
-          response: expectBadRequestForHiddenType,
-        },
-      },
-    });
-
-    bulkGetTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkGetTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(['hiddentype']),
-        },
-      },
-    });
-
-    bulkGetTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(['hiddentype']),
-        },
-      },
-    });
-
-    bulkGetTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(['hiddentype']),
-        },
-      },
-    });
-
-    bulkGetTest(`rbac user with read globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(['hiddentype']),
-        },
-      },
-    });
-
-    bulkGetTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkGetTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
-
-    bulkGetTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
-    });
+    getTestScenarios().security.forEach(({ users }) => {
+      const { unauthorized, authorized, superuser } = createTests();
+      const _addTests = (user: TestUser, tests: BulkGetTestDefinition[]) => {
+        addTests(user.description, { user, tests });
+      };
 
-    bulkGetTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(),
-        },
-        includingHiddenType: {
-          statusCode: 403,
-          response: createExpectRbacForbidden(expectedForbiddenTypesWithHiddenType),
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.dualRead, users.allGlobally, users.readGlobally].forEach(user => {
+        _addTests(user, authorized);
+      });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_update.ts b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_update.ts
index 6f4635f17cf8c..fb169f4c6fb86 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_update.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_update.ts
@@ -4,268 +4,83 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkUpdateTestSuiteFactory } from '../../common/suites/bulk_update';
+import {
+  bulkUpdateTestSuiteFactory,
+  TEST_CASES as CASES,
+  BulkUpdateTestDefinition,
+} from '../../common/suites/bulk_update';
+
+const { fail404 } = testCaseFailures;
+
+const createTestCases = () => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404() },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404() },
+    CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404() },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail404() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('bulkUpdate', () => {
-    const {
-      createExpectDoesntExistNotFound,
-      expectDoesntExistRbacForbidden,
-      expectNotSpaceAwareResults,
-      expectNotSpaceAwareRbacForbidden,
-      expectSpaceAwareRbacForbidden,
-      expectSpaceAwareResults,
-      expectSpaceNotFound,
-      expectHiddenTypeRbacForbidden,
-      expectHiddenTypeRbacForbiddenWithGlobalAllowed,
-      bulkUpdateTest,
-    } = bulkUpdateTestSuiteFactory(esArchiver, supertest);
-
-    bulkUpdateTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    bulkUpdateTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectSpaceNotFound,
-        },
-        doesntExist: {
-          statusCode: 200,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
+  const { addTests, createTestDefinitions, expectForbidden } = bulkUpdateTestSuiteFactory(
+    esArchiver,
+    supertest
+  );
+  const createTests = () => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases();
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false, { singleRequest: true }),
+        createTestDefinitions(hiddenType, true),
+        createTestDefinitions(allTypes, true, {
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['hiddentype']),
+        }),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, { singleRequest: true }),
+    };
+  };
 
-    bulkUpdateTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    bulkUpdateTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbiddenWithGlobalAllowed,
-        },
-        doesntExist: {
-          statusCode: 200,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
-
-    bulkUpdateTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    bulkUpdateTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbiddenWithGlobalAllowed,
-        },
-        doesntExist: {
-          statusCode: 200,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
-
-    bulkUpdateTest(`rbac user with read globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    bulkUpdateTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    bulkUpdateTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    bulkUpdateTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
+  describe('_bulk_update', () => {
+    getTestScenarios().security.forEach(({ users }) => {
+      const { unauthorized, authorized, superuser } = createTests();
+      const _addTests = (user: TestUser, tests: BulkUpdateTestDefinition[]) => {
+        addTests(user.description, { user, tests });
+      };
 
-    bulkUpdateTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.allGlobally].forEach(user => {
+        _addTests(user, authorized);
+      });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/create.ts b/x-pack/test/saved_object_api_integration/security_only/apis/create.ts
index 60a9fa0a86aa6..dc8e564e42477 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/create.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/create.ts
@@ -4,222 +4,79 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { createTestSuiteFactory } from '../../common/suites/create';
+import {
+  createTestSuiteFactory,
+  TEST_CASES as CASES,
+  CreateTestDefinition,
+} from '../../common/suites/create';
 
-export default function({ getService }: FtrProviderContext) {
-  const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('legacyEs');
-  const esArchiver = getService('esArchiver');
-
-  const {
-    createTest,
-    createExpectSpaceAwareResults,
-    expectNotSpaceAwareResults,
-    expectNotSpaceAwareRbacForbidden,
-    expectSpaceAwareRbacForbidden,
-    expectBadRequestForHiddenType,
-    expectHiddenTypeRbacForbidden,
-  } = createTestSuiteFactory(es, esArchiver, supertestWithoutAuth);
-
-  describe('create', () => {
-    createTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
+const { fail400, fail409 } = testCaseFailures;
 
-    createTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 400,
-          response: expectBadRequestForHiddenType,
-        },
-      },
-    });
-
-    createTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
+const createTestCases = (overwrite: boolean) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(!overwrite) },
+    CASES.SINGLE_NAMESPACE_SPACE_1,
+    CASES.SINGLE_NAMESPACE_SPACE_2,
+    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail409(!overwrite) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409() },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_MULTI_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail400() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
-    createTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
-
-    createTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
-
-    createTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
-
-    createTest(`rbac user with read globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
-
-    createTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
+export default function({ getService }: FtrProviderContext) {
+  const supertest = getService('supertestWithoutAuth');
+  const esArchiver = getService('esArchiver');
+  const es = getService('legacyEs');
 
-    createTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = createTestSuiteFactory(es, esArchiver, supertest);
+  const createTests = (overwrite: boolean) => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases(overwrite);
+    return {
+      unauthorized: createTestDefinitions(allTypes, true, overwrite),
+      authorized: [
+        createTestDefinitions(normalTypes, false, overwrite),
+        createTestDefinitions(hiddenType, true, overwrite),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false, overwrite),
+    };
+  };
 
-    createTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
-    });
+  describe('_create', () => {
+    getTestScenarios([false, true]).security.forEach(({ users, modifier: overwrite }) => {
+      const suffix = overwrite ? ' with overwrite enabled' : '';
+      const { unauthorized, authorized, superuser } = createTests(overwrite!);
+      const _addTests = (user: TestUser, tests: CreateTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, tests });
+      };
 
-    createTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.allGlobally].forEach(user => {
+        _addTests(user, authorized);
+      });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts b/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts
index f775b5a365d6b..05939197be352 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/delete.ts
@@ -4,266 +4,75 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { deleteTestSuiteFactory } from '../../common/suites/delete';
+import {
+  deleteTestSuiteFactory,
+  TEST_CASES as CASES,
+  DeleteTestDefinition,
+} from '../../common/suites/delete';
+
+const { fail404 } = testCaseFailures;
+
+const createTestCases = () => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404() },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404() },
+    CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404() },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail404() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('delete', () => {
-    const {
-      createExpectUnknownDocNotFound,
-      deleteTest,
-      expectEmpty,
-      expectRbacSpaceAwareForbidden,
-      expectRbacNotSpaceAwareForbidden,
-      expectRbacInvalidIdForbidden,
-      expectRbacHiddenTypeForbidden: expectRbacSpaceTypeForbidden,
-      expectGenericNotFound,
-    } = deleteTestSuiteFactory(esArchiver, supertest);
-
-    deleteTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectRbacSpaceAwareForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectRbacNotSpaceAwareForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 403,
-          response: expectRbacInvalidIdForbidden,
-        },
-      },
-    });
-
-    deleteTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectGenericNotFound,
-        },
-        invalidId: {
-          statusCode: 404,
-          response: createExpectUnknownDocNotFound(),
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = deleteTestSuiteFactory(esArchiver, supertest);
+  const createTests = () => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases();
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false),
+        createTestDefinitions(hiddenType, true),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false),
+    };
+  };
 
-    deleteTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectRbacSpaceAwareForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectRbacNotSpaceAwareForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 403,
-          response: expectRbacInvalidIdForbidden,
-        },
-      },
-    });
-
-    deleteTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 404,
-          response: createExpectUnknownDocNotFound(),
-        },
-      },
-    });
-
-    deleteTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectRbacSpaceAwareForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectRbacNotSpaceAwareForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 403,
-          response: expectRbacInvalidIdForbidden,
-        },
-      },
-    });
-
-    deleteTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 404,
-          response: createExpectUnknownDocNotFound(),
-        },
-      },
-    });
-
-    deleteTest(`rbac user with read globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectRbacSpaceAwareForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectRbacNotSpaceAwareForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 403,
-          response: expectRbacInvalidIdForbidden,
-        },
-      },
-    });
-
-    deleteTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectRbacSpaceAwareForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectRbacNotSpaceAwareForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 403,
-          response: expectRbacInvalidIdForbidden,
-        },
-      },
-    });
-
-    deleteTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectRbacSpaceAwareForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectRbacNotSpaceAwareForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 403,
-          response: expectRbacInvalidIdForbidden,
-        },
-      },
-    });
-
-    deleteTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectRbacSpaceAwareForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectRbacNotSpaceAwareForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 403,
-          response: expectRbacInvalidIdForbidden,
-        },
-      },
-    });
+  describe('_delete', () => {
+    getTestScenarios().security.forEach(({ users }) => {
+      const { unauthorized, authorized, superuser } = createTests();
+      const _addTests = (user: TestUser, tests: DeleteTestDefinition[]) => {
+        addTests(user.description, { user, tests });
+      };
 
-    deleteTest(`rbac user with readonly at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectRbacSpaceAwareForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectRbacNotSpaceAwareForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacSpaceTypeForbidden,
-        },
-        invalidId: {
-          statusCode: 403,
-          response: expectRbacInvalidIdForbidden,
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.allGlobally].forEach(user => {
+        _addTests(user, authorized);
+      });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/export.ts b/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
index 2a2c3a9b90b08..0fae45a1897a7 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
@@ -4,252 +4,75 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { exportTestSuiteFactory } from '../../common/suites/export';
+import {
+  exportTestSuiteFactory,
+  getTestCases,
+  ExportTestDefinition,
+} from '../../common/suites/export';
+
+const createTestCases = () => {
+  const cases = getTestCases();
+  const exportableTypes = [
+    cases.singleNamespaceObject,
+    cases.singleNamespaceType,
+    cases.namespaceAgnosticObject,
+    cases.namespaceAgnosticType,
+  ];
+  const nonExportableTypes = [
+    cases.multiNamespaceObject,
+    cases.multiNamespaceType,
+    cases.hiddenObject,
+    cases.hiddenType,
+  ];
+  const allTypes = exportableTypes.concat(nonExportableTypes);
+  return { exportableTypes, nonExportableTypes, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('export', () => {
-    const {
-      createExpectRbacForbidden,
-      expectTypeOrObjectsRequired,
-      createExpectVisualizationResults,
-      expectInvalidTypeSpecified,
-      exportTest,
-    } = exportTestSuiteFactory(esArchiver, supertest);
-
-    exportTest('user with no access', {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'forbidden login and find visualization message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
-
-    exportTest('superuser', {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
-
-    exportTest('legacy user', {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'forbidden login and find visualization message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
-
-    exportTest('dual-privileges user', {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
-
-    exportTest('dual-privileges readonly user', {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
-
-    exportTest('rbac user with all globally', {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
-
-    exportTest('rbac user with read globally', {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = exportTestSuiteFactory(esArchiver, supertest);
+  const createTests = () => {
+    const { exportableTypes, nonExportableTypes, allTypes } = createTestCases();
+    return {
+      unauthorized: [
+        createTestDefinitions(exportableTypes, true),
+        createTestDefinitions(nonExportableTypes, false),
+      ].flat(),
+      authorized: createTestDefinitions(allTypes, false),
+    };
+  };
 
-    exportTest('rbac user with all at default space', {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
-
-    exportTest('rbac user with read at default space', {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
-
-    exportTest('rbac user with all at space_1', {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
+  describe('_export', () => {
+    getTestScenarios().security.forEach(({ users }) => {
+      const { unauthorized, authorized } = createTests();
+      const _addTests = (user: TestUser, tests: ExportTestDefinition[]) => {
+        addTests(user.description, { user, tests });
+      };
 
-    exportTest('rbac user with read at space_1', {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [
+        users.dualAll,
+        users.dualRead,
+        users.allGlobally,
+        users.readGlobally,
+        users.superuser,
+      ].forEach(user => {
+        _addTests(user, authorized);
+      });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/find.ts b/x-pack/test/saved_object_api_integration/security_only/apis/find.ts
index 64d85a199e7bc..97513783b94b9 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/find.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/find.ts
@@ -4,749 +4,70 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { findTestSuiteFactory } from '../../common/suites/find';
+import { findTestSuiteFactory, getTestCases, FindTestDefinition } from '../../common/suites/find';
+
+const createTestCases = () => {
+  const cases = getTestCases();
+  const normalTypes = [
+    cases.singleNamespaceType,
+    cases.multiNamespaceType,
+    cases.namespaceAgnosticType,
+    cases.pageBeyondTotal,
+    cases.unknownSearchField,
+    cases.filterWithNamespaceAgnosticType,
+    cases.filterWithDisallowedType,
+  ];
+  const hiddenAndUnknownTypes = [
+    cases.hiddenType,
+    cases.unknownType,
+    cases.filterWithHiddenType,
+    cases.filterWithUnknownType,
+  ];
+  const allTypes = normalTypes.concat(hiddenAndUnknownTypes);
+  return { normalTypes, hiddenAndUnknownTypes, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('find', () => {
-    const {
-      createExpectEmpty,
-      createExpectRbacForbidden,
-      createExpectVisualizationResults,
-      expectFilterWrongTypeError,
-      expectNotSpaceAwareResults,
-      expectTypeRequired,
-      findTest,
-    } = findTestSuiteFactory(esArchiver, supertest);
-
-    findTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'forbidden login and find visualization message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        notSpaceAwareType: {
-          description: 'forbidden login and find globaltype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        hiddenType: {
-          description: 'forbidden login and find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'forbidden login and find visualization message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        unknownSearchField: {
-          description: 'forbidden login and unknown search field',
-          statusCode: 403,
-          response: createExpectRbacForbidden('url'),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'forbidden login and find globaltype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        filterWithHiddenType: {
-          description: 'forbidden login and find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'forbidden',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-      },
-    });
-
-    findTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        unknownType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(100, 100, 1),
-        },
-        unknownSearchField: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        filterWithHiddenType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        filterWithUnknownType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'Bad Request',
-          statusCode: 400,
-          response: expectFilterWrongTypeError,
-        },
-      },
-    });
-
-    findTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'forbidden login and find visualization message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        notSpaceAwareType: {
-          description: 'forbidden login and find globaltype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        hiddenType: {
-          description: 'forbidden login and find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'forbidden login and find visualization message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        unknownSearchField: {
-          description: 'forbidden login and unknown search field',
-          statusCode: 403,
-          response: createExpectRbacForbidden('url'),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'forbidden login and find globaltype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        filterWithHiddenType: {
-          description: 'forbidden login and find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'forbidden',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-      },
-    });
-
-    findTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(100, 100, 1),
-        },
-        unknownSearchField: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        filterWithHiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'Bad Request',
-          statusCode: 400,
-          response: expectFilterWrongTypeError,
-        },
-      },
-    });
-
-    findTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(100, 100, 1),
-        },
-        unknownSearchField: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        filterWithHiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'Bad Request',
-          statusCode: 400,
-          response: expectFilterWrongTypeError,
-        },
-      },
-    });
-
-    findTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(100, 100, 1),
-        },
-        unknownSearchField: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        filterWithHiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'Bad Request',
-          statusCode: 400,
-          response: expectFilterWrongTypeError,
-        },
-      },
-    });
-
-    findTest(`rbac user with read globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(100, 100, 1),
-        },
-        unknownSearchField: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        filterWithHiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'Bad Request',
-          statusCode: 400,
-          response: expectFilterWrongTypeError,
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = findTestSuiteFactory(esArchiver, supertest);
+  const createTests = () => {
+    const { normalTypes, hiddenAndUnknownTypes, allTypes } = createTestCases();
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false),
+        createTestDefinitions(hiddenAndUnknownTypes, true),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false),
+    };
+  };
 
-    findTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        hiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        unknownSearchField: {
-          description: 'forbidden login and unknown search field',
-          statusCode: 403,
-          response: createExpectRbacForbidden('url'),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        filterWithHiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'forbidden',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-      },
-    });
-
-    findTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        hiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        unknownSearchField: {
-          description: 'forbidden login and unknown search field',
-          statusCode: 403,
-          response: createExpectRbacForbidden('url'),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        filterWithHiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'forbidden',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-      },
-    });
-
-    findTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        hiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        unknownSearchField: {
-          description: 'forbidden login and unknown search field',
-          statusCode: 403,
-          response: createExpectRbacForbidden('url'),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        filterWithHiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'forbidden',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-      },
-    });
+  describe('_find', () => {
+    getTestScenarios().security.forEach(({ users }) => {
+      const { unauthorized, authorized, superuser } = createTests();
+      const _addTests = (user: TestUser, tests: FindTestDefinition[]) => {
+        addTests(user.description, { user, tests });
+      };
 
-    findTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        notSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        hiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        unknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 403,
-          response: createExpectRbacForbidden('visualization'),
-        },
-        unknownSearchField: {
-          description: 'forbidden login and unknown search field',
-          statusCode: 403,
-          response: createExpectRbacForbidden('url'),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the globaltype',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-        filterWithHiddenType: {
-          description: 'forbidden find hiddentype message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('hiddentype'),
-        },
-        filterWithUnknownType: {
-          description: 'forbidden find wigwags message',
-          statusCode: 403,
-          response: createExpectRbacForbidden('wigwags'),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'forbidden',
-          statusCode: 403,
-          response: createExpectRbacForbidden('globaltype'),
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.dualRead, users.allGlobally, users.readGlobally].forEach(user => {
+        _addTests(user, authorized);
+      });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/get.ts b/x-pack/test/saved_object_api_integration/security_only/apis/get.ts
index 2a31463fce8b2..7cd50fe4cea61 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/get.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/get.ts
@@ -4,267 +4,73 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { getTestSuiteFactory } from '../../common/suites/get';
+import {
+  getTestSuiteFactory,
+  TEST_CASES as CASES,
+  GetTestDefinition,
+} from '../../common/suites/get';
+
+const { fail404 } = testCaseFailures;
+
+const createTestCases = () => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404() },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404() },
+    CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404() },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail404() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  const {
-    createExpectDoesntExistNotFound,
-    createExpectSpaceAwareResults,
-    createExpectNotSpaceAwareResults,
-    expectSpaceAwareRbacForbidden,
-    expectNotSpaceAwareRbacForbidden,
-    expectDoesntExistRbacForbidden,
-    expectHiddenTypeRbacForbidden,
-    expectHiddenTypeNotFound,
-    getTest,
-  } = getTestSuiteFactory(esArchiver, supertest);
-
-  describe('get', () => {
-    getTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    getTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: createExpectNotSpaceAwareResults(),
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectHiddenTypeNotFound,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = getTestSuiteFactory(esArchiver, supertest);
+  const createTests = () => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases();
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false),
+        createTestDefinitions(hiddenType, true),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false),
+    };
+  };
 
-    getTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    getTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: createExpectNotSpaceAwareResults(),
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
-
-    getTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: createExpectNotSpaceAwareResults(),
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
-
-    getTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: createExpectNotSpaceAwareResults(),
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
-
-    getTest(`rbac user with read globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: createExpectNotSpaceAwareResults(),
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
-
-    getTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    getTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    getTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
+  describe('_get', () => {
+    getTestScenarios().security.forEach(({ users }) => {
+      const { unauthorized, authorized, superuser } = createTests();
+      const _addTests = (user: TestUser, tests: GetTestDefinition[]) => {
+        addTests(user.description, { user, tests });
+      };
 
-    getTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.dualRead, users.allGlobally, users.readGlobally].forEach(user => {
+        _addTests(user, authorized);
+      });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/import.ts b/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
index 770410dcfed81..5a6e530b02939 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
@@ -4,223 +4,87 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { importTestSuiteFactory } from '../../common/suites/import';
+import {
+  importTestSuiteFactory,
+  TEST_CASES as CASES,
+  ImportTestDefinition,
+} from '../../common/suites/import';
+
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = () => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const importableTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409() },
+    CASES.SINGLE_NAMESPACE_SPACE_1,
+    CASES.SINGLE_NAMESPACE_SPACE_2,
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409() },
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const nonImportableTypes = [
+    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
+    { ...CASES.HIDDEN, ...fail400() },
+    { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  ];
+  const allTypes = importableTypes.concat(nonImportableTypes);
+  return { importableTypes, nonImportableTypes, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    importTest,
-    createExpectResults,
-    expectRbacForbidden,
-    expectUnknownTypeUnsupported,
-    expectResultsWithUnsupportedHiddenType,
-  } = importTestSuiteFactory(es, esArchiver, supertest);
+  const { addTests, createTestDefinitions, expectForbidden } = importTestSuiteFactory(
+    es,
+    esArchiver,
+    supertest
+  );
+  const createTests = () => {
+    const { importableTypes, nonImportableTypes, allTypes } = createTestCases();
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: [
+        createTestDefinitions(importableTypes, true),
+        createTestDefinitions(nonImportableTypes, false, { singleRequest: true }),
+        createTestDefinitions(allTypes, true, {
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['dashboard', 'globaltype', 'isolatedtype']),
+        }),
+      ].flat(),
+      authorized: createTestDefinitions(allTypes, false, { singleRequest: true }),
+    };
+  };
 
   describe('_import', () => {
-    importTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    importTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        hiddenType: {
-          // import filters out the space type, so the remaining objects will import successfully
-          statusCode: 200,
-          response: expectResultsWithUnsupportedHiddenType,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
-    });
-
-    importTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    importTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        hiddenType: {
-          // import filters out the space type, so the remaining objects will import successfully
-          statusCode: 200,
-          response: expectResultsWithUnsupportedHiddenType,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
-    });
-
-    importTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    importTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        hiddenType: {
-          // import filters out the space type, so the remaining objects will import successfully
-          statusCode: 200,
-          response: expectResultsWithUnsupportedHiddenType,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
-    });
-
-    importTest(`rbac readonly user`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    importTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    importTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    importTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
+    getTestScenarios().security.forEach(({ users }) => {
+      const { unauthorized, authorized } = createTests();
+      const _addTests = (user: TestUser, tests: ImportTestDefinition[]) => {
+        addTests(user.description, { user, tests });
+      };
 
-    importTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.allGlobally, users.superuser].forEach(user => {
+        _addTests(user, authorized);
+      });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/index.ts b/x-pack/test/saved_object_api_integration/security_only/apis/index.ts
index bb637a9bc4c90..f581e18ff17af 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/index.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/index.ts
@@ -20,6 +20,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./bulk_create'));
     loadTestFile(require.resolve('./bulk_get'));
+    loadTestFile(require.resolve('./bulk_update'));
     loadTestFile(require.resolve('./create'));
     loadTestFile(require.resolve('./delete'));
     loadTestFile(require.resolve('./export'));
@@ -28,6 +29,5 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./import'));
     loadTestFile(require.resolve('./resolve_import_errors'));
     loadTestFile(require.resolve('./update'));
-    loadTestFile(require.resolve('./bulk_update'));
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
index 59d50c16c259a..f945d2b64c432 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
@@ -4,221 +4,88 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors';
+import {
+  resolveImportErrorsTestSuiteFactory,
+  TEST_CASES as CASES,
+  ResolveImportErrorsTestDefinition,
+} from '../../common/suites/resolve_import_errors';
+
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (overwrite: boolean) => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const importableTypes = [
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(!overwrite) },
+    CASES.SINGLE_NAMESPACE_SPACE_1,
+    CASES.SINGLE_NAMESPACE_SPACE_2,
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const nonImportableTypes = [
+    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
+    { ...CASES.HIDDEN, ...fail400() },
+    { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  ];
+  const allTypes = importableTypes.concat(nonImportableTypes);
+  return { importableTypes, nonImportableTypes, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    resolveImportErrorsTest,
-    createExpectResults,
-
-    expectRbacForbidden,
-    expectUnknownTypeUnsupported,
-    expectHiddenTypeUnsupported,
-  } = resolveImportErrorsTestSuiteFactory(es, esArchiver, supertest);
+  const { addTests, createTestDefinitions, expectForbidden } = resolveImportErrorsTestSuiteFactory(
+    es,
+    esArchiver,
+    supertest
+  );
+  const createTests = (overwrite: boolean) => {
+    const { importableTypes, nonImportableTypes, allTypes } = createTestCases(overwrite);
+    // use singleRequest to reduce execution time and/or test combined cases
+    return {
+      unauthorized: [
+        createTestDefinitions(importableTypes, true, overwrite),
+        createTestDefinitions(nonImportableTypes, false, overwrite, { singleRequest: true }),
+        createTestDefinitions(allTypes, true, overwrite, {
+          singleRequest: true,
+          responseBodyOverride: expectForbidden(['dashboard', 'globaltype', 'isolatedtype']),
+        }),
+      ].flat(),
+      authorized: createTestDefinitions(allTypes, false, overwrite, { singleRequest: true }),
+    };
+  };
 
   describe('_resolve_import_errors', () => {
-    resolveImportErrorsTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectHiddenTypeUnsupported,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectHiddenTypeUnsupported,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(),
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectHiddenTypeUnsupported,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`rbac readonly user`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
-
-    resolveImportErrorsTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
-    });
+    getTestScenarios([false, true]).security.forEach(({ users, modifier: overwrite }) => {
+      const suffix = overwrite ? ' with overwrite enabled' : '';
+      const { unauthorized, authorized } = createTests(overwrite!);
+      const _addTests = (user: TestUser, tests: ResolveImportErrorsTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, tests });
+      };
 
-    resolveImportErrorsTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        default: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-        unknownType: {
-          statusCode: 403,
-          response: expectRbacForbidden,
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.allGlobally, users.superuser].forEach(user => {
+        _addTests(user, authorized);
+      });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/update.ts b/x-pack/test/saved_object_api_integration/security_only/apis/update.ts
index 8564296bdf558..e1e3a5f8a7dc7 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/update.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/update.ts
@@ -4,267 +4,75 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
+import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { updateTestSuiteFactory } from '../../common/suites/update';
+import {
+  updateTestSuiteFactory,
+  TEST_CASES as CASES,
+  UpdateTestDefinition,
+} from '../../common/suites/update';
+
+const { fail404 } = testCaseFailures;
+
+const createTestCases = () => {
+  // for each permitted (non-403) outcome, if failure !== undefined then we expect
+  // to receive an error; otherwise, we expect to receive a success result
+  const normalTypes = [
+    CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404() },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404() },
+    CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404() },
+    CASES.NAMESPACE_AGNOSTIC,
+    { ...CASES.DOES_NOT_EXIST, ...fail404() },
+  ];
+  const hiddenType = [{ ...CASES.HIDDEN, ...fail404() }];
+  const allTypes = normalTypes.concat(hiddenType);
+  return { normalTypes, hiddenType, allTypes };
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
-  describe('update', () => {
-    const {
-      createExpectDoesntExistNotFound,
-      expectDoesntExistRbacForbidden,
-      expectNotSpaceAwareResults,
-      expectNotSpaceAwareRbacForbidden,
-      expectSpaceAwareRbacForbidden,
-      expectSpaceAwareResults,
-      expectSpaceNotFound,
-      expectHiddenTypeRbacForbidden,
-      updateTest,
-    } = updateTestSuiteFactory(esArchiver, supertest);
-
-    updateTest(`user with no access`, {
-      user: AUTHENTICATION.NOT_A_KIBANA_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    updateTest(`superuser`, {
-      user: AUTHENTICATION.SUPERUSER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectSpaceNotFound,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = updateTestSuiteFactory(esArchiver, supertest);
+  const createTests = () => {
+    const { normalTypes, hiddenType, allTypes } = createTestCases();
+    return {
+      unauthorized: createTestDefinitions(allTypes, true),
+      authorized: [
+        createTestDefinitions(normalTypes, false),
+        createTestDefinitions(hiddenType, true),
+      ].flat(),
+      superuser: createTestDefinitions(allTypes, false),
+    };
+  };
 
-    updateTest(`legacy user`, {
-      user: AUTHENTICATION.KIBANA_LEGACY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    updateTest(`dual-privileges user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
-
-    updateTest(`dual-privileges readonly user`, {
-      user: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    updateTest(`rbac user with all globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
-    });
-
-    updateTest(`rbac user with read globally`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    updateTest(`rbac user with all at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    updateTest(`rbac user with read at default space`, {
-      user: AUTHENTICATION.KIBANA_RBAC_DEFAULT_SPACE_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
-
-    updateTest(`rbac user with all at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_ALL_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
-    });
+  describe('_update', () => {
+    getTestScenarios().security.forEach(({ users }) => {
+      const { unauthorized, authorized, superuser } = createTests();
+      const _addTests = (user: TestUser, tests: UpdateTestDefinition[]) => {
+        addTests(user.description, { user, tests });
+      };
 
-    updateTest(`rbac user with read at space_1`, {
-      user: AUTHENTICATION.KIBANA_RBAC_SPACE_1_READ_USER,
-      tests: {
-        spaceAware: {
-          statusCode: 403,
-          response: expectSpaceAwareRbacForbidden,
-        },
-        notSpaceAware: {
-          statusCode: 403,
-          response: expectNotSpaceAwareRbacForbidden,
-        },
-        hiddenType: {
-          statusCode: 403,
-          response: expectHiddenTypeRbacForbidden,
-        },
-        doesntExist: {
-          statusCode: 403,
-          response: expectDoesntExistRbacForbidden,
-        },
-      },
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.allAtDefaultSpace,
+        users.readAtDefaultSpace,
+        users.allAtSpace1,
+        users.readAtSpace1,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.allGlobally].forEach(user => {
+        _addTests(user, authorized);
+      });
+      _addTests(users.superuser, superuser);
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
index 690e358b744d5..70d74822a8b0f 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
@@ -6,83 +6,72 @@
 
 import expect from '@kbn/expect';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create';
+import { bulkCreateTestSuiteFactory, TEST_CASES as CASES } from '../../common/suites/bulk_create';
 
-const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => {
-  expect(resp.body).to.eql({
-    error: 'Bad Request',
-    message: '[request body.0.namespace]: definition for this key is missing',
-    statusCode: 400,
-  });
-};
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (overwrite: boolean, spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  {
+    ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
+  },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+  {
+    ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    ...fail409(!overwrite || (spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID)),
+  },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409(!overwrite || spaceId !== SPACE_1_ID) },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409(!overwrite || spaceId !== SPACE_2_ID) },
+  { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+  { ...CASES.HIDDEN, ...fail400() },
+  CASES.NEW_SINGLE_NAMESPACE_OBJ,
+  CASES.NEW_MULTI_NAMESPACE_OBJ,
+  CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+];
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    bulkCreateTest,
-    createExpectResults,
-    expectBadRequestForHiddenType,
-  } = bulkCreateTestSuiteFactory(es, esArchiver, supertest);
-
-  describe('_bulk_create', () => {
-    bulkCreateTest('in the current space (space_1)', {
-      ...SPACES.SPACE_1,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(SPACES.SPACE_1.spaceId),
-        },
-        includingSpace: {
-          statusCode: 200,
-          response: expectBadRequestForHiddenType,
-        },
-        custom: {
-          description: 'when a namespace is specified on the saved object',
-          requestBody: [
-            {
-              type: 'visualization',
-              namespace: 'space_1',
-              attributes: {
-                title: 'something',
-              },
-            },
-          ],
-          statusCode: 400,
-          response: expectNamespaceSpecifiedBadRequest,
+  const { addTests, createTestDefinitions } = bulkCreateTestSuiteFactory(es, esArchiver, supertest);
+  const createTests = (overwrite: boolean, spaceId: string) => {
+    const testCases = createTestCases(overwrite, spaceId);
+    return createTestDefinitions(testCases, false, overwrite, {
+      spaceId,
+      singleRequest: true,
+    }).concat(
+      ['namespace', 'namespaces'].map(key => ({
+        title: `(bad request) when ${key} is specified on the saved object`,
+        request: [{ type: 'isolatedtype', id: 'some-id', [key]: 'any-value' }] as any,
+        responseStatusCode: 400,
+        responseBody: async (response: Record<string, any>) => {
+          expect(response.body).to.eql({
+            statusCode: 400,
+            error: 'Bad Request',
+            message: `[request body.0.${key}]: definition for this key is missing`,
+          });
         },
-      },
-    });
+        overwrite,
+      }))
+    );
+  };
 
-    bulkCreateTest('in the default space', {
-      ...SPACES.DEFAULT,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(SPACES.DEFAULT.spaceId),
-        },
-        includingSpace: {
-          statusCode: 200,
-          response: expectBadRequestForHiddenType,
-        },
-        custom: {
-          description: 'when a namespace is specified on the saved object',
-          requestBody: [
-            {
-              type: 'visualization',
-              namespace: 'space_1',
-              attributes: {
-                title: 'something',
-              },
-            },
-          ],
-          statusCode: 400,
-          response: expectNamespaceSpecifiedBadRequest,
-        },
-      },
+  describe('_bulk_create', () => {
+    getTestScenarios([false, true]).spaces.forEach(({ spaceId, modifier: overwrite }) => {
+      const suffix = overwrite ? ' with overwrite enabled' : '';
+      const tests = createTests(overwrite!, spaceId);
+      addTests(`within the ${spaceId} space${suffix}`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts
index bed29f8eb39a1..ad10719750585 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_get.ts
@@ -5,48 +5,48 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkGetTestSuiteFactory } from '../../common/suites/bulk_get';
+import { bulkGetTestSuiteFactory, TEST_CASES as CASES } from '../../common/suites/bulk_get';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  {
+    ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+  },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  CASES.NAMESPACE_AGNOSTIC,
+  { ...CASES.HIDDEN, ...fail400() },
+  { ...CASES.DOES_NOT_EXIST, ...fail404() },
+];
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  const {
-    bulkGetTest,
-    createExpectResults,
-    createExpectNotFoundResults,
-    expectBadRequestForHiddenType,
-  } = bulkGetTestSuiteFactory(esArchiver, supertest);
+  const { addTests, createTestDefinitions } = bulkGetTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    return createTestDefinitions(testCases, false, { singleRequest: true });
+  };
 
   describe('_bulk_get', () => {
-    bulkGetTest(`objects within the current space (space_1)`, {
-      ...SPACES.SPACE_1,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(SPACES.SPACE_1.spaceId),
-        },
-        includingHiddenType: {
-          statusCode: 200,
-          response: expectBadRequestForHiddenType,
-        },
-      },
-    });
-
-    bulkGetTest(`objects within another space`, {
-      ...SPACES.SPACE_1,
-      otherSpaceId: SPACES.SPACE_2.spaceId,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectNotFoundResults(SPACES.SPACE_2.spaceId),
-        },
-        includingHiddenType: {
-          statusCode: 200,
-          response: expectBadRequestForHiddenType,
-        },
-      },
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createTests(spaceId);
+      addTests(`within the ${spaceId} space`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_update.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_update.ts
index 0681908a765ce..be6ce9e30c56e 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_update.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_update.ts
@@ -5,88 +5,48 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { bulkUpdateTestSuiteFactory } from '../../common/suites/bulk_update';
+import { bulkUpdateTestSuiteFactory, TEST_CASES as CASES } from '../../common/suites/bulk_update';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  {
+    ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+  },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  CASES.NAMESPACE_AGNOSTIC,
+  { ...CASES.HIDDEN, ...fail404() },
+  { ...CASES.DOES_NOT_EXIST, ...fail404() },
+];
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  describe('bulkUpdate', () => {
-    const {
-      createExpectSpaceAwareNotFound,
-      expectSpaceAwareResults,
-      createExpectDoesntExistNotFound,
-      expectNotSpaceAwareResults,
-      expectSpaceNotFound,
-      bulkUpdateTest,
-    } = bulkUpdateTestSuiteFactory(esArchiver, supertest);
-
-    bulkUpdateTest(`in the default space`, {
-      spaceId: SPACES.DEFAULT.spaceId,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectSpaceNotFound,
-        },
-        doesntExist: {
-          statusCode: 200,
-          response: createExpectDoesntExistNotFound(SPACES.DEFAULT.spaceId),
-        },
-      },
-    });
-
-    bulkUpdateTest('in the current space (space_1)', {
-      spaceId: SPACES.SPACE_1.spaceId,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectSpaceNotFound,
-        },
-        doesntExist: {
-          statusCode: 200,
-          response: createExpectDoesntExistNotFound(SPACES.SPACE_1.spaceId),
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = bulkUpdateTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    return createTestDefinitions(testCases, false, { singleRequest: true });
+  };
 
-    bulkUpdateTest('objects that exist in another space (space_1)', {
-      spaceId: SPACES.DEFAULT.spaceId,
-      otherSpaceId: SPACES.SPACE_1.spaceId,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareNotFound(SPACES.SPACE_1.spaceId),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectSpaceNotFound,
-        },
-        doesntExist: {
-          statusCode: 200,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
+  describe('_bulk_update', () => {
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createTests(spaceId);
+      addTests(`within the ${spaceId} space`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts
index 3bd4019649363..d0c6a21e73971 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts
@@ -4,90 +4,56 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import expect from '@kbn/expect';
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { createTestSuiteFactory } from '../../common/suites/create';
+import { createTestSuiteFactory, TEST_CASES as CASES } from '../../common/suites/create';
 
-const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => {
-  expect(resp.body).to.eql({
-    error: 'Bad Request',
-    message: '[request body.namespace]: definition for this key is missing',
-    statusCode: 400,
-  });
-};
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (overwrite: boolean, spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  {
+    ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
+  },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+  {
+    ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    ...fail409(!overwrite || (spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID)),
+  },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409(!overwrite || spaceId !== SPACE_1_ID) },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409(!overwrite || spaceId !== SPACE_2_ID) },
+  { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+  { ...CASES.HIDDEN, ...fail400() },
+  CASES.NEW_SINGLE_NAMESPACE_OBJ,
+  CASES.NEW_MULTI_NAMESPACE_OBJ,
+  CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+];
 
 export default function({ getService }: FtrProviderContext) {
-  const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('legacyEs');
+  const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
+  const es = getService('legacyEs');
 
-  const {
-    createTest,
-    createExpectSpaceAwareResults,
-    expectNotSpaceAwareResults,
-    expectBadRequestForHiddenType,
-  } = createTestSuiteFactory(es, esArchiver, supertestWithoutAuth);
-
-  describe('create', () => {
-    createTest('in the current space (space_1)', {
-      ...SPACES.SPACE_1,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(SPACES.SPACE_1.spaceId),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 400,
-          response: expectBadRequestForHiddenType,
-        },
-        custom: {
-          description: 'when a namespace is specified on the saved object',
-          type: 'visualization',
-          requestBody: {
-            namespace: 'space_1',
-            attributes: {
-              title: 'something',
-            },
-          },
-          statusCode: 400,
-          response: expectNamespaceSpecifiedBadRequest,
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = createTestSuiteFactory(es, esArchiver, supertest);
+  const createTests = (overwrite: boolean, spaceId: string) => {
+    const testCases = createTestCases(overwrite, spaceId);
+    return createTestDefinitions(testCases, false, overwrite, { spaceId });
+  };
 
-    createTest('in the default space', {
-      ...SPACES.DEFAULT,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(SPACES.DEFAULT.spaceId),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 400,
-          response: expectBadRequestForHiddenType,
-        },
-        custom: {
-          description: 'when a namespace is specified on the saved object',
-          type: 'visualization',
-          requestBody: {
-            namespace: 'space_1',
-            attributes: {
-              title: 'something',
-            },
-          },
-          statusCode: 400,
-          response: expectNamespaceSpecifiedBadRequest,
-        },
-      },
+  describe('_create', () => {
+    getTestScenarios([false, true]).spaces.forEach(({ spaceId, modifier: overwrite }) => {
+      const suffix = overwrite ? ' with overwrite enabled' : '';
+      const tests = createTests(overwrite!, spaceId);
+      addTests(`within the ${spaceId} space${suffix}`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts
index 437b3f95024c6..bb48e06d93a09 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/delete.ts
@@ -5,87 +5,48 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { deleteTestSuiteFactory } from '../../common/suites/delete';
+import { deleteTestSuiteFactory, TEST_CASES as CASES } from '../../common/suites/delete';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  {
+    ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+  },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  CASES.NAMESPACE_AGNOSTIC,
+  { ...CASES.HIDDEN, ...fail404() },
+  { ...CASES.DOES_NOT_EXIST, ...fail404() },
+];
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  describe('delete', () => {
-    const {
-      createExpectSpaceAwareNotFound,
-      createExpectUnknownDocNotFound,
-      deleteTest,
-      expectEmpty,
-      expectGenericNotFound,
-    } = deleteTestSuiteFactory(esArchiver, supertest);
-
-    deleteTest(`in the default space`, {
-      ...SPACES.DEFAULT,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectGenericNotFound,
-        },
-        invalidId: {
-          statusCode: 404,
-          response: createExpectUnknownDocNotFound(SPACES.DEFAULT.spaceId),
-        },
-      },
-    });
-
-    deleteTest(`in the current space (space_1)`, {
-      ...SPACES.SPACE_1,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectGenericNotFound,
-        },
-        invalidId: {
-          statusCode: 404,
-          response: createExpectUnknownDocNotFound(SPACES.SPACE_1.spaceId),
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = deleteTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    return createTestDefinitions(testCases, false, { spaceId });
+  };
 
-    deleteTest(`in another space (space_2)`, {
-      spaceId: SPACES.SPACE_1.spaceId,
-      otherSpaceId: SPACES.SPACE_2.spaceId,
-      tests: {
-        spaceAware: {
-          statusCode: 404,
-          response: createExpectSpaceAwareNotFound(SPACES.SPACE_2.spaceId),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectEmpty,
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectGenericNotFound,
-        },
-        invalidId: {
-          statusCode: 404,
-          response: createExpectUnknownDocNotFound(SPACES.SPACE_2.spaceId),
-        },
-      },
+  describe('_delete', () => {
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createTests(spaceId);
+      addTests(`within the ${spaceId} space`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts
index f4be02c05ac88..25d4fbfae990b 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/export.ts
@@ -4,62 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SPACES } from '../../common/lib/spaces';
+import { getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { exportTestSuiteFactory } from '../../common/suites/export';
+import { exportTestSuiteFactory, getTestCases } from '../../common/suites/export';
+
+const createTestCases = (spaceId: string) => {
+  const cases = getTestCases(spaceId);
+  return Object.values(cases);
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  const {
-    expectTypeOrObjectsRequired,
-    createExpectVisualizationResults,
-    expectInvalidTypeSpecified,
-    exportTest,
-  } = exportTestSuiteFactory(esArchiver, supertest);
-
-  describe('export', () => {
-    exportTest('objects only within the current space (space_1)', {
-      ...SPACES.SPACE_1,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(SPACES.SPACE_1.spaceId),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = exportTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    return createTestDefinitions(testCases, false);
+  };
 
-    exportTest('objects only within the current space (default)', {
-      ...SPACES.DEFAULT,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(SPACES.DEFAULT.spaceId),
-        },
-        hiddenType: {
-          description: 'exporting space not allowed',
-          statusCode: 400,
-          response: expectInvalidTypeSpecified,
-        },
-        noTypeOrObjects: {
-          description: 'bad request, type or object is required',
-          statusCode: 400,
-          response: expectTypeOrObjectsRequired,
-        },
-      },
+  describe('_export', () => {
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createTests(spaceId);
+      addTests(`within the ${spaceId} space`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts
index a07d3edf834e9..a15f7de404db8 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/find.ts
@@ -4,154 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SPACES } from '../../common/lib/spaces';
+import { getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { findTestSuiteFactory } from '../../common/suites/find';
+import { findTestSuiteFactory, getTestCases } from '../../common/suites/find';
+
+const createTestCases = (spaceId: string) => {
+  const cases = getTestCases(spaceId);
+  return Object.values(cases);
+};
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  const {
-    createExpectEmpty,
-    createExpectVisualizationResults,
-    expectFilterWrongTypeError,
-    expectNotSpaceAwareResults,
-    expectTypeRequired,
-    findTest,
-  } = findTestSuiteFactory(esArchiver, supertest);
-
-  describe('find', () => {
-    findTest(`objects only within the current space (space_1)`, {
-      ...SPACES.SPACE_1,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(SPACES.SPACE_1.spaceId),
-        },
-        notSpaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        unknownType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(100, 100, 1),
-        },
-        unknownSearchField: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        filterWithHiddenType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        filterWithUnknownType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'Bad Request',
-          statusCode: 400,
-          response: expectFilterWrongTypeError,
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = findTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    return createTestDefinitions(testCases, false);
+  };
 
-    findTest(`objects only within the current space (default)`, {
-      ...SPACES.DEFAULT,
-      tests: {
-        spaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: createExpectVisualizationResults(SPACES.DEFAULT.spaceId),
-        },
-        notSpaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        unknownType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        pageBeyondTotal: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(100, 100, 1),
-        },
-        unknownSearchField: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        noType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithNotSpaceAwareType: {
-          description: 'only the visualization',
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        filterWithHiddenType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        filterWithUnknownType: {
-          description: 'empty result',
-          statusCode: 200,
-          response: createExpectEmpty(1, 20, 0),
-        },
-        filterWithNoType: {
-          description: 'bad request, type is required',
-          statusCode: 400,
-          response: expectTypeRequired,
-        },
-        filterWithUnAllowedType: {
-          description: 'Bad Request',
-          statusCode: 400,
-          response: expectFilterWrongTypeError,
-        },
-      },
+  describe('_find', () => {
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createTests(spaceId);
+      addTests(`within the ${spaceId} space`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts
index 592bedd92b4d7..512ae968dd0dd 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/get.ts
@@ -5,88 +5,48 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { getTestSuiteFactory } from '../../common/suites/get';
+import { getTestSuiteFactory, TEST_CASES as CASES } from '../../common/suites/get';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  {
+    ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+  },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  CASES.NAMESPACE_AGNOSTIC,
+  { ...CASES.HIDDEN, ...fail404() },
+  { ...CASES.DOES_NOT_EXIST, ...fail404() },
+];
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  const {
-    createExpectDoesntExistNotFound,
-    createExpectSpaceAwareNotFound,
-    createExpectSpaceAwareResults,
-    createExpectNotSpaceAwareResults,
-    expectHiddenTypeNotFound: expectHiddenTypeNotFound,
-    getTest,
-  } = getTestSuiteFactory(esArchiver, supertest);
-
-  describe('get', () => {
-    getTest(`can access objects belonging to the current space (default)`, {
-      ...SPACES.DEFAULT,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(SPACES.DEFAULT.spaceId),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: createExpectNotSpaceAwareResults(SPACES.DEFAULT.spaceId),
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectHiddenTypeNotFound,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(SPACES.DEFAULT.spaceId),
-        },
-      },
-    });
-
-    getTest(`can access objects belonging to the current space (space_1)`, {
-      ...SPACES.SPACE_1,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: createExpectSpaceAwareResults(SPACES.SPACE_1.spaceId),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: createExpectNotSpaceAwareResults(SPACES.SPACE_1.spaceId),
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectHiddenTypeNotFound,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(SPACES.SPACE_1.spaceId),
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = getTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    return createTestDefinitions(testCases, false, { spaceId });
+  };
 
-    getTest(`can't access space aware objects belonging to another space (space_1)`, {
-      spaceId: SPACES.DEFAULT.spaceId,
-      otherSpaceId: SPACES.SPACE_1.spaceId,
-      tests: {
-        spaceAware: {
-          statusCode: 404,
-          response: createExpectSpaceAwareNotFound(SPACES.SPACE_1.spaceId),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: createExpectNotSpaceAwareResults(SPACES.SPACE_1.spaceId),
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectHiddenTypeNotFound,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(SPACES.SPACE_1.spaceId),
-        },
-      },
+  describe('_get', () => {
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createTests(spaceId);
+      addTests(`within the ${spaceId} space`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
index c78a0e1cc2cce..5fe4b08d91b54 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
@@ -5,56 +5,48 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { importTestSuiteFactory } from '../../common/suites/import';
+import { importTestSuiteFactory, TEST_CASES as CASES } from '../../common/suites/import';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(spaceId === DEFAULT_SPACE_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(spaceId === SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(spaceId === SPACE_2_ID) },
+  { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
+  { ...CASES.NAMESPACE_AGNOSTIC, ...fail409() },
+  { ...CASES.HIDDEN, ...fail400() },
+  CASES.NEW_SINGLE_NAMESPACE_OBJ,
+  { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+];
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    importTest,
-    createExpectResults,
-    expectUnknownTypeUnsupported,
-    expectHiddenTypeUnsupported,
-  } = importTestSuiteFactory(es, esArchiver, supertest);
+  const { addTests, createTestDefinitions } = importTestSuiteFactory(es, esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    return createTestDefinitions(testCases, false, { spaceId, singleRequest: true });
+  };
 
   describe('_import', () => {
-    importTest('in the current space (space_1)', {
-      ...SPACES.SPACE_1,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(SPACES.SPACE_1.spaceId),
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectHiddenTypeUnsupported,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
-    });
-
-    importTest('in the default space', {
-      ...SPACES.DEFAULT,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(SPACES.DEFAULT.spaceId),
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectHiddenTypeUnsupported,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createTests(spaceId);
+      addTests(`within the ${spaceId} space`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts
index bb481e0c98bc1..c2f8339d38c97 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/index.ts
@@ -12,6 +12,7 @@ export default function({ loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./bulk_create'));
     loadTestFile(require.resolve('./bulk_get'));
+    loadTestFile(require.resolve('./bulk_update'));
     loadTestFile(require.resolve('./create'));
     loadTestFile(require.resolve('./delete'));
     loadTestFile(require.resolve('./export'));
@@ -20,6 +21,5 @@ export default function({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./import'));
     loadTestFile(require.resolve('./resolve_import_errors'));
     loadTestFile(require.resolve('./update'));
-    loadTestFile(require.resolve('./bulk_update'));
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
index 22a7ab81e5530..04f9ac8414afd 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
@@ -5,56 +5,59 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve_import_errors';
+import {
+  resolveImportErrorsTestSuiteFactory,
+  TEST_CASES as CASES,
+} from '../../common/suites/resolve_import_errors';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail400, fail409 } = testCaseFailures;
+
+const createTestCases = (overwrite: boolean, spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  {
+    ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+    ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
+  },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+  { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
+  { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+  { ...CASES.HIDDEN, ...fail400() },
+  CASES.NEW_SINGLE_NAMESPACE_OBJ,
+  { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+];
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('legacyEs');
 
-  const {
-    resolveImportErrorsTest,
-    createExpectResults,
-    expectUnknownTypeUnsupported,
-    expectHiddenTypeUnsupported,
-  } = resolveImportErrorsTestSuiteFactory(es, esArchiver, supertest);
+  const { addTests, createTestDefinitions } = resolveImportErrorsTestSuiteFactory(
+    es,
+    esArchiver,
+    supertest
+  );
+  const createTests = (overwrite: boolean, spaceId: string) => {
+    const testCases = createTestCases(overwrite, spaceId);
+    return createTestDefinitions(testCases, false, overwrite, { spaceId, singleRequest: true });
+  };
 
   describe('_resolve_import_errors', () => {
-    resolveImportErrorsTest('in the current space (space_1)', {
-      ...SPACES.SPACE_1,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(SPACES.SPACE_1.spaceId),
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectHiddenTypeUnsupported,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
-    });
-
-    resolveImportErrorsTest('in the default space', {
-      ...SPACES.DEFAULT,
-      tests: {
-        default: {
-          statusCode: 200,
-          response: createExpectResults(SPACES.DEFAULT.spaceId),
-        },
-        hiddenType: {
-          statusCode: 200,
-          response: expectHiddenTypeUnsupported,
-        },
-        unknownType: {
-          statusCode: 200,
-          response: expectUnknownTypeUnsupported,
-        },
-      },
+    getTestScenarios([false, true]).spaces.forEach(({ spaceId, modifier: overwrite }) => {
+      const suffix = overwrite ? ' with overwrite enabled' : '';
+      const tests = createTests(overwrite!, spaceId);
+      addTests(`within the ${spaceId} space${suffix}`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts
index 6ffbda511d871..381861e33b68d 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/update.ts
@@ -5,88 +5,48 @@
  */
 
 import { SPACES } from '../../common/lib/spaces';
+import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { updateTestSuiteFactory } from '../../common/suites/update';
+import { updateTestSuiteFactory, TEST_CASES as CASES } from '../../common/suites/update';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => [
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  {
+    ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+    ...fail404(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+  },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail404(spaceId !== SPACE_1_ID) },
+  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail404(spaceId !== SPACE_2_ID) },
+  CASES.NAMESPACE_AGNOSTIC,
+  { ...CASES.HIDDEN, ...fail404() },
+  { ...CASES.DOES_NOT_EXIST, ...fail404() },
+];
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  describe('update', () => {
-    const {
-      createExpectSpaceAwareNotFound,
-      expectSpaceAwareResults,
-      createExpectDoesntExistNotFound,
-      expectNotSpaceAwareResults,
-      expectSpaceNotFound,
-      updateTest,
-    } = updateTestSuiteFactory(esArchiver, supertest);
-
-    updateTest(`in the default space`, {
-      spaceId: SPACES.DEFAULT.spaceId,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectSpaceNotFound,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(SPACES.DEFAULT.spaceId),
-        },
-      },
-    });
-
-    updateTest('in the current space (space_1)', {
-      spaceId: SPACES.SPACE_1.spaceId,
-      tests: {
-        spaceAware: {
-          statusCode: 200,
-          response: expectSpaceAwareResults,
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectSpaceNotFound,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(SPACES.SPACE_1.spaceId),
-        },
-      },
-    });
+  const { addTests, createTestDefinitions } = updateTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    return createTestDefinitions(testCases, false);
+  };
 
-    updateTest('objects that exist in another space (space_1)', {
-      spaceId: SPACES.DEFAULT.spaceId,
-      otherSpaceId: SPACES.SPACE_1.spaceId,
-      tests: {
-        spaceAware: {
-          statusCode: 404,
-          response: createExpectSpaceAwareNotFound(SPACES.SPACE_1.spaceId),
-        },
-        notSpaceAware: {
-          statusCode: 200,
-          response: expectNotSpaceAwareResults,
-        },
-        hiddenType: {
-          statusCode: 404,
-          response: expectSpaceNotFound,
-        },
-        doesntExist: {
-          statusCode: 404,
-          response: createExpectDoesntExistNotFound(),
-        },
-      },
+  describe('_update', () => {
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createTests(spaceId);
+      addTests(`within the ${spaceId} space`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/spaces_api_integration/common/config.ts b/x-pack/test/spaces_api_integration/common/config.ts
index dffc6c524cc6e..19743e09f9420 100644
--- a/x-pack/test/spaces_api_integration/common/config.ts
+++ b/x-pack/test/spaces_api_integration/common/config.ts
@@ -67,6 +67,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           // disable anonymouse access so that we're testing both on and off in different suites
           '--status.allowAnonymous=false',
           '--server.xsrf.disableProtection=true',
+          `--plugin-path=${path.join(__dirname, 'fixtures', 'shared_type_plugin')}`,
           ...disabledPlugins.map(key => `--xpack.${key}.enabled=false`),
         ],
       },
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
index 64c1be0b90071..9a8a0a1fdda14 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
+++ b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -376,3 +376,123 @@
     "type": "_doc"
   }
 }
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:default_space_only",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in the default space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:space_1_only",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in the space_1 space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_1"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:space_2_only",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in the space_2 space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:default_and_space_1",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in the default and space_1 spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:default_and_space_2",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in the default and space_2 spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:space_1_and_space_2",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in the space_1 and space_2 spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_1", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:all_spaces",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in the default, space_1, and space_2 spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
index 1440585b625b9..508de68c32f70 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
+++ b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
@@ -159,6 +159,9 @@
         "namespace": {
           "type": "keyword"
         },
+        "namespaces": {
+          "type": "keyword"
+        },
         "search": {
           "properties": {
             "columns": {
@@ -320,6 +323,19 @@
               "type": "text"
             }
           }
+        },
+        "sharedtype": {
+          "properties": {
+            "title": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 2048
+                }
+              }
+            }
+          }
         }
       }
     },
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/index.js b/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/index.js
new file mode 100644
index 0000000000000..91a24fb9f4f56
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/index.js
@@ -0,0 +1,27 @@
+/*
+ * 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 mappings from './mappings.json';
+
+export default function(kibana) {
+  return new kibana.Plugin({
+    require: ['kibana', 'elasticsearch', 'xpack_main'],
+    name: 'shared_type_plugin',
+    uiExports: {
+      savedObjectsManagement: {},
+      savedObjectSchemas: {
+        sharedtype: {
+          multiNamespace: true,
+        },
+      },
+      mappings,
+    },
+
+    config() {},
+
+    init() {}, // need empty init for plugin to load
+  });
+}
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/mappings.json b/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/mappings.json
new file mode 100644
index 0000000000000..918958aec0d6d
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/mappings.json
@@ -0,0 +1,15 @@
+{
+  "sharedtype": {
+    "properties": {
+      "title": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 2048
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/package.json b/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/package.json
new file mode 100644
index 0000000000000..c52f4256c5c06
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/common/fixtures/shared_type_plugin/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "shared_type_plugin",
+  "version": "0.0.0",
+  "kibana": {
+    "version": "kibana"
+  }
+}
diff --git a/x-pack/test/spaces_api_integration/common/lib/saved_object_test_cases.ts b/x-pack/test/spaces_api_integration/common/lib/saved_object_test_cases.ts
new file mode 100644
index 0000000000000..67f5d737ba010
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/common/lib/saved_object_test_cases.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 const MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES = Object.freeze({
+  DEFAULT_SPACE_ONLY: Object.freeze({
+    id: 'default_space_only',
+    existingNamespaces: ['default'],
+  }),
+  SPACE_1_ONLY: Object.freeze({
+    id: 'space_1_only',
+    existingNamespaces: ['space_1'],
+  }),
+  SPACE_2_ONLY: Object.freeze({
+    id: 'space_2_only',
+    existingNamespaces: ['space_2'],
+  }),
+  DEFAULT_AND_SPACE_1: Object.freeze({
+    id: 'default_and_space_1',
+    existingNamespaces: ['default', 'space_1'],
+  }),
+  DEFAULT_AND_SPACE_2: Object.freeze({
+    id: 'default_and_space_2',
+    existingNamespaces: ['default', 'space_2'],
+  }),
+  SPACE_1_AND_SPACE_2: Object.freeze({
+    id: 'space_1_and_space_2',
+    existingNamespaces: ['space_1', 'space_2'],
+  }),
+  ALL_SPACES: Object.freeze({
+    id: 'all_spaces',
+    existingNamespaces: ['default', 'space_1', 'space_2'],
+  }),
+  DOES_NOT_EXIST: Object.freeze({
+    id: 'does_not_exist',
+    existingNamespaces: [] as string[],
+  }),
+});
diff --git a/x-pack/test/spaces_api_integration/common/suites/delete.ts b/x-pack/test/spaces_api_integration/common/suites/delete.ts
index 9036fcbf7a8dd..0d8728fdf622e 100644
--- a/x-pack/test/spaces_api_integration/common/suites/delete.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/delete.ts
@@ -6,6 +6,7 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import { getUrlPrefix } from '../lib/space_test_utils';
+import { MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
 interface DeleteTest {
@@ -128,6 +129,25 @@ export function deleteTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
     ];
 
     expect(buckets).to.eql(expectedBuckets);
+
+    // There were seven multi-namespace objects.
+    // Since Space 2 was deleted, any multi-namespace objects that existed in that space
+    // are updated to remove it, and of those, any that don't exist in any space are deleted.
+    const multiNamespaceResponse = await es.search({
+      index: '.kibana',
+      body: { query: { terms: { type: ['sharedtype'] } } },
+    });
+    const docs: [Record<string, any>] = multiNamespaceResponse.hits.hits;
+    expect(docs).length(6); // just six results, since spaces_2_only got deleted
+    Object.values(CASES).forEach(({ id, existingNamespaces }) => {
+      const remainingNamespaces = existingNamespaces.filter(x => x !== 'space_2');
+      const doc = docs.find(x => x._id === `sharedtype:${id}`);
+      if (remainingNamespaces.length > 0) {
+        expect(doc?._source?.namespaces).to.eql(remainingNamespaces);
+      } else {
+        expect(doc).to.be(undefined);
+      }
+    });
   };
 
   const expectNotFound = (resp: { [key: string]: any }) => {
diff --git a/x-pack/test/spaces_api_integration/common/suites/share_add.ts b/x-pack/test/spaces_api_integration/common/suites/share_add.ts
new file mode 100644
index 0000000000000..b9a012b606da3
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/common/suites/share_add.ts
@@ -0,0 +1,118 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { SuperTest } from 'supertest';
+import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SPACES } from '../lib/spaces';
+import {
+  expectResponses,
+  getUrlPrefix,
+} from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
+import {
+  ExpectResponseBody,
+  TestDefinition,
+  TestSuite,
+} from '../../../saved_object_api_integration/common/lib/types';
+
+export interface ShareAddTestDefinition extends TestDefinition {
+  request: { spaces: string[]; object: { type: string; id: string } };
+}
+export type ShareAddTestSuite = TestSuite<ShareAddTestDefinition>;
+export interface ShareAddTestCase {
+  id: string;
+  namespaces: string[];
+  failure?: 400 | 403 | 404;
+  fail400Param?: string;
+  fail403Param?: string;
+}
+
+const TYPE = 'sharedtype';
+const createRequest = ({ id, namespaces }: ShareAddTestCase) => ({
+  spaces: namespaces,
+  object: { type: TYPE, id },
+});
+const getTestTitle = ({ id, namespaces }: ShareAddTestCase) =>
+  `{id: ${id}, namespaces: [${namespaces.join(',')}]}`;
+
+export function shareAddTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
+  const expectResponseBody = (testCase: ShareAddTestCase): ExpectResponseBody => async (
+    response: Record<string, any>
+  ) => {
+    const { id, failure, fail400Param, fail403Param } = testCase;
+    const object = response.body;
+    if (failure === 403) {
+      await expectResponses.forbidden(fail403Param!)(TYPE)(response);
+    } else if (failure) {
+      let error: any;
+      if (failure === 400) {
+        error = SavedObjectsErrorHelpers.createBadRequestError(
+          `${id} already exists in the following namespace(s): ${fail400Param}`
+        );
+      } else if (failure === 404) {
+        error = SavedObjectsErrorHelpers.createGenericNotFoundError(TYPE, id);
+      }
+      expect(object.error).to.eql(error.output.payload.error);
+      expect(object.statusCode).to.eql(error.output.payload.statusCode);
+    } else {
+      // success
+      expect(object).to.eql({});
+    }
+  };
+  const createTestDefinitions = (
+    testCases: ShareAddTestCase | ShareAddTestCase[],
+    forbidden: boolean,
+    options?: {
+      responseBodyOverride?: ExpectResponseBody;
+      fail403Param?: string;
+    }
+  ): ShareAddTestDefinition[] => {
+    let cases = Array.isArray(testCases) ? testCases : [testCases];
+    if (forbidden) {
+      // override the expected result in each test case
+      cases = cases.map(x => ({ ...x, failure: 403, fail403Param: options?.fail403Param }));
+    }
+    return cases.map(x => ({
+      title: getTestTitle(x),
+      responseStatusCode: x.failure ?? 204,
+      request: createRequest(x),
+      responseBody: options?.responseBodyOverride || expectResponseBody(x),
+    }));
+  };
+
+  const makeShareAddTest = (describeFn: Mocha.SuiteFunction) => (
+    description: string,
+    definition: ShareAddTestSuite
+  ) => {
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
+
+    describeFn(description, () => {
+      before(() => esArchiver.load('saved_objects/spaces'));
+      after(() => esArchiver.unload('saved_objects/spaces'));
+
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const requestBody = test.request;
+          await supertest
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_share_saved_object_add`)
+            .auth(user?.username, user?.password)
+            .send(requestBody)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
+        });
+      }
+    });
+  };
+
+  const addTests = makeShareAddTest(describe);
+  // @ts-ignore
+  addTests.only = makeShareAddTest(describe.only);
+
+  return {
+    addTests,
+    createTestDefinitions,
+  };
+}
diff --git a/x-pack/test/spaces_api_integration/common/suites/share_remove.ts b/x-pack/test/spaces_api_integration/common/suites/share_remove.ts
new file mode 100644
index 0000000000000..b5fcbe5a1cf2c
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/common/suites/share_remove.ts
@@ -0,0 +1,116 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { SuperTest } from 'supertest';
+import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SPACES } from '../lib/spaces';
+import {
+  expectResponses,
+  getUrlPrefix,
+  getTestTitle,
+} from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
+import {
+  ExpectResponseBody,
+  TestDefinition,
+  TestSuite,
+} from '../../../saved_object_api_integration/common/lib/types';
+
+export interface ShareRemoveTestDefinition extends TestDefinition {
+  request: { spaces: string[]; object: { type: string; id: string } };
+}
+export type ShareRemoveTestSuite = TestSuite<ShareRemoveTestDefinition>;
+export interface ShareRemoveTestCase {
+  id: string;
+  namespaces: string[];
+  failure?: 400 | 403 | 404;
+  fail400Param?: string;
+}
+
+const TYPE = 'sharedtype';
+const createRequest = ({ id, namespaces }: ShareRemoveTestCase) => ({
+  spaces: namespaces,
+  object: { type: TYPE, id },
+});
+
+export function shareRemoveTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>) {
+  const expectForbidden = expectResponses.forbidden('delete');
+  const expectResponseBody = (testCase: ShareRemoveTestCase): ExpectResponseBody => async (
+    response: Record<string, any>
+  ) => {
+    const { id, failure, fail400Param } = testCase;
+    const object = response.body;
+    if (failure === 403) {
+      await expectForbidden(TYPE)(response);
+    } else if (failure) {
+      let error: any;
+      if (failure === 400) {
+        error = SavedObjectsErrorHelpers.createBadRequestError(
+          `${id} doesn't exist in the following namespace(s): ${fail400Param}`
+        );
+      } else if (failure === 404) {
+        error = SavedObjectsErrorHelpers.createGenericNotFoundError(TYPE, id);
+      }
+      expect(object.error).to.eql(error.output.payload.error);
+      expect(object.statusCode).to.eql(error.output.payload.statusCode);
+    } else {
+      // success
+      expect(object).to.eql({});
+    }
+  };
+  const createTestDefinitions = (
+    testCases: ShareRemoveTestCase | ShareRemoveTestCase[],
+    forbidden: boolean,
+    options?: {
+      responseBodyOverride?: ExpectResponseBody;
+    }
+  ): ShareRemoveTestDefinition[] => {
+    let cases = Array.isArray(testCases) ? testCases : [testCases];
+    if (forbidden) {
+      // override the expected result in each test case
+      cases = cases.map(x => ({ ...x, failure: 403 }));
+    }
+    return cases.map(x => ({
+      title: getTestTitle({ ...x, type: TYPE }),
+      responseStatusCode: x.failure ?? 204,
+      request: createRequest(x),
+      responseBody: options?.responseBodyOverride || expectResponseBody(x),
+    }));
+  };
+
+  const makeShareRemoveTest = (describeFn: Mocha.SuiteFunction) => (
+    description: string,
+    definition: ShareRemoveTestSuite
+  ) => {
+    const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
+
+    describeFn(description, () => {
+      before(() => esArchiver.load('saved_objects/spaces'));
+      after(() => esArchiver.unload('saved_objects/spaces'));
+
+      for (const test of tests) {
+        it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
+          const requestBody = test.request;
+          await supertest
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_share_saved_object_remove`)
+            .auth(user?.username, user?.password)
+            .send(requestBody)
+            .expect(test.responseStatusCode)
+            .then(test.responseBody);
+        });
+      }
+    });
+  };
+
+  const addTests = makeShareRemoveTest(describe);
+  // @ts-ignore
+  addTests.only = makeShareRemoveTest(describe.only);
+
+  return {
+    addTests,
+    createTestDefinitions,
+  };
+}
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts
index e918ab0b53841..8d85d95e6812f 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts
@@ -25,6 +25,8 @@ export default function({ loadTestFile, getService }: TestInvoker) {
     loadTestFile(require.resolve('./delete'));
     loadTestFile(require.resolve('./get_all'));
     loadTestFile(require.resolve('./get'));
+    loadTestFile(require.resolve('./share_add'));
+    loadTestFile(require.resolve('./share_remove'));
     loadTestFile(require.resolve('./update'));
   });
 }
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_add.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_add.ts
new file mode 100644
index 0000000000000..c7e65ac424776
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_add.ts
@@ -0,0 +1,124 @@
+/*
+ * 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 { SPACES } from '../../common/lib/spaces';
+import {
+  testCaseFailures,
+  getTestScenarios,
+} from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
+import { TestUser } from '../../../saved_object_api_integration/common/lib/types';
+import { MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES as CASES } from '../../common/lib/saved_object_test_cases';
+import { TestInvoker } from '../../common/lib/types';
+import { shareAddTestSuiteFactory, ShareAddTestDefinition } from '../../common/suites/share_add';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => {
+  const namespaces = [spaceId];
+  return [
+    // Test cases to check adding the target namespace to different saved objects
+    { ...CASES.DEFAULT_SPACE_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.SPACE_1_ONLY, namespaces, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.SPACE_2_ONLY, namespaces, ...fail404(spaceId !== SPACE_2_ID) },
+    { ...CASES.DEFAULT_AND_SPACE_1, namespaces, ...fail404(spaceId === SPACE_2_ID) },
+    { ...CASES.DEFAULT_AND_SPACE_2, namespaces, ...fail404(spaceId === SPACE_1_ID) },
+    { ...CASES.SPACE_1_AND_SPACE_2, namespaces, ...fail404(spaceId === DEFAULT_SPACE_ID) },
+    { ...CASES.ALL_SPACES, namespaces },
+    { ...CASES.DOES_NOT_EXIST, namespaces, ...fail404() },
+    // Test cases to check adding multiple namespaces to different saved objects that exist in one space
+    // These are non-exhaustive, they only check cases for adding two additional namespaces to a saved object
+    // More permutations are covered in the corresponding spaces_only test suite
+    {
+      ...CASES.DEFAULT_SPACE_ONLY,
+      namespaces: [SPACE_1_ID, SPACE_2_ID],
+      ...fail404(spaceId !== DEFAULT_SPACE_ID),
+    },
+    {
+      ...CASES.SPACE_1_ONLY,
+      namespaces: [DEFAULT_SPACE_ID, SPACE_2_ID],
+      ...fail404(spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.SPACE_2_ONLY,
+      namespaces: [DEFAULT_SPACE_ID, SPACE_1_ID],
+      ...fail404(spaceId !== SPACE_2_ID),
+    },
+  ];
+};
+const calculateSingleSpaceAuthZ = (
+  testCases: ReturnType<typeof createTestCases>,
+  spaceId: string
+) => {
+  const targetsOtherSpace = testCases.filter(
+    x => !x.namespaces.includes(spaceId) || x.namespaces.length > 1
+  );
+  const tmp = testCases.filter(x => !targetsOtherSpace.includes(x)); // doesn't target other space
+  const doesntExistInThisSpace = tmp.filter(x => !x.existingNamespaces.includes(spaceId));
+  const existsInThisSpace = tmp.filter(x => x.existingNamespaces.includes(spaceId));
+  return { targetsOtherSpace, doesntExistInThisSpace, existsInThisSpace };
+};
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: TestInvoker) {
+  const supertest = getService('supertestWithoutAuth');
+  const esArchiver = getService('esArchiver');
+
+  const { addTests, createTestDefinitions } = shareAddTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const testCases = createTestCases(spaceId);
+    const thisSpace = calculateSingleSpaceAuthZ(testCases, spaceId);
+    const otherSpaceId = spaceId === DEFAULT_SPACE_ID ? SPACE_1_ID : DEFAULT_SPACE_ID;
+    const otherSpace = calculateSingleSpaceAuthZ(testCases, otherSpaceId);
+    return {
+      unauthorized: createTestDefinitions(testCases, true, { fail403Param: 'create' }),
+      authorizedInSpace: [
+        createTestDefinitions(thisSpace.targetsOtherSpace, true, { fail403Param: 'create' }),
+        createTestDefinitions(thisSpace.doesntExistInThisSpace, false),
+        createTestDefinitions(thisSpace.existsInThisSpace, false),
+      ].flat(),
+      authorizedInOtherSpace: [
+        createTestDefinitions(otherSpace.targetsOtherSpace, true, { fail403Param: 'create' }),
+        // If the preflight GET request fails, it will return a 404 error; users who are authorized to create saved objects in the target
+        // space(s) but are not authorized to update saved objects in this space will see a 403 error instead of 404. This is a safeguard to
+        // prevent potential information disclosure of the spaces that a given saved object may exist in.
+        createTestDefinitions(otherSpace.doesntExistInThisSpace, true, { fail403Param: 'update' }),
+        createTestDefinitions(otherSpace.existsInThisSpace, false),
+      ].flat(),
+      authorized: createTestDefinitions(testCases, false),
+    };
+  };
+
+  describe('_share_saved_object_add', () => {
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` targeting the ${spaceId} space`;
+      const { unauthorized, authorizedInSpace, authorizedInOtherSpace, authorized } = createTests(
+        spaceId
+      );
+      const _addTests = (user: TestUser, tests: ShareAddTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
+
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.readAtSpace,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      _addTests(users.allAtSpace, authorizedInSpace);
+      _addTests(users.allAtOtherSpace, authorizedInOtherSpace);
+      [users.dualAll, users.allGlobally, users.superuser].forEach(user => {
+        _addTests(user, authorized);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_remove.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_remove.ts
new file mode 100644
index 0000000000000..3a8d42f620a3e
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_remove.ts
@@ -0,0 +1,99 @@
+/*
+ * 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 { SPACES } from '../../common/lib/spaces';
+import {
+  testCaseFailures,
+  getTestScenarios,
+} from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
+import { TestUser } from '../../../saved_object_api_integration/common/lib/types';
+import { MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES as CASES } from '../../common/lib/saved_object_test_cases';
+import { TestInvoker } from '../../common/lib/types';
+import {
+  shareRemoveTestSuiteFactory,
+  ShareRemoveTestCase,
+  ShareRemoveTestDefinition,
+} from '../../common/suites/share_remove';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+const createTestCases = (spaceId: string) => {
+  // Test cases to check removing the target namespace from different saved objects
+  let namespaces = [spaceId];
+  const singleSpace = [
+    { id: CASES.DEFAULT_SPACE_ONLY.id, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { id: CASES.SPACE_1_ONLY.id, namespaces, ...fail404(spaceId !== SPACE_1_ID) },
+    { id: CASES.SPACE_2_ONLY.id, namespaces, ...fail404(spaceId !== SPACE_2_ID) },
+    { id: CASES.DEFAULT_AND_SPACE_1.id, namespaces, ...fail404(spaceId === SPACE_2_ID) },
+    { id: CASES.DEFAULT_AND_SPACE_2.id, namespaces, ...fail404(spaceId === SPACE_1_ID) },
+    { id: CASES.SPACE_1_AND_SPACE_2.id, namespaces, ...fail404(spaceId === DEFAULT_SPACE_ID) },
+    { id: CASES.ALL_SPACES.id, namespaces },
+    { id: CASES.DOES_NOT_EXIST.id, namespaces, ...fail404() },
+  ] as ShareRemoveTestCase[];
+
+  // Test cases to check removing all three namespaces from different saved objects that exist in two spaces
+  // These are non-exhaustive, they only check some cases -- each object will result in a 404, either because
+  // it never existed in the target namespace, or it was removed in one of the test cases above
+  // More permutations are covered in the corresponding spaces_only test suite
+  namespaces = [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID];
+  const multipleSpaces = [
+    { id: CASES.DEFAULT_AND_SPACE_1.id, namespaces, ...fail404() },
+    { id: CASES.DEFAULT_AND_SPACE_2.id, namespaces, ...fail404() },
+    { id: CASES.SPACE_1_AND_SPACE_2.id, namespaces, ...fail404() },
+  ] as ShareRemoveTestCase[];
+
+  const allCases = singleSpace.concat(multipleSpaces);
+  return { singleSpace, multipleSpaces, allCases };
+};
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: TestInvoker) {
+  const supertest = getService('supertestWithoutAuth');
+  const esArchiver = getService('esArchiver');
+
+  const { addTests, createTestDefinitions } = shareRemoveTestSuiteFactory(esArchiver, supertest);
+  const createTests = (spaceId: string) => {
+    const { singleSpace, multipleSpaces, allCases } = createTestCases(spaceId);
+    return {
+      unauthorized: createTestDefinitions(allCases, true),
+      authorizedThisSpace: [
+        createTestDefinitions(singleSpace, false),
+        createTestDefinitions(multipleSpaces, true),
+      ].flat(),
+      authorizedGlobally: createTestDefinitions(allCases, false),
+    };
+  };
+
+  describe('_share_saved_object_remove', () => {
+    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
+      const suffix = ` targeting the ${spaceId} space`;
+      const { unauthorized, authorizedThisSpace, authorizedGlobally } = createTests(spaceId);
+      const _addTests = (user: TestUser, tests: ShareRemoveTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
+
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.readAtSpace,
+        users.allAtOtherSpace,
+      ].forEach(user => {
+        _addTests(user, unauthorized);
+      });
+      _addTests(users.allAtSpace, authorizedThisSpace);
+      [users.dualAll, users.allGlobally, users.superuser].forEach(user => {
+        _addTests(user, authorizedGlobally);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/index.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/index.ts
index 1182f6bdabcff..b02dc35b58b56 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/index.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/index.ts
@@ -17,6 +17,8 @@ export default function spacesOnlyTestSuite({ loadTestFile }: TestInvoker) {
     loadTestFile(require.resolve('./delete'));
     loadTestFile(require.resolve('./get_all'));
     loadTestFile(require.resolve('./get'));
+    loadTestFile(require.resolve('./share_add'));
+    loadTestFile(require.resolve('./share_remove'));
     loadTestFile(require.resolve('./update'));
   });
 }
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/share_add.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/share_add.ts
new file mode 100644
index 0000000000000..f1e603836fa21
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/share_add.ts
@@ -0,0 +1,84 @@
+/*
+ * 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 { SPACES } from '../../common/lib/spaces';
+import {
+  testCaseFailures,
+  getTestScenarios,
+} from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
+import { TestInvoker } from '../../common/lib/types';
+import { MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES as CASES } from '../../common/lib/saved_object_test_cases';
+import { shareAddTestSuiteFactory } from '../../common/suites/share_add';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+/**
+ * Single-namespace test cases
+ * @param spaceId the namespace to add to each saved object
+ */
+const createSingleTestCases = (spaceId: string) => {
+  const namespaces = ['some-space-id'];
+  return [
+    { ...CASES.DEFAULT_SPACE_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.SPACE_1_ONLY, namespaces, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.SPACE_2_ONLY, namespaces, ...fail404(spaceId !== SPACE_2_ID) },
+    { ...CASES.DEFAULT_AND_SPACE_1, namespaces, ...fail404(spaceId === SPACE_2_ID) },
+    { ...CASES.DEFAULT_AND_SPACE_2, namespaces, ...fail404(spaceId === SPACE_1_ID) },
+    { ...CASES.SPACE_1_AND_SPACE_2, namespaces, ...fail404(spaceId === DEFAULT_SPACE_ID) },
+    { ...CASES.ALL_SPACES, namespaces },
+    { ...CASES.DOES_NOT_EXIST, namespaces, ...fail404() },
+  ];
+};
+/**
+ * Multi-namespace test cases
+ * These are non-exhaustive, but they check different permutations of saved objects and spaces to add
+ */
+const createMultiTestCases = () => {
+  const allSpaces = [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID];
+  let id = CASES.DEFAULT_SPACE_ONLY.id;
+  const one = [{ id, namespaces: allSpaces }];
+  id = CASES.DEFAULT_AND_SPACE_1.id;
+  const two = [{ id, namespaces: allSpaces }];
+  id = CASES.ALL_SPACES.id;
+  const three = [{ id, namespaces: allSpaces }];
+  return { one, two, three };
+};
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: TestInvoker) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  const { addTests, createTestDefinitions } = shareAddTestSuiteFactory(esArchiver, supertest);
+  const createSingleTests = (spaceId: string) => {
+    const testCases = createSingleTestCases(spaceId);
+    return createTestDefinitions(testCases, false);
+  };
+  const createMultiTests = () => {
+    const testCases = createMultiTestCases();
+    return {
+      one: createTestDefinitions(testCases.one, false),
+      two: createTestDefinitions(testCases.two, false),
+      three: createTestDefinitions(testCases.three, false),
+    };
+  };
+
+  describe('_share_saved_object_add', () => {
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createSingleTests(spaceId);
+      addTests(`targeting the ${spaceId} space`, { spaceId, tests });
+    });
+    const { one, two, three } = createMultiTests();
+    addTests('for a saved object in the default space', { tests: one });
+    addTests('for a saved object in the default and space_1 spaces', { tests: two });
+    addTests('for a saved object in the default, space_1, and space_2 spaces', { tests: three });
+  });
+}
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/share_remove.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/share_remove.ts
new file mode 100644
index 0000000000000..15be72c9f09ac
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/share_remove.ts
@@ -0,0 +1,99 @@
+/*
+ * 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 { SPACES } from '../../common/lib/spaces';
+import {
+  testCaseFailures,
+  getTestScenarios,
+} from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
+import { TestInvoker } from '../../common/lib/types';
+import { MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES as CASES } from '../../common/lib/saved_object_test_cases';
+import { shareRemoveTestSuiteFactory } from '../../common/suites/share_remove';
+
+const {
+  DEFAULT: { spaceId: DEFAULT_SPACE_ID },
+  SPACE_1: { spaceId: SPACE_1_ID },
+  SPACE_2: { spaceId: SPACE_2_ID },
+} = SPACES;
+const { fail404 } = testCaseFailures;
+
+/**
+ * Single-namespace test cases
+ * @param spaceId the namespace to remove from each saved object
+ */
+const createSingleTestCases = (spaceId: string) => {
+  const namespaces = [spaceId];
+  return [
+    { ...CASES.DEFAULT_SPACE_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.SPACE_1_ONLY, namespaces, ...fail404(spaceId !== SPACE_1_ID) },
+    { ...CASES.SPACE_2_ONLY, namespaces, ...fail404(spaceId !== SPACE_2_ID) },
+    { ...CASES.DEFAULT_AND_SPACE_1, namespaces, ...fail404(spaceId === SPACE_2_ID) },
+    { ...CASES.DEFAULT_AND_SPACE_2, namespaces, ...fail404(spaceId === SPACE_1_ID) },
+    { ...CASES.SPACE_1_AND_SPACE_2, namespaces, ...fail404(spaceId === DEFAULT_SPACE_ID) },
+    { ...CASES.ALL_SPACES, namespaces },
+    { ...CASES.DOES_NOT_EXIST, namespaces, ...fail404() },
+  ];
+};
+/**
+ * Multi-namespace test cases
+ * These are non-exhaustive, but they check different permutations of saved objects and spaces to remove
+ */
+const createMultiTestCases = () => {
+  const nonExistentSpaceId = 'does_not_exist'; // space that doesn't exist
+  let id = CASES.DEFAULT_SPACE_ONLY.id;
+  const one = [
+    { id, namespaces: [nonExistentSpaceId] },
+    { id, namespaces: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID] },
+    { id, namespaces: [DEFAULT_SPACE_ID], ...fail404() }, // this saved object no longer exists
+  ];
+  id = CASES.DEFAULT_AND_SPACE_1.id;
+  const two = [
+    { id, namespaces: [DEFAULT_SPACE_ID, nonExistentSpaceId] },
+    // this saved object will not be found in the context of the current namespace ('default')
+    { id, namespaces: [DEFAULT_SPACE_ID], ...fail404() }, // this object's namespaces no longer contains DEFAULT_SPACE_ID
+    { id, namespaces: [SPACE_1_ID], ...fail404() }, // this object's namespaces does contain SPACE_1_ID
+  ];
+  id = CASES.ALL_SPACES.id;
+  const three = [
+    { id, namespaces: [DEFAULT_SPACE_ID, SPACE_1_ID, nonExistentSpaceId] },
+    // this saved object will not be found in the context of the current namespace ('default')
+    { id, namespaces: [DEFAULT_SPACE_ID], ...fail404() }, // this object's namespaces no longer contains DEFAULT_SPACE_ID
+    { id, namespaces: [SPACE_1_ID], ...fail404() }, // this object's namespaces no longer contains SPACE_1_ID
+    { id, namespaces: [SPACE_2_ID], ...fail404() }, // this object's namespaces does contain SPACE_2_ID
+  ];
+  return { one, two, three };
+};
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: TestInvoker) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  const { addTests, createTestDefinitions } = shareRemoveTestSuiteFactory(esArchiver, supertest);
+  const createSingleTests = (spaceId: string) => {
+    const testCases = createSingleTestCases(spaceId);
+    return createTestDefinitions(testCases, false);
+  };
+  const createMultiTests = () => {
+    const testCases = createMultiTestCases();
+    return {
+      one: createTestDefinitions(testCases.one, false),
+      two: createTestDefinitions(testCases.two, false),
+      three: createTestDefinitions(testCases.three, false),
+    };
+  };
+
+  describe('_share_saved_object_remove', () => {
+    getTestScenarios().spaces.forEach(({ spaceId }) => {
+      const tests = createSingleTests(spaceId);
+      addTests(`targeting the ${spaceId} space`, { spaceId, tests });
+    });
+    const { one, two, three } = createMultiTests();
+    addTests('for a saved object in the default space', { tests: one });
+    addTests('for a saved object in the default and space_1 spaces', { tests: two });
+    addTests('for a saved object in the default, space_1, and space_2 spaces', { tests: three });
+  });
+}

From 83b9417d4534f7c8d2c6daa9009bd20e1937cf16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Fri, 10 Apr 2020 08:28:06 +0100
Subject: [PATCH 08/36] [APM] Custom links submit button is off screen in IE11
 (#63122)

---
 .../CustomLinkFlyout/DeleteButton.tsx         |  2 +
 .../CustomLinkFlyout/FlyoutFooter.tsx         | 38 ++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/DeleteButton.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/DeleteButton.tsx
index 2b3a5cbe87992..87cb171518ea4 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/DeleteButton.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/DeleteButton.tsx
@@ -8,6 +8,7 @@ import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { NotificationsStart } from 'kibana/public';
 import React, { useState } from 'react';
+import { px, unit } from '../../../../../../style/variables';
 import { callApmApi } from '../../../../../../services/rest/createCallApmApi';
 import { useApmPluginContext } from '../../../../../../hooks/useApmPluginContext';
 
@@ -31,6 +32,7 @@ export function DeleteButton({ onDelete, customLinkId }: Props) {
         setIsDeleting(false);
         onDelete();
       }}
+      style={{ marginRight: px(unit) }}
     >
       {i18n.translate('xpack.apm.settings.customizeUI.customLink.delete', {
         defaultMessage: 'Delete'
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/FlyoutFooter.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/FlyoutFooter.tsx
index cb27221309812..96505d639bcdd 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/FlyoutFooter.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/FlyoutFooter.tsx
@@ -40,29 +40,23 @@ export const FlyoutFooter = ({
             )}
           </EuiButtonEmpty>
         </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiFlexGroup>
-            {customLinkId && (
-              <EuiFlexItem>
-                <DeleteButton customLinkId={customLinkId} onDelete={onDelete} />
-              </EuiFlexItem>
+        <EuiFlexItem grow={false} style={{ display: 'block' }}>
+          {customLinkId && (
+            <DeleteButton customLinkId={customLinkId} onDelete={onDelete} />
+          )}
+          <EuiButton
+            fill
+            type="submit"
+            isLoading={isSaving}
+            isDisabled={!isSaveButtonEnabled}
+          >
+            {i18n.translate(
+              'xpack.apm.settings.customizeUI.customLink.flyout.save',
+              {
+                defaultMessage: 'Save'
+              }
             )}
-            <EuiFlexItem>
-              <EuiButton
-                fill
-                type="submit"
-                isLoading={isSaving}
-                isDisabled={!isSaveButtonEnabled}
-              >
-                {i18n.translate(
-                  'xpack.apm.settings.customizeUI.customLink.flyout.save',
-                  {
-                    defaultMessage: 'Save'
-                  }
-                )}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
+          </EuiButton>
         </EuiFlexItem>
       </EuiFlexGroup>
     </EuiFlyoutFooter>

From 34b1d0a10d529da48f35106d6b82cf96498e6677 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Fri, 10 Apr 2020 11:28:59 +0200
Subject: [PATCH 09/36] [SIEM] Updates cypress readme with documentation about
 the test data. (#62747)

* updates test data section

* Update x-pack/legacy/plugins/siem/cypress/README.md

Co-Authored-By: Ryland Herrick <ryalnd@gmail.com>

Co-authored-by: Ryland Herrick <ryalnd@gmail.com>
---
 x-pack/legacy/plugins/siem/cypress/README.md | 132 +++++++++++++++----
 1 file changed, 107 insertions(+), 25 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/cypress/README.md b/x-pack/legacy/plugins/siem/cypress/README.md
index 41137ce6d8a9d..a031fea172be5 100644
--- a/x-pack/legacy/plugins/siem/cypress/README.md
+++ b/x-pack/legacy/plugins/siem/cypress/README.md
@@ -111,6 +111,112 @@ elasticsearch:
   hosts: ['https://<server>:9200']
 ```
 
+## Running (Headless) Tests on the Command Line as a Jenkins execution (The preferred way)
+
+To run (headless) tests as a Jenkins execution.
+
+1. First bootstrap kibana changes from the Kibana root directory:
+
+```sh
+yarn kbn bootstrap
+```
+
+2. Launch Cypress command line test runner:
+
+```sh 
+cd x-pack/legacy/plugins/siem
+yarn cypress:run-as-ci
+```
+
+Note that with this type of execution you don't need to have running a kibana and elasticsearch instance. This is because
+ the command, as it would happen in the CI, will launch the instances. The elasticsearch instance will be fed with the data 
+ placed in: `x-pack/test/siem_cypress/es_archives`
+ 
+As in this case we want to mimic a CI execution we want to execute the tests with the same set of data, this is why 
+in this case does not make sense to override Cypress environment variables. 
+
+### Test data
+
+As said before when running the tests as Jenkins the tests are fed with the data placed in: `x-pack/test/siem_cypress/es_archives`.
+
+Currently there are two different ways of feeding data:
+1. By default
+2. Specifying a specific set of data for a specific test
+
+#### By default
+
+When a execution of the test is going to be done an empty kibana and a set of audibteat data are loaded (empty_kibana and auditbeat). With this data usually is enough to cover most of the scenarios that we are testing.
+
+#### Running tests with custom data
+
+Sometimes the default data is not enough and we need a specific set of data in order to being able to test the desired behaviour.
+
+In that case in the hooks of the test use the function `esArchiverLoad` to load the set of data neeed and `esArchiverUnload` to remove the changes done in the data.
+
+Example:
+
+```typescript
+import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
+
+describe('This are going to be a set of tests', () => {
+  before(() => {
+    esArchiverLoad('name_of_the_data_set_you_want_to_load');
+  });
+
+  after(() => {
+    esArchiverUnload('name_of_the_data_set_you_want_to_unload');
+  });
+
+  it('Going to test something awesome', () => {
+    hereGoesYourAwesomeTestcode     
+  });
+});
+
+```
+
+Note that loading and unloading data takes a signifcant amount of time so try to minimize the use of it when possible.
+
+### Current sets of data
+
+The current sets of data can be found in: `x-pack/test/siem_cypress/es_archives` folder.
+
+- auditbeat
+  - Auditbeat data generated in Sep, 2019 with the following hosts present: 
+    - suricata-iowa
+    - siem-kibana
+    - siem-es
+    - jessie
+- closed_signals
+  - Set of data with 108 closed signals linked to "Signals test" custom rule.
+- custome_rules
+  - Set if data with just 4 custom activated rules. 
+- empty_kibana
+  - Empty kibana board.
+- prebuilt_rules_loaded
+  - Elastic prebuilt loaded rules and deactivated. 
+- signals
+  - Set of data with 108 opened signals linked to "Signals test" custom rule.
+
+### How to generate new test data
+
+We are using es_archiver in order to generate the data that our Cypress tests needs.
+
+1. Setup if possible a clean instance of kibana and elasticsearch (if not, possible please try to clean the data that you are going to generate).
+2. With the kibana and elasticsearch instance up and running, create the data that you need for your test.
+3. When you are sure that you have all the data you need run the following command from: `x-pack/legacy/plugins/siem`
+
+```sh 
+node ../../../../scripts/es_archiver save <nameOfTheFolderWhereDataIsSaved> <indexPatternsToBeSaved>  --dir ../../../test/siem_cypress/es_archives --config ../../../../test/functional/config.js --es-url http://<elasticsearchUsername>:<elasticsearchPassword>@<elasticsearchHost>:<elasticsearchPort>
+```
+
+Example: 
+```sh
+node ../../../../scripts/es_archiver save custom_rules ".kibana",".siem-signal*"  --dir ../../../test/siem_cypress/es_archives --config ../../../../test/functional/config.js --es-url http://elastic:changeme@localhost:9220
+```
+
+Note that the command is going to create the folder if does not exist in the directory with the imported data.
+
+
 ## Running Tests Interactively
 
 Use the Cypress interactive test runner to develop and debug specific tests
@@ -210,30 +316,6 @@ cd x-pack/legacy/plugins/siem
 CYPRESS_baseUrl=http://localhost:5601 CYPRESS_ELASTICSEARCH_USERNAME=elastic CYPRESS_ELASTICSEARCH_PASSWORD=<password> yarn cypress:run
 ```
 
-## Running (Headless) Tests on the Command Line as a Jenkins execution
-
-To run (headless) tests as a Jenkins execution.
-
-1. First bootstrap kibana changes from the Kibana root directory:
-
-```sh
-yarn kbn bootstrap
-```
-
-2. Launch Cypress command line test runner:
-
-```sh 
-cd x-pack/legacy/plugins/siem
-yarn cypress:run-as-ci
-```
-
-Note that with this type of execution you don't need to have running a kibana and elasticsearch instance. This is because
- the command, as it would happen in the CI, will launch the instances. The elasticsearch instance will be fed with the data 
- placed in: `x-pack/test/siem_cypress/es_archives`.
- 
-As in this case we want to mimic a CI execution we want to execute the tests with the same set of data, this is why 
-in this case does not make sense to override Cypress environment variables.    
-
 ## Reporting
 
 When Cypress tests are run on the command line via `yarn cypress:run`,
@@ -280,4 +362,4 @@ target/kibana-siem/cypress/videos
 
 ## Linting 
 
-Optional linting rules for Cypress and linting setup can be found [here](https://github.com/cypress-io/eslint-plugin-cypress#usage)
\ No newline at end of file
+Optional linting rules for Cypress and linting setup can be found [here](https://github.com/cypress-io/eslint-plugin-cypress#usage)

From 93971dbfab74b39335115e8236741329486c4b79 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Fri, 10 Apr 2020 12:28:55 +0200
Subject: [PATCH 10/36] [Watcher] Preserve the watch active status after
 updates (#61999)

* Preserve the watch active status after updates

* Use route validation params to set isActive

* Fix Jest test

* Implement PR feedback

- Make the isActive flag required on the save watch endpoint
- Move the isActive state to base_watch and serialize from
  there.

* Fix Jest tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../watch_create_json.test.ts                 |  3 ++
 .../watch_create_threshold.test.tsx           |  8 +++++
 .../client_integration/watch_edit.test.ts     |  2 ++
 .../application/models/watch/base_watch.js    |  2 ++
 .../server/lib/elasticsearch_js_plugin.ts     |  4 +++
 .../routes/api/watch/register_save_route.ts   | 29 ++++++++-----------
 6 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts
index 2096c0dd61bd8..47de4548898cf 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts
@@ -108,6 +108,7 @@ describe('<JsonWatchEdit /> create route', () => {
               name: watch.name,
               type: watch.type,
               isNew: true,
+              isActive: true,
               actions: [
                 {
                   id: DEFAULT_LOGGING_ACTION_ID,
@@ -185,6 +186,7 @@ describe('<JsonWatchEdit /> create route', () => {
             id,
             type,
             isNew: true,
+            isActive: true,
             actions: [],
             watch: defaultWatchJson,
           };
@@ -246,6 +248,7 @@ describe('<JsonWatchEdit /> create route', () => {
             id,
             type,
             isNew: true,
+            isActive: true,
             actions: [],
             watch: defaultWatchJson,
           };
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
index 943233d3c14ed..e5bdcbbfb82cf 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
@@ -244,6 +244,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
             name: WATCH_NAME,
             type: WATCH_TYPES.THRESHOLD,
             isNew: true,
+            isActive: true,
             actions: [
               {
                 id: 'logging_1',
@@ -314,6 +315,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
             name: WATCH_NAME,
             type: WATCH_TYPES.THRESHOLD,
             isNew: true,
+            isActive: true,
             actions: [
               {
                 id: 'index_1',
@@ -376,6 +378,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
             name: WATCH_NAME,
             type: WATCH_TYPES.THRESHOLD,
             isNew: true,
+            isActive: true,
             actions: [
               {
                 id: 'slack_1',
@@ -448,6 +451,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
             name: WATCH_NAME,
             type: WATCH_TYPES.THRESHOLD,
             isNew: true,
+            isActive: true,
             actions: [
               {
                 id: 'email_1',
@@ -540,6 +544,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
             name: WATCH_NAME,
             type: WATCH_TYPES.THRESHOLD,
             isNew: true,
+            isActive: true,
             actions: [
               {
                 id: 'webhook_1',
@@ -629,6 +634,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
             name: WATCH_NAME,
             type: WATCH_TYPES.THRESHOLD,
             isNew: true,
+            isActive: true,
             actions: [
               {
                 id: 'jira_1',
@@ -709,6 +715,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
             name: WATCH_NAME,
             type: WATCH_TYPES.THRESHOLD,
             isNew: true,
+            isActive: true,
             actions: [
               {
                 id: 'pagerduty_1',
@@ -772,6 +779,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
             name: WATCH_NAME,
             type: WATCH_TYPES.THRESHOLD,
             isNew: true,
+            isActive: true,
             actions: [],
             index: MATCH_INDICES,
             timeField: WATCH_TIME_FIELD,
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_edit.test.ts b/x-pack/plugins/watcher/__jest__/client_integration/watch_edit.test.ts
index 51285a5786b00..ced06562b1d20 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_edit.test.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_edit.test.ts
@@ -98,6 +98,7 @@ describe('<WatchEdit />', () => {
             name: EDITED_WATCH_NAME,
             type: watch.type,
             isNew: false,
+            isActive: true,
             actions: [
               {
                 id: DEFAULT_LOGGING_ACTION_ID,
@@ -191,6 +192,7 @@ describe('<WatchEdit />', () => {
             name: EDITED_WATCH_NAME,
             type,
             isNew: false,
+            isActive: true,
             actions: [],
             timeField,
             triggerIntervalSize,
diff --git a/x-pack/plugins/watcher/public/application/models/watch/base_watch.js b/x-pack/plugins/watcher/public/application/models/watch/base_watch.js
index 3fe4fb006d241..af2e45b35501e 100644
--- a/x-pack/plugins/watcher/public/application/models/watch/base_watch.js
+++ b/x-pack/plugins/watcher/public/application/models/watch/base_watch.js
@@ -32,6 +32,7 @@ export class BaseWatch {
     this.isSystemWatch = Boolean(get(props, 'isSystemWatch'));
     this.watchStatus = WatchStatus.fromUpstreamJson(get(props, 'watchStatus'));
     this.watchErrors = WatchErrors.fromUpstreamJson(get(props, 'watchErrors'));
+    this.isActive = this.watchStatus.isActive ?? true;
 
     const actions = get(props, 'actions', []);
     this.actions = actions.map(Action.fromUpstreamJson);
@@ -115,6 +116,7 @@ export class BaseWatch {
       name: this.name,
       type: this.type,
       isNew: this.isNew,
+      isActive: this.isActive,
       actions: map(this.actions, action => action.upstreamJson),
     };
   }
diff --git a/x-pack/plugins/watcher/server/lib/elasticsearch_js_plugin.ts b/x-pack/plugins/watcher/server/lib/elasticsearch_js_plugin.ts
index 240e93e160fe0..3cb8dfb623fac 100644
--- a/x-pack/plugins/watcher/server/lib/elasticsearch_js_plugin.ts
+++ b/x-pack/plugins/watcher/server/lib/elasticsearch_js_plugin.ts
@@ -174,6 +174,10 @@ export const elasticsearchJsPlugin = (Client: any, config: any, components: any)
         name: 'master_timeout',
         type: 'duration',
       },
+      active: {
+        name: 'active',
+        type: 'boolean',
+      },
     },
     url: {
       fmt: '/_watcher/watch/<%=id%>',
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts
index 61d167bb9bbcd..10ee0c4857862 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts
@@ -5,7 +5,6 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
 import { i18n } from '@kbn/i18n';
 import { WATCH_TYPES } from '../../../../common/constants';
 import { serializeJsonWatch, serializeThresholdWatch } from '../../../../common/lib/serialization';
@@ -21,23 +20,11 @@ const bodySchema = schema.object(
   {
     type: schema.string(),
     isNew: schema.boolean(),
+    isActive: schema.boolean(),
   },
   { unknowns: 'allow' }
 );
 
-function fetchWatch(dataClient: IScopedClusterClient, watchId: string) {
-  return dataClient.callAsCurrentUser('watcher.getWatch', {
-    id: watchId,
-  });
-}
-
-function saveWatch(dataClient: IScopedClusterClient, id: string, body: any) {
-  return dataClient.callAsCurrentUser('watcher.putWatch', {
-    id,
-    body,
-  });
-}
-
 export function registerSaveRoute(deps: RouteDependencies) {
   deps.router.put(
     {
@@ -49,12 +36,16 @@ export function registerSaveRoute(deps: RouteDependencies) {
     },
     licensePreRoutingFactory(deps, async (ctx, request, response) => {
       const { id } = request.params;
-      const { type, isNew, ...watchConfig } = request.body;
+      const { type, isNew, isActive, ...watchConfig } = request.body;
+
+      const dataClient = ctx.watcher!.client;
 
       // For new watches, verify watch with the same ID doesn't already exist
       if (isNew) {
         try {
-          const existingWatch = await fetchWatch(ctx.watcher!.client, id);
+          const existingWatch = await dataClient.callAsCurrentUser('watcher.getWatch', {
+            id,
+          });
           if (existingWatch.found) {
             return response.conflict({
               body: {
@@ -92,7 +83,11 @@ export function registerSaveRoute(deps: RouteDependencies) {
       try {
         // Create new watch
         return response.ok({
-          body: await saveWatch(ctx.watcher!.client, id, serializedWatch),
+          body: await dataClient.callAsCurrentUser('watcher.putWatch', {
+            id,
+            active: isActive,
+            body: serializedWatch,
+          }),
         });
       } catch (e) {
         // Case: Error from Elasticsearch JS client

From d662cb5f4525e3a808900403f54f3c4f2c2c7097 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Fri, 10 Apr 2020 12:58:18 +0200
Subject: [PATCH 11/36] [ESUI] Move XJson Mode to src/plugins/es_ui_shared
 (#62758)

* Move XJson to x-pack/es_ui_shared

Also convert files to TS and clean up use of @ts-ignore

* Move console_lang to public

* Proper use of mocks

* Globally mock out .ace.worker.js modules

Having worker code exported in `public` of es_ui_shared poisoned
a lot of Jest tests with the need to mock out the ace worker.

Instead of adding mocks everywhere we handle the importing in
Jest by adding an entry to module mapper.

* Remove manual imports of mocks

* Delete es_ui_shared/public/mocks for now

* Put useXJson code in single place

* Import and instantiate xJsonMode

* Remove language mocks imports

Besides the fact that these paths are wrong these are no longer
needed because we mock at use Jest module mapper

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/dev/jest/config.js                        |  1 +
 .../jest/mocks/ace_worker_module_mock.js}     |  2 +-
 .../legacy/console_editor/editor_output.tsx   |  2 +-
 .../send_request_to_es.ts                     |  2 +-
 .../__tests__/output_tokenization.test.js     |  1 +
 .../mode/input_highlight_rules.js             |  2 +-
 .../mode/output_highlight_rules.js            |  2 +-
 .../models/legacy_core_editor/mode/script.js  |  2 +-
 .../__tests__/sense_editor.test.js            |  2 +-
 .../models/sense_editor/sense_editor.ts       |  2 +-
 src/plugins/console/public/lib/utils/index.ts |  5 +--
 .../console_lang/ace/modes/index.ts}          |  2 +-
 .../elasticsearch_sql_highlight_rules.ts      |  0
 .../ace/modes/lexer_rules/index.ts}           |  0
 .../lexer_rules/script_highlight_rules.ts}    |  4 +--
 .../lexer_rules/x_json_highlight_rules.ts}    | 12 +++----
 .../console_lang/ace/modes/x_json/index.ts    | 19 ++++++++++
 .../ace/modes/x_json/worker/index.ts          | 26 ++++++++++++++
 .../ace/modes/x_json/worker/worker.d.ts       | 25 +++++++++++++
 .../modes/x_json/worker/x_json.ace.worker.js  |  0
 .../console_lang/ace/modes/x_json/x_json.ts}  | 35 ++++++++++++++++---
 .../{ => public}/console_lang/index.ts        |  3 ++
 .../{ => public}/console_lang/lib/index.ts    |  0
 .../json_xjson_translation_tools.test.ts      |  0
 .../__tests__/utils_string_collapsing.txt     |  0
 .../__tests__/utils_string_expanding.txt      |  0
 .../lib/json_xjson_translation_tools/index.ts |  0
 src/plugins/es_ui_shared/public/index.ts      | 11 ++++++
 .../static/ace_x_json/hooks/index.ts          | 20 +++++++++++
 .../ace_x_json/hooks/use_x_json.ts}           | 26 ++++++++------
 x-pack/dev-tools/jest/create_jest_config.js   |  1 +
 .../console_lang/ace/modes/index.ts           |  7 ----
 .../console_lang/ace/modes/x_json/index.ts    |  7 ----
 .../ace/modes/x_json/worker/index.ts          | 13 -------
 .../ace/modes/x_json/worker/worker.d.ts       | 12 -------
 .../console_lang/ace/modes/x_json/x_json.ts   | 34 ------------------
 .../es_ui_shared/console_lang/index.ts        |  7 ----
 .../es_ui_shared/console_lang/mocks.ts        |  9 -----
 .../components/custom_hooks/index.ts          |  1 -
 .../custom_hooks/use_x_json_mode.ts           | 26 --------------
 .../create_analytics_advanced_editor.tsx      |  5 ++-
 .../use_create_analytics_form/reducer.ts      |  2 +-
 .../ml_job_editor/ml_job_editor.tsx           |  5 ++-
 x-pack/plugins/ml/shared_imports.ts           |  5 ++-
 .../public/application/editor/editor.test.tsx |  2 --
 .../public/application/editor/init_editor.ts  |  2 +-
 .../utils/check_for_json_errors.ts            |  2 +-
 .../public/app/hooks/use_x_json_mode.ts       | 20 -----------
 .../step_define/step_define_form.tsx          |  4 ++-
 .../transform/public/shared_imports.ts        |  4 +--
 .../builtin_action_types/es_index.tsx         |  2 +-
 .../public/application/lib/use_x_json_mode.ts | 25 -------------
 .../watch_create_json.test.ts                 |  2 --
 .../watch_create_threshold.test.tsx           |  2 --
 .../client_integration/watch_edit.test.ts     |  1 -
 .../client_integration/watch_list.test.ts     |  1 -
 .../client_integration/watch_status.test.ts   |  1 -
 .../json_watch_edit/json_watch_edit_form.tsx  |  3 +-
 .../json_watch_edit_simulate.tsx              |  2 +-
 .../json_watch_edit/use_x_json_mode.ts        | 24 -------------
 .../public/application/shared_imports.ts      |  2 ++
 61 files changed, 193 insertions(+), 246 deletions(-)
 rename src/{plugins/es_ui_shared/console_lang/ace/modes/x_json/index.ts => dev/jest/mocks/ace_worker_module_mock.js} (94%)
 rename src/plugins/es_ui_shared/{console_lang/ace/modes/index.js => public/console_lang/ace/modes/index.ts} (94%)
 rename src/plugins/es_ui_shared/{ => public}/console_lang/ace/modes/lexer_rules/elasticsearch_sql_highlight_rules.ts (100%)
 rename src/plugins/es_ui_shared/{console_lang/ace/modes/lexer_rules/index.js => public/console_lang/ace/modes/lexer_rules/index.ts} (100%)
 rename src/plugins/es_ui_shared/{console_lang/ace/modes/lexer_rules/script_highlight_rules.js => public/console_lang/ace/modes/lexer_rules/script_highlight_rules.ts} (97%)
 rename src/plugins/es_ui_shared/{console_lang/ace/modes/lexer_rules/x_json_highlight_rules.js => public/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.ts} (94%)
 create mode 100644 src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/index.ts
 create mode 100644 src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/index.ts
 create mode 100644 src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/worker.d.ts
 rename x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/worker.js => src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/x_json.ace.worker.js (100%)
 rename src/plugins/es_ui_shared/{console_lang/ace/modes/x_json/x_json_mode.ts => public/console_lang/ace/modes/x_json/x_json.ts} (61%)
 rename src/plugins/es_ui_shared/{ => public}/console_lang/index.ts (92%)
 rename src/plugins/es_ui_shared/{ => public}/console_lang/lib/index.ts (100%)
 rename src/plugins/es_ui_shared/{ => public}/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts (100%)
 rename src/plugins/es_ui_shared/{ => public}/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_collapsing.txt (100%)
 rename src/plugins/es_ui_shared/{ => public}/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt (100%)
 rename src/plugins/es_ui_shared/{ => public}/console_lang/lib/json_xjson_translation_tools/index.ts (100%)
 create mode 100644 src/plugins/es_ui_shared/static/ace_x_json/hooks/index.ts
 rename src/plugins/es_ui_shared/{console_lang/ace/modes/index.d.ts => static/ace_x_json/hooks/use_x_json.ts} (60%)
 delete mode 100644 x-pack/plugins/es_ui_shared/console_lang/ace/modes/index.ts
 delete mode 100644 x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/index.ts
 delete mode 100644 x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/index.ts
 delete mode 100644 x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/worker.d.ts
 delete mode 100644 x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/x_json.ts
 delete mode 100644 x-pack/plugins/es_ui_shared/console_lang/index.ts
 delete mode 100644 x-pack/plugins/es_ui_shared/console_lang/mocks.ts
 delete mode 100644 x-pack/plugins/ml/public/application/components/custom_hooks/use_x_json_mode.ts
 delete mode 100644 x-pack/plugins/transform/public/app/hooks/use_x_json_mode.ts
 delete mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/use_x_json_mode.ts
 delete mode 100644 x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/use_x_json_mode.ts

diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js
index a941735c7840e..7da14e0dfe51b 100644
--- a/src/dev/jest/config.js
+++ b/src/dev/jest/config.js
@@ -62,6 +62,7 @@ export default {
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
       '<rootDir>/src/dev/jest/mocks/file_mock.js',
     '\\.(css|less|scss)$': '<rootDir>/src/dev/jest/mocks/style_mock.js',
+    '\\.ace\\.worker.js$': '<rootDir>/src/dev/jest/mocks/ace_worker_module_mock.js',
   },
   setupFiles: [
     '<rootDir>/src/dev/jest/setup/babel_polyfill.js',
diff --git a/src/plugins/es_ui_shared/console_lang/ace/modes/x_json/index.ts b/src/dev/jest/mocks/ace_worker_module_mock.js
similarity index 94%
rename from src/plugins/es_ui_shared/console_lang/ace/modes/x_json/index.ts
rename to src/dev/jest/mocks/ace_worker_module_mock.js
index caa7b518b8b66..9d267f494f8bf 100644
--- a/src/plugins/es_ui_shared/console_lang/ace/modes/x_json/index.ts
+++ b/src/dev/jest/mocks/ace_worker_module_mock.js
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { XJsonMode } from './x_json_mode';
+module.exports = '';
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
index 36d90bb6bff1a..8510aaebfaa1e 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
@@ -20,7 +20,7 @@
 import { EuiScreenReaderOnly } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useRef } from 'react';
-import { expandLiteralStrings } from '../../../../../../../es_ui_shared/console_lang/lib';
+import { expandLiteralStrings } from '../../../../../../../es_ui_shared/public';
 import {
   useEditorReadContext,
   useRequestReadContext,
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
index 102f90a9feb6f..cfbd5691bc22b 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
@@ -18,7 +18,7 @@
  */
 
 import { extractDeprecationMessages } from '../../../lib/utils';
-import { collapseLiteralStrings } from '../../../../../es_ui_shared/console_lang/lib';
+import { collapseLiteralStrings } from '../../../../../es_ui_shared/public';
 // @ts-ignore
 import * as es from '../../../lib/es/es';
 import { BaseResponseType } from '../../../types';
diff --git a/src/plugins/console/public/application/models/legacy_core_editor/__tests__/output_tokenization.test.js b/src/plugins/console/public/application/models/legacy_core_editor/__tests__/output_tokenization.test.js
index 6a93d007a6cdc..5c86b0a1d2092 100644
--- a/src/plugins/console/public/application/models/legacy_core_editor/__tests__/output_tokenization.test.js
+++ b/src/plugins/console/public/application/models/legacy_core_editor/__tests__/output_tokenization.test.js
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import '../legacy_core_editor.test.mocks';
 const $ = require('jquery');
 import RowParser from '../../../../lib/row_parser';
 import ace from 'brace';
diff --git a/src/plugins/console/public/application/models/legacy_core_editor/mode/input_highlight_rules.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/input_highlight_rules.js
index 2c1b30f806f95..29f192f4ea858 100644
--- a/src/plugins/console/public/application/models/legacy_core_editor/mode/input_highlight_rules.js
+++ b/src/plugins/console/public/application/models/legacy_core_editor/mode/input_highlight_rules.js
@@ -18,7 +18,7 @@
  */
 
 const ace = require('brace');
-import { addXJsonToRules } from '../../../../../../es_ui_shared/console_lang';
+import { addXJsonToRules } from '../../../../../../es_ui_shared/public';
 
 export function addEOL(tokens, reg, nextIfEOL, normalNext) {
   if (typeof reg === 'object') {
diff --git a/src/plugins/console/public/application/models/legacy_core_editor/mode/output_highlight_rules.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/output_highlight_rules.js
index e27222ebd65e9..c9d538ab6ceb1 100644
--- a/src/plugins/console/public/application/models/legacy_core_editor/mode/output_highlight_rules.js
+++ b/src/plugins/console/public/application/models/legacy_core_editor/mode/output_highlight_rules.js
@@ -19,7 +19,7 @@
 
 const ace = require('brace');
 import 'brace/mode/json';
-import { addXJsonToRules } from '../../../../../../es_ui_shared/console_lang';
+import { addXJsonToRules } from '../../../../../../es_ui_shared/public';
 
 const oop = ace.acequire('ace/lib/oop');
 const JsonHighlightRules = ace.acequire('ace/mode/json_highlight_rules').JsonHighlightRules;
diff --git a/src/plugins/console/public/application/models/legacy_core_editor/mode/script.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/script.js
index 13ae329380221..89adea8921c07 100644
--- a/src/plugins/console/public/application/models/legacy_core_editor/mode/script.js
+++ b/src/plugins/console/public/application/models/legacy_core_editor/mode/script.js
@@ -18,7 +18,7 @@
  */
 
 import ace from 'brace';
-import { ScriptHighlightRules } from '../../../../../../es_ui_shared/console_lang';
+import { ScriptHighlightRules } from '../../../../../../es_ui_shared/public';
 
 const oop = ace.acequire('ace/lib/oop');
 const TextMode = ace.acequire('ace/mode/text').Mode;
diff --git a/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js b/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js
index 63f97345bc9ff..6afc03df13b4c 100644
--- a/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js
+++ b/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js
@@ -22,7 +22,7 @@ import $ from 'jquery';
 import _ from 'lodash';
 
 import { create } from '../create';
-import { collapseLiteralStrings } from '../../../../../../es_ui_shared/console_lang/lib';
+import { collapseLiteralStrings } from '../../../../../../es_ui_shared/public';
 const editorInput1 = require('./editor_input1.txt');
 
 describe('Editor', () => {
diff --git a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
index b1444bdf2bbab..9bcd3a6872196 100644
--- a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
+++ b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import RowParser from '../../../lib/row_parser';
-import { collapseLiteralStrings } from '../../../../../es_ui_shared/console_lang/lib';
+import { collapseLiteralStrings } from '../../../../../es_ui_shared/public';
 import * as utils from '../../../lib/utils';
 
 // @ts-ignore
diff --git a/src/plugins/console/public/lib/utils/index.ts b/src/plugins/console/public/lib/utils/index.ts
index f66c952dd3af7..0ebea0f9d4055 100644
--- a/src/plugins/console/public/lib/utils/index.ts
+++ b/src/plugins/console/public/lib/utils/index.ts
@@ -18,10 +18,7 @@
  */
 
 import _ from 'lodash';
-import {
-  expandLiteralStrings,
-  collapseLiteralStrings,
-} from '../../../../es_ui_shared/console_lang/lib';
+import { expandLiteralStrings, collapseLiteralStrings } from '../../../../es_ui_shared/public';
 
 export function textFromRequest(request: any) {
   let data = request.data;
diff --git a/src/plugins/es_ui_shared/console_lang/ace/modes/index.js b/src/plugins/es_ui_shared/public/console_lang/ace/modes/index.ts
similarity index 94%
rename from src/plugins/es_ui_shared/console_lang/ace/modes/index.js
rename to src/plugins/es_ui_shared/public/console_lang/ace/modes/index.ts
index 955f23116f659..f9e016c5078af 100644
--- a/src/plugins/es_ui_shared/console_lang/ace/modes/index.js
+++ b/src/plugins/es_ui_shared/public/console_lang/ace/modes/index.ts
@@ -24,4 +24,4 @@ export {
   addXJsonToRules,
 } from './lexer_rules';
 
-export { XJsonMode, installXJsonMode } from './x_json';
+export { installXJsonMode, XJsonMode } from './x_json';
diff --git a/src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/elasticsearch_sql_highlight_rules.ts b/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/elasticsearch_sql_highlight_rules.ts
similarity index 100%
rename from src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/elasticsearch_sql_highlight_rules.ts
rename to src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/elasticsearch_sql_highlight_rules.ts
diff --git a/src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/index.js b/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/index.ts
similarity index 100%
rename from src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/index.js
rename to src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/index.ts
diff --git a/src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/script_highlight_rules.js b/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/script_highlight_rules.ts
similarity index 97%
rename from src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/script_highlight_rules.js
rename to src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/script_highlight_rules.ts
index b3999c76493c0..4b2e965276a3c 100644
--- a/src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/script_highlight_rules.js
+++ b/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/script_highlight_rules.ts
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-const ace = require('brace');
+import ace from 'brace';
 const oop = ace.acequire('ace/lib/oop');
 const { TextHighlightRules } = ace.acequire('ace/mode/text_highlight_rules');
 const painlessKeywords =
   'def|int|long|byte|String|float|double|char|null|if|else|while|do|for|continue|break|new|try|catch|throw|this|instanceof|return|ctx';
 
-export function ScriptHighlightRules() {
+export function ScriptHighlightRules(this: any) {
   this.name = 'ScriptHighlightRules';
   this.$rules = {
     start: [
diff --git a/src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.js b/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.ts
similarity index 94%
rename from src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.js
rename to src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.ts
index 14323b9320330..3663b92d92a6f 100644
--- a/src/plugins/es_ui_shared/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.js
+++ b/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.ts
@@ -22,14 +22,14 @@ import ace from 'brace';
 import 'brace/mode/json';
 
 import { ElasticsearchSqlHighlightRules } from './elasticsearch_sql_highlight_rules';
-const { ScriptHighlightRules } = require('./script_highlight_rules');
+import { ScriptHighlightRules } from './script_highlight_rules';
 
 const { JsonHighlightRules } = ace.acequire('ace/mode/json_highlight_rules');
 const oop = ace.acequire('ace/lib/oop');
 
-const jsonRules = function(root) {
+const jsonRules = function(root: any) {
   root = root ? root : 'json';
-  const rules = {};
+  const rules: any = {};
   const xJsonRules = [
     {
       token: [
@@ -135,7 +135,7 @@ const jsonRules = function(root) {
       merge: false,
       push: true,
     },
-  ].concat(xJsonRules);
+  ].concat(xJsonRules as any);
 
   rules.string_literal = [
     {
@@ -151,7 +151,7 @@ const jsonRules = function(root) {
   return rules;
 };
 
-export function XJsonHighlightRules() {
+export function XJsonHighlightRules(this: any) {
   this.$rules = {
     ...jsonRules('start'),
   };
@@ -175,7 +175,7 @@ export function XJsonHighlightRules() {
 
 oop.inherits(XJsonHighlightRules, JsonHighlightRules);
 
-export function addToRules(otherRules, embedUnder) {
+export function addToRules(otherRules: any, embedUnder: any) {
   otherRules.$rules = _.defaultsDeep(otherRules.$rules, jsonRules(embedUnder));
   otherRules.embedRules(ScriptHighlightRules, 'script-', [
     {
diff --git a/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/index.ts b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/index.ts
new file mode 100644
index 0000000000000..6fd819bb4e9eb
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export { installXJsonMode, XJsonMode } from './x_json';
diff --git a/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/index.ts b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/index.ts
new file mode 100644
index 0000000000000..0f884765be05e
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/index.ts
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+// @ts-ignore
+import src from '!!raw-loader!./x_json.ace.worker.js';
+
+export const workerModule = {
+  id: 'ace/mode/json_worker',
+  src,
+};
diff --git a/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/worker.d.ts b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/worker.d.ts
new file mode 100644
index 0000000000000..d2363a2610689
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/worker.d.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Satisfy TS's requirements that the module be declared per './index.ts'.
+declare module '!!raw-loader!./worker.js' {
+  const content: string;
+  // eslint-disable-next-line import/no-default-export
+  export default content;
+}
diff --git a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/worker.js b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/x_json.ace.worker.js
similarity index 100%
rename from x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/worker.js
rename to src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/worker/x_json.ace.worker.js
diff --git a/src/plugins/es_ui_shared/console_lang/ace/modes/x_json/x_json_mode.ts b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/x_json.ts
similarity index 61%
rename from src/plugins/es_ui_shared/console_lang/ace/modes/x_json/x_json_mode.ts
rename to src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/x_json.ts
index 9f804c29a5d27..9fbfedba1d23f 100644
--- a/src/plugins/es_ui_shared/console_lang/ace/modes/x_json/x_json_mode.ts
+++ b/src/plugins/es_ui_shared/public/console_lang/ace/modes/x_json/x_json.ts
@@ -18,23 +18,50 @@
  */
 
 import ace from 'brace';
-
 import { XJsonHighlightRules } from '../index';
+import { workerModule } from './worker';
+
+const { WorkerClient } = ace.acequire('ace/worker/worker_client');
 
 const oop = ace.acequire('ace/lib/oop');
+
 const { Mode: JSONMode } = ace.acequire('ace/mode/json');
 const { Tokenizer: AceTokenizer } = ace.acequire('ace/tokenizer');
 const { MatchingBraceOutdent } = ace.acequire('ace/mode/matching_brace_outdent');
 const { CstyleBehaviour } = ace.acequire('ace/mode/behaviour/cstyle');
 const { FoldMode: CStyleFoldMode } = ace.acequire('ace/mode/folding/cstyle');
 
-export function XJsonMode(this: any) {
-  const ruleset: any = new XJsonHighlightRules();
+const XJsonMode: any = function XJsonMode(this: any) {
+  const ruleset: any = new (XJsonHighlightRules as any)();
   ruleset.normalizeRules();
   this.$tokenizer = new AceTokenizer(ruleset.getRules());
   this.$outdent = new MatchingBraceOutdent();
   this.$behaviour = new CstyleBehaviour();
   this.foldingRules = new CStyleFoldMode();
-}
+};
 
 oop.inherits(XJsonMode, JSONMode);
+
+// Then clobber `createWorker` method to install our worker source. Per ace's wiki: https://github.com/ajaxorg/ace/wiki/Syntax-validation
+(XJsonMode.prototype as any).createWorker = function(session: ace.IEditSession) {
+  const xJsonWorker = new WorkerClient(['ace'], workerModule, 'JsonWorker');
+
+  xJsonWorker.attachToDocument(session.getDocument());
+
+  xJsonWorker.on('annotate', function(e: { data: any }) {
+    session.setAnnotations(e.data);
+  });
+
+  xJsonWorker.on('terminate', function() {
+    session.clearAnnotations();
+  });
+
+  return xJsonWorker;
+};
+
+export { XJsonMode };
+
+export function installXJsonMode(editor: ace.Editor) {
+  const session = editor.getSession();
+  session.setMode(new XJsonMode());
+}
diff --git a/src/plugins/es_ui_shared/console_lang/index.ts b/src/plugins/es_ui_shared/public/console_lang/index.ts
similarity index 92%
rename from src/plugins/es_ui_shared/console_lang/index.ts
rename to src/plugins/es_ui_shared/public/console_lang/index.ts
index a4958911af412..7d83191569622 100644
--- a/src/plugins/es_ui_shared/console_lang/index.ts
+++ b/src/plugins/es_ui_shared/public/console_lang/index.ts
@@ -26,4 +26,7 @@ export {
   XJsonHighlightRules,
   addXJsonToRules,
   XJsonMode,
+  installXJsonMode,
 } from './ace/modes';
+
+export { expandLiteralStrings, collapseLiteralStrings } from './lib';
diff --git a/src/plugins/es_ui_shared/console_lang/lib/index.ts b/src/plugins/es_ui_shared/public/console_lang/lib/index.ts
similarity index 100%
rename from src/plugins/es_ui_shared/console_lang/lib/index.ts
rename to src/plugins/es_ui_shared/public/console_lang/lib/index.ts
diff --git a/src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts
similarity index 100%
rename from src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts
rename to src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts
diff --git a/src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_collapsing.txt b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_collapsing.txt
similarity index 100%
rename from src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_collapsing.txt
rename to src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_collapsing.txt
diff --git a/src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt
similarity index 100%
rename from src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt
rename to src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/utils_string_expanding.txt
diff --git a/src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools/index.ts b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/index.ts
similarity index 100%
rename from src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools/index.ts
rename to src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/index.ts
diff --git a/src/plugins/es_ui_shared/public/index.ts b/src/plugins/es_ui_shared/public/index.ts
index 6db6248f4c68f..a0371bf351193 100644
--- a/src/plugins/es_ui_shared/public/index.ts
+++ b/src/plugins/es_ui_shared/public/index.ts
@@ -36,6 +36,17 @@ export { indices } from './indices';
 
 export { useUIAceKeyboardMode } from './use_ui_ace_keyboard_mode';
 
+export {
+  installXJsonMode,
+  XJsonMode,
+  ElasticsearchSqlHighlightRules,
+  addXJsonToRules,
+  ScriptHighlightRules,
+  XJsonHighlightRules,
+  collapseLiteralStrings,
+  expandLiteralStrings,
+} from './console_lang';
+
 /** dummy plugin, we just want esUiShared to have its own bundle */
 export function plugin() {
   return new (class EsUiSharedPlugin {
diff --git a/src/plugins/es_ui_shared/static/ace_x_json/hooks/index.ts b/src/plugins/es_ui_shared/static/ace_x_json/hooks/index.ts
new file mode 100644
index 0000000000000..1d2c33a9f0f47
--- /dev/null
+++ b/src/plugins/es_ui_shared/static/ace_x_json/hooks/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { useXJsonMode } from './use_x_json';
diff --git a/src/plugins/es_ui_shared/console_lang/ace/modes/index.d.ts b/src/plugins/es_ui_shared/static/ace_x_json/hooks/use_x_json.ts
similarity index 60%
rename from src/plugins/es_ui_shared/console_lang/ace/modes/index.d.ts
rename to src/plugins/es_ui_shared/static/ace_x_json/hooks/use_x_json.ts
index 06c9f9a51ea68..2b0bf0c8a3a7c 100644
--- a/src/plugins/es_ui_shared/console_lang/ace/modes/index.d.ts
+++ b/src/plugins/es_ui_shared/static/ace_x_json/hooks/use_x_json.ts
@@ -17,16 +17,22 @@
  * under the License.
  */
 
-import { Editor } from 'brace';
+import { useState } from 'react';
+import { XJsonMode, collapseLiteralStrings, expandLiteralStrings } from '../../../public';
 
-export declare const ElasticsearchSqlHighlightRules: FunctionConstructor;
-export declare const ScriptHighlightRules: FunctionConstructor;
-export declare const XJsonHighlightRules: FunctionConstructor;
+const xJsonMode = new XJsonMode();
 
-export declare const XJsonMode: FunctionConstructor;
+export const useXJsonMode = (json: Record<string, any> | string | null) => {
+  const [xJson, setXJson] = useState(() =>
+    json === null
+      ? ''
+      : expandLiteralStrings(typeof json === 'string' ? json : JSON.stringify(json, null, 2))
+  );
 
-/**
- * @param otherRules Another Ace ruleset
- * @param embedUnder The state name under which the rules will be embedded. Defaults to "json".
- */
-export declare const addXJsonToRules: (otherRules: any, embedUnder?: string) => void;
+  return {
+    xJson,
+    setXJson,
+    xJsonMode,
+    convertToJson: collapseLiteralStrings,
+  };
+};
diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js
index 1f4311ae9bcf6..3068cdd0daa5b 100644
--- a/x-pack/dev-tools/jest/create_jest_config.js
+++ b/x-pack/dev-tools/jest/create_jest_config.js
@@ -28,6 +28,7 @@ export function createJestConfig({ kibanaDirectory, xPackKibanaDirectory }) {
       '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': fileMockPath,
       '\\.module.(css|scss)$': `${kibanaDirectory}/src/dev/jest/mocks/css_module_mock.js`,
       '\\.(css|less|scss)$': `${kibanaDirectory}/src/dev/jest/mocks/style_mock.js`,
+      '\\.ace\\.worker.js$': `${kibanaDirectory}/src/dev/jest/mocks/ace_worker_module_mock.js`,
       '^test_utils/enzyme_helpers': `${xPackKibanaDirectory}/test_utils/enzyme_helpers.tsx`,
       '^test_utils/find_test_subject': `${xPackKibanaDirectory}/test_utils/find_test_subject.ts`,
       '^test_utils/stub_web_worker': `${xPackKibanaDirectory}/test_utils/stub_web_worker.ts`,
diff --git a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/index.ts b/x-pack/plugins/es_ui_shared/console_lang/ace/modes/index.ts
deleted file mode 100644
index ae3c9962ecadb..0000000000000
--- a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { installXJsonMode, XJsonMode } from './x_json';
diff --git a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/index.ts b/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/index.ts
deleted file mode 100644
index ae3c9962ecadb..0000000000000
--- a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { installXJsonMode, XJsonMode } from './x_json';
diff --git a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/index.ts b/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/index.ts
deleted file mode 100644
index 0e40fd335dd31..0000000000000
--- a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * 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.
- */
-
-// @ts-ignore
-import src from '!!raw-loader!./worker.js';
-
-export const workerModule = {
-  id: 'ace/mode/json_worker',
-  src,
-};
diff --git a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/worker.d.ts b/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/worker.d.ts
deleted file mode 100644
index 4ebad4f2ef91c..0000000000000
--- a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/worker/worker.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * 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.
- */
-
-// Satisfy TS's requirements that the module be declared per './index.ts'.
-declare module '!!raw-loader!./worker.js' {
-  const content: string;
-  // eslint-disable-next-line import/no-default-export
-  export default content;
-}
diff --git a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/x_json.ts b/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/x_json.ts
deleted file mode 100644
index bfeca045bea02..0000000000000
--- a/x-pack/plugins/es_ui_shared/console_lang/ace/modes/x_json/x_json.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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 ace from 'brace';
-import { XJsonMode } from '../../../../../../../src/plugins/es_ui_shared/console_lang';
-import { workerModule } from './worker';
-const { WorkerClient } = ace.acequire('ace/worker/worker_client');
-
-// Then clobber `createWorker` method to install our worker source. Per ace's wiki: https://github.com/ajaxorg/ace/wiki/Syntax-validation
-(XJsonMode.prototype as any).createWorker = function(session: ace.IEditSession) {
-  const xJsonWorker = new WorkerClient(['ace'], workerModule, 'JsonWorker');
-
-  xJsonWorker.attachToDocument(session.getDocument());
-
-  xJsonWorker.on('annotate', function(e: { data: any }) {
-    session.setAnnotations(e.data);
-  });
-
-  xJsonWorker.on('terminate', function() {
-    session.clearAnnotations();
-  });
-
-  return xJsonWorker;
-};
-
-export { XJsonMode };
-
-export function installXJsonMode(editor: ace.Editor) {
-  const session = editor.getSession();
-  session.setMode(new (XJsonMode as any)());
-}
diff --git a/x-pack/plugins/es_ui_shared/console_lang/index.ts b/x-pack/plugins/es_ui_shared/console_lang/index.ts
deleted file mode 100644
index b5fe3a554e34d..0000000000000
--- a/x-pack/plugins/es_ui_shared/console_lang/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 { XJsonMode, installXJsonMode } from './ace/modes';
diff --git a/x-pack/plugins/es_ui_shared/console_lang/mocks.ts b/x-pack/plugins/es_ui_shared/console_lang/mocks.ts
deleted file mode 100644
index 68480282ddc03..0000000000000
--- a/x-pack/plugins/es_ui_shared/console_lang/mocks.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * 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.
- */
-
-jest.mock('./ace/modes/x_json/worker', () => ({
-  workerModule: { id: 'ace/mode/json_worker', src: '' },
-}));
diff --git a/x-pack/plugins/ml/public/application/components/custom_hooks/index.ts b/x-pack/plugins/ml/public/application/components/custom_hooks/index.ts
index dfd74d8970cb4..ffead802bd6f9 100644
--- a/x-pack/plugins/ml/public/application/components/custom_hooks/index.ts
+++ b/x-pack/plugins/ml/public/application/components/custom_hooks/index.ts
@@ -5,4 +5,3 @@
  */
 
 export { usePartialState } from './use_partial_state';
-export { useXJsonMode, xJsonMode } from './use_x_json_mode';
diff --git a/x-pack/plugins/ml/public/application/components/custom_hooks/use_x_json_mode.ts b/x-pack/plugins/ml/public/application/components/custom_hooks/use_x_json_mode.ts
deleted file mode 100644
index c979632db54d6..0000000000000
--- a/x-pack/plugins/ml/public/application/components/custom_hooks/use_x_json_mode.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 { useState } from 'react';
-import {
-  collapseLiteralStrings,
-  expandLiteralStrings,
-  XJsonMode,
-} from '../../../../shared_imports';
-
-// @ts-ignore
-export const xJsonMode = new XJsonMode();
-
-export const useXJsonMode = (json: string) => {
-  const [xJson, setXJson] = useState(expandLiteralStrings(json));
-
-  return {
-    xJson,
-    setXJson,
-    xJsonMode,
-    convertToJson: collapseLiteralStrings,
-  };
-};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
index a3e5da5e2d039..cef03cc0d0c76 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
@@ -18,8 +18,11 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
+import { XJsonMode } from '../../../../../../../shared_imports';
+
+const xJsonMode = new XJsonMode();
+
 import { CreateAnalyticsFormProps } from '../../hooks/use_create_analytics_form';
-import { xJsonMode } from '../../../../../components/custom_hooks';
 
 export const CreateAnalyticsAdvancedEditor: FC<CreateAnalyticsFormProps> = ({ actions, state }) => {
   const { setAdvancedEditorRawString, setFormState } = actions;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
index ded6e50947035..d55eb14a20e29 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
@@ -11,7 +11,7 @@ import numeral from '@elastic/numeral';
 import { isEmpty } from 'lodash';
 import { isValidIndexName } from '../../../../../../../common/util/es_utils';
 
-import { collapseLiteralStrings } from '../../../../../../../../../../src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools';
+import { collapseLiteralStrings } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
 
 import { Action, ACTION } from './actions';
 import { getInitialState, getJobConfigFromFormState, State } from './state';
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/ml_job_editor/ml_job_editor.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/ml_job_editor/ml_job_editor.tsx
index 0633c62f754e0..c10212ee31564 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/ml_job_editor/ml_job_editor.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/ml_job_editor/ml_job_editor.tsx
@@ -7,10 +7,9 @@
 import React, { FC } from 'react';
 
 import { EuiCodeEditor, EuiCodeEditorProps } from '@elastic/eui';
-import { expandLiteralStrings } from '../../../../../../shared_imports';
-import { xJsonMode } from '../../../../components/custom_hooks';
+import { expandLiteralStrings, XJsonMode } from '../../../../../../shared_imports';
 
-export const ML_EDITOR_MODE = { TEXT: 'text', JSON: 'json', XJSON: xJsonMode };
+export const ML_EDITOR_MODE = { TEXT: 'text', JSON: 'json', XJSON: new XJsonMode() };
 
 interface MlJobEditorProps {
   value: string;
diff --git a/x-pack/plugins/ml/shared_imports.ts b/x-pack/plugins/ml/shared_imports.ts
index 94ce8c82f1d95..a82ed5387818d 100644
--- a/x-pack/plugins/ml/shared_imports.ts
+++ b/x-pack/plugins/ml/shared_imports.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { XJsonMode } from '../../../src/plugins/es_ui_shared/console_lang/ace/modes/x_json';
-
 export {
+  XJsonMode,
   collapseLiteralStrings,
   expandLiteralStrings,
-} from '../../../src/plugins/es_ui_shared/console_lang/lib';
+} from '../../../src/plugins/es_ui_shared/public';
diff --git a/x-pack/plugins/searchprofiler/public/application/editor/editor.test.tsx b/x-pack/plugins/searchprofiler/public/application/editor/editor.test.tsx
index ad56b3957eb74..e56fc79156666 100644
--- a/x-pack/plugins/searchprofiler/public/application/editor/editor.test.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/editor/editor.test.tsx
@@ -6,8 +6,6 @@
 import 'brace';
 import 'brace/mode/json';
 
-import '../../../../es_ui_shared/console_lang/mocks';
-
 import { registerTestBed } from '../../../../../test_utils';
 import { Editor, Props } from '.';
 
diff --git a/x-pack/plugins/searchprofiler/public/application/editor/init_editor.ts b/x-pack/plugins/searchprofiler/public/application/editor/init_editor.ts
index 6f19ce12eb639..3ad92531e4367 100644
--- a/x-pack/plugins/searchprofiler/public/application/editor/init_editor.ts
+++ b/x-pack/plugins/searchprofiler/public/application/editor/init_editor.ts
@@ -5,7 +5,7 @@
  */
 
 import ace from 'brace';
-import { installXJsonMode } from '../../../../es_ui_shared/console_lang';
+import { installXJsonMode } from '../../../../../../src/plugins/es_ui_shared/public';
 
 export function initializeEditor({
   el,
diff --git a/x-pack/plugins/searchprofiler/public/application/utils/check_for_json_errors.ts b/x-pack/plugins/searchprofiler/public/application/utils/check_for_json_errors.ts
index 99687de0f1440..58a62c4636c25 100644
--- a/x-pack/plugins/searchprofiler/public/application/utils/check_for_json_errors.ts
+++ b/x-pack/plugins/searchprofiler/public/application/utils/check_for_json_errors.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { collapseLiteralStrings } from '../../../../../../src/plugins/es_ui_shared/console_lang/lib';
+import { collapseLiteralStrings } from '../../../../../../src/plugins/es_ui_shared/public';
 
 export function checkForParseErrors(json: string) {
   const sanitizedJson = collapseLiteralStrings(json);
diff --git a/x-pack/plugins/transform/public/app/hooks/use_x_json_mode.ts b/x-pack/plugins/transform/public/app/hooks/use_x_json_mode.ts
deleted file mode 100644
index 1017ce198ff29..0000000000000
--- a/x-pack/plugins/transform/public/app/hooks/use_x_json_mode.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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 { useState } from 'react';
-import { collapseLiteralStrings, expandLiteralStrings, XJsonMode } from '../../shared_imports';
-
-export const xJsonMode = new XJsonMode();
-
-export const useXJsonMode = (json: string) => {
-  const [xJson, setXJson] = useState(expandLiteralStrings(json));
-
-  return {
-    xJson,
-    setXJson,
-    xJsonMode,
-    convertToJson: collapseLiteralStrings,
-  };
-};
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx
index 5e0eb7ee08361..320e405b5d437 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx
@@ -33,11 +33,12 @@ import {
   QueryStringInput,
 } from '../../../../../../../../../src/plugins/data/public';
 
+import { useXJsonMode } from '../../../../../../../../../src/plugins/es_ui_shared/static/ace_x_json/hooks';
+
 import { PivotPreview } from '../../../../components/pivot_preview';
 
 import { useDocumentationLinks } from '../../../../hooks/use_documentation_links';
 import { SavedSearchQuery, SearchItems } from '../../../../hooks/use_search_items';
-import { useXJsonMode, xJsonMode } from '../../../../hooks/use_x_json_mode';
 import { useToastNotifications } from '../../../../app_dependencies';
 import { TransformPivotConfig } from '../../../../common';
 import { dictionaryToArray, Dictionary } from '../../../../../../common/types/common';
@@ -432,6 +433,7 @@ export const StepDefineForm: FC<Props> = React.memo(({ overrides = {}, onChange,
     convertToJson,
     setXJson: setAdvancedEditorConfig,
     xJson: advancedEditorConfig,
+    xJsonMode,
   } = useXJsonMode(stringifiedPivotConfig);
 
   useEffect(() => {
diff --git a/x-pack/plugins/transform/public/shared_imports.ts b/x-pack/plugins/transform/public/shared_imports.ts
index 8eb42ad677c0f..494b6db6aafe0 100644
--- a/x-pack/plugins/transform/public/shared_imports.ts
+++ b/x-pack/plugins/transform/public/shared_imports.ts
@@ -5,11 +5,11 @@
  */
 
 export { createSavedSearchesLoader } from '../../../../src/plugins/discover/public';
-export { XJsonMode } from '../../es_ui_shared/console_lang/ace/modes/x_json';
 export {
+  XJsonMode,
   collapseLiteralStrings,
   expandLiteralStrings,
-} from '../../../../src/plugins/es_ui_shared/console_lang/lib';
+} from '../../../../src/plugins/es_ui_shared/public';
 
 export {
   UseRequestConfig,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
index 9bd6a39d216e3..15f68e6a9f441 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index.tsx
@@ -17,6 +17,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
+import { useXJsonMode } from '../../../../../../../src/plugins/es_ui_shared/static/ace_x_json/hooks';
 import {
   ActionTypeModel,
   ActionConnectorFieldsProps,
@@ -31,7 +32,6 @@ import {
   getIndexOptions,
   getIndexPatterns,
 } from '../../../common/index_controls';
-import { useXJsonMode } from '../../lib/use_x_json_mode';
 import { AddMessageVariables } from '../add_message_variables';
 
 export function getActionType(): ActionTypeModel {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/use_x_json_mode.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/use_x_json_mode.ts
deleted file mode 100644
index b677924724ffe..0000000000000
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/use_x_json_mode.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 { useState } from 'react';
-import { XJsonMode } from '../../../../../../src/plugins/es_ui_shared/console_lang/ace/modes/x_json';
-import {
-  collapseLiteralStrings,
-  expandLiteralStrings,
-} from '../../../../../../src/plugins/es_ui_shared/console_lang/lib';
-// @ts-ignore
-export const xJsonMode = new XJsonMode();
-export const useXJsonMode = (json: Record<string, any> | null) => {
-  const [xJson, setXJson] = useState(
-    json === null ? '' : expandLiteralStrings(JSON.stringify(json, null, 2))
-  );
-
-  return {
-    xJson,
-    setXJson,
-    xJsonMode,
-    convertToJson: collapseLiteralStrings,
-  };
-};
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts
index 47de4548898cf..a35dd1346dc90 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_json.test.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import '../../../es_ui_shared/console_lang/mocks';
-
 import { act } from 'react-dom/test-utils';
 import { setupEnvironment, pageHelpers, nextTick, wrapBodyResponse } from './helpers';
 import { WatchCreateJsonTestBed } from './helpers/watch_create_json.helpers';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
index e5bdcbbfb82cf..89cd5207fe250 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import '../../../es_ui_shared/console_lang/mocks';
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_edit.test.ts b/x-pack/plugins/watcher/__jest__/client_integration/watch_edit.test.ts
index ced06562b1d20..18acf7339580c 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_edit.test.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_edit.test.ts
@@ -3,7 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import '../../../es_ui_shared/console_lang/mocks';
 
 import { act } from 'react-dom/test-utils';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_list.test.ts b/x-pack/plugins/watcher/__jest__/client_integration/watch_list.test.ts
index 3370e42b2417f..a0327c6dfa1db 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_list.test.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_list.test.ts
@@ -3,7 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import '../../../es_ui_shared/console_lang/mocks';
 
 import { act } from 'react-dom/test-utils';
 import * as fixtures from '../../test/fixtures';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_status.test.ts b/x-pack/plugins/watcher/__jest__/client_integration/watch_status.test.ts
index 20b7b526705c0..e9cbb2c92491a 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_status.test.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_status.test.ts
@@ -3,7 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import '../../../es_ui_shared/console_lang/mocks';
 
 import { act } from 'react-dom/test-utils';
 import { setupEnvironment, pageHelpers, nextTick } from './helpers';
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx
index b3a09d3bc0e65..b5835d862000f 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx
@@ -23,14 +23,13 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { serializeJsonWatch } from '../../../../../../common/lib/serialization';
 import { ErrableFormRow, SectionError, Error as ServerError } from '../../../../components';
+import { useXJsonMode } from '../../../../shared_imports';
 import { onWatchSave } from '../../watch_edit_actions';
 import { WatchContext } from '../../watch_context';
 import { goToWatchList } from '../../../../lib/navigation';
 import { RequestFlyout } from '../request_flyout';
 import { useAppContext } from '../../../../app_context';
 
-import { useXJsonMode } from './use_x_json_mode';
-
 export const JsonWatchEditForm = () => {
   const {
     links: { putWatchApiUrl },
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
index b9fce52b480ef..fa0b9b0a2566f 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
@@ -40,7 +40,7 @@ import { JsonWatchEditSimulateResults } from './json_watch_edit_simulate_results
 import { getTimeUnitLabel } from '../../../../lib/get_time_unit_label';
 import { useAppContext } from '../../../../app_context';
 
-import { useXJsonMode } from './use_x_json_mode';
+import { useXJsonMode } from '../../../../shared_imports';
 
 const actionModeOptions = Object.keys(ACTION_MODES).map(mode => ({
   text: ACTION_MODES[mode],
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/use_x_json_mode.ts b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/use_x_json_mode.ts
deleted file mode 100644
index 7aefb0554e0e8..0000000000000
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/json_watch_edit/use_x_json_mode.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 { useState } from 'react';
-import { XJsonMode } from '../../../../../../../es_ui_shared/console_lang';
-import {
-  collapseLiteralStrings,
-  expandLiteralStrings,
-} from '../../../../../../../../../src/plugins/es_ui_shared/console_lang/lib';
-
-export const xJsonMode = new XJsonMode();
-
-export const useXJsonMode = (json: string) => {
-  const [xJson, setXJson] = useState(expandLiteralStrings(json));
-
-  return {
-    xJson,
-    setXJson,
-    xJsonMode,
-    convertToJson: collapseLiteralStrings,
-  };
-};
diff --git a/x-pack/plugins/watcher/public/application/shared_imports.ts b/x-pack/plugins/watcher/public/application/shared_imports.ts
index cbc4dde7448ff..94ef7af1c28d1 100644
--- a/x-pack/plugins/watcher/public/application/shared_imports.ts
+++ b/x-pack/plugins/watcher/public/application/shared_imports.ts
@@ -11,3 +11,5 @@ export {
   sendRequest,
   useRequest,
 } from '../../../../../src/plugins/es_ui_shared/public/request/np_ready_request';
+
+export { useXJsonMode } from '../../../../../src/plugins/es_ui_shared/static/ace_x_json/hooks';

From 77d22f55d9d952ed0d3b6ed6da25def23fcea4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Fri, 10 Apr 2020 13:54:48 +0100
Subject: [PATCH 12/36] [APM] Agent config select box doesn't work on IE
 (#63236)

* adding value property to select options

* fixing test
---
 .../SettingsPage/SettingFormRow.tsx                       | 7 +++++--
 .../setting_definitions/__snapshots__/index.test.ts.snap  | 4 ++++
 .../setting_definitions/general_settings.ts               | 8 ++++----
 .../agent_configuration/setting_definitions/types.d.ts    | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx
index 30c772bf5f634..baab600145b81 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingFormRow.tsx
@@ -73,7 +73,10 @@ function FormRow({
       return (
         <SelectWithPlaceholder
           placeholder={setting.placeholder}
-          options={[{ text: 'true' }, { text: 'false' }]}
+          options={[
+            { text: 'true', value: 'true' },
+            { text: 'false', value: 'false' }
+          ]}
           value={value}
           onChange={e => onChange(setting.key, e.target.value)}
         />
@@ -105,7 +108,7 @@ function FormRow({
                 defaultMessage: 'Select unit'
               })}
               value={unit}
-              options={setting.units?.map(text => ({ text }))}
+              options={setting.units?.map(text => ({ text, value: text }))}
               onChange={e =>
                 onChange(
                   setting.key,
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
index 49840d2157af7..ea706be9f584a 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
@@ -29,15 +29,19 @@ Array [
     "options": Array [
       Object {
         "text": "off",
+        "value": "off",
       },
       Object {
         "text": "errors",
+        "value": "errors",
       },
       Object {
         "text": "transactions",
+        "value": "transactions",
       },
       Object {
         "text": "all",
+        "value": "all",
       },
     ],
     "type": "select",
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
index e73aed35e87f9..7477238ba79ae 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
@@ -67,10 +67,10 @@ export const generalSettings: RawSettingDefinition[] = [
       }
     ),
     options: [
-      { text: 'off' },
-      { text: 'errors' },
-      { text: 'transactions' },
-      { text: 'all' }
+      { text: 'off', value: 'off' },
+      { text: 'errors', value: 'errors' },
+      { text: 'transactions', value: 'transactions' },
+      { text: 'all', value: 'all' }
     ],
     excludeAgents: ['js-base', 'rum-js']
   },
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts
index 282ced346dda0..815b8cb3d4e83 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts
@@ -76,7 +76,7 @@ interface FloatSetting extends BaseSetting {
 
 interface SelectSetting extends BaseSetting {
   type: 'select';
-  options: Array<{ text: string }>;
+  options: Array<{ text: string; value: string }>;
 }
 
 interface BooleanSetting extends BaseSetting {

From e8491adbab145590e877e5af9b1efa009400bf46 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Fri, 10 Apr 2020 09:04:17 -0500
Subject: [PATCH 13/36] Use globe icon for "ext" span type on service map
 (#63205)

Both "external" and "ext" can be returned and should have the same icon.
---
 .../apm/public/components/app/ServiceMap/Cytoscape.stories.tsx   | 1 +
 .../legacy/plugins/apm/public/components/app/ServiceMap/icons.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.stories.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.stories.tsx
index a8d3b843a1f3d..31c227d8bbcab 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.stories.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.stories.tsx
@@ -85,6 +85,7 @@ storiesOf('app/ServiceMap/Cytoscape', module)
           }
         },
         { data: { id: 'external', 'span.type': 'external' } },
+        { data: { id: 'ext', 'span.type': 'ext' } },
         { data: { id: 'messaging', 'span.type': 'messaging' } },
         {
           data: {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
index dd9b48d312725..095c2d9250e27 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
@@ -32,6 +32,7 @@ export const defaultIcon = defaultIconImport;
 const icons: { [key: string]: string } = {
   cache: databaseIcon,
   db: databaseIcon,
+  ext: globeIcon,
   external: globeIcon,
   messaging: documentsIcon,
   resource: globeIcon

From ed975d0169e6728db9d8c5cf98ca655293217192 Mon Sep 17 00:00:00 2001
From: DianaDerevyankina <54894989+DianaDerevyankina@users.noreply.github.com>
Date: Fri, 10 Apr 2020 17:59:50 +0300
Subject: [PATCH 14/36] Move shared vislib components into Charts plugin
 (#62957)

* Closes #56310

Move shared vislib components into Charts plugin

* Fixed imports in tests

* Changed i18n IDs to match charts namespace

* Renamed ColorSchemaVislibParams to ColorSchemaParams, added enums and got rid of useValidation function

* Renamed ColorSchemaVislibParams to ColorSchemaParams and got rid of useValidation function

* Fixed merge conflict

* Replaced enums with objects again
---
 .../public/components/region_map_options.tsx  |  6 ++-
 .../public/components/tile_map_options.tsx    |  2 +-
 .../components/wms_internal_options.tsx       |  2 +-
 .../public/components/wms_options.tsx         |  2 +-
 .../public/settings_options.tsx               |  2 +-
 .../public/components/metric_vis_options.tsx  |  4 +-
 .../vis_type_metric/public/metric_vis_fn.ts   |  3 +-
 .../vis_type_metric/public/metric_vis_type.ts |  3 +-
 .../vis_type_metric/public/types.ts           |  3 +-
 .../public/components/table_vis_options.tsx   |  6 ++-
 .../public/components/tag_cloud_options.tsx   |  2 +-
 .../vis_type_vislib/public/area.ts            |  2 +-
 .../public/components/common/index.ts         |  8 ----
 .../components/options/gauge/labels_panel.tsx |  2 +-
 .../components/options/gauge/ranges_panel.tsx | 14 +++---
 .../components/options/gauge/style_panel.tsx  |  2 +-
 .../components/options/heatmap/index.tsx      |  6 +--
 .../options/heatmap/labels_panel.tsx          |  2 +-
 .../metrics_axes/category_axis_panel.tsx      |  2 +-
 .../options/metrics_axes/chart_options.tsx    |  2 +-
 .../metrics_axes/custom_extents_options.tsx   |  2 +-
 .../options/metrics_axes/label_options.tsx    |  3 +-
 .../metrics_axes/line_options.test.tsx        |  2 +-
 .../options/metrics_axes/line_options.tsx     |  6 ++-
 .../components/options/metrics_axes/mocks.ts  |  3 +-
 .../metrics_axes/value_axis_options.test.tsx  |  2 +-
 .../metrics_axes/value_axis_options.tsx       |  6 ++-
 .../options/metrics_axes/y_extents.test.tsx   |  2 +-
 .../options/metrics_axes/y_extents.tsx        |  2 +-
 .../public/components/options/pie.tsx         |  3 +-
 .../options/point_series/grid_panel.tsx       |  2 +-
 .../options/point_series/point_series.tsx     |  3 +-
 .../options/point_series/threshold_panel.tsx  | 12 ++++--
 .../vis_type_vislib/public/gauge.ts           | 13 ++++--
 .../vis_type_vislib/public/goal.ts            |  4 +-
 .../vis_type_vislib/public/heatmap.ts         |  6 +--
 .../vis_type_vislib/public/histogram.ts       |  2 +-
 .../vis_type_vislib/public/horizontal_bar.ts  |  2 +-
 .../vis_type_vislib/public/index.ts           | 14 ------
 .../vis_type_vislib/public/line.ts            |  2 +-
 .../vis_type_vislib/public/types.ts           | 25 +----------
 .../public/utils/collections.ts               | 16 +------
 .../static/components}/basic_options.tsx      |  4 +-
 .../public/static/components/collections.ts}  | 26 +++++------
 .../static/components}/color_ranges.tsx       |  7 +--
 .../static/components}/color_schema.tsx       | 18 ++++----
 .../charts/public/static/components/index.ts  | 30 +++++++++++++
 .../static/components}/number_input.tsx       |  0
 .../public/static/components}/range.tsx       |  2 +-
 .../components}/required_number_input.tsx     | 14 +++---
 .../public/static/components}/select.tsx      |  0
 .../public/static/components}/switch.tsx      |  0
 .../public/static/components}/text_input.tsx  |  0
 .../charts/public/static/components/types.ts  | 43 +++++++++++++++++++
 src/plugins/charts/public/static/index.ts     |  1 +
 .../translations/translations/ja-JP.json      | 16 +++----
 .../translations/translations/zh-CN.json      | 16 +++----
 57 files changed, 215 insertions(+), 169 deletions(-)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/basic_options.tsx (90%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common/utils.ts => plugins/charts/public/static/components/collections.ts} (67%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/color_ranges.tsx (93%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/color_schema.tsx (82%)
 create mode 100644 src/plugins/charts/public/static/components/index.ts
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/number_input.tsx (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/range.tsx (96%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/required_number_input.tsx (87%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/select.tsx (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/switch.tsx (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/components/common => plugins/charts/public/static/components}/text_input.tsx (100%)
 create mode 100644 src/plugins/charts/public/static/components/types.ts

diff --git a/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx b/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
index 61cfbf00ded9e..187b27953830d 100644
--- a/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
+++ b/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
@@ -24,7 +24,11 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { FileLayerField, VectorLayer, ServiceSettings } from 'ui/vis/map/service_settings';
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
-import { NumberInputOption, SelectOption, SwitchOption } from '../../../vis_type_vislib/public';
+import {
+  NumberInputOption,
+  SelectOption,
+  SwitchOption,
+} from '../../../../../plugins/charts/public';
 import { WmsOptions } from '../../../tile_map/public/components/wms_options';
 import { RegionMapVisParams } from '../types';
 
diff --git a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
index 9169647aa2aef..9ca42fe3e4074 100644
--- a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
@@ -27,7 +27,7 @@ import {
   RangeOption,
   SelectOption,
   SwitchOption,
-} from '../../../vis_type_vislib/public';
+} from '../../../../../plugins/charts/public';
 import { WmsOptions } from './wms_options';
 import { TileMapVisParams } from '../types';
 import { MapTypes } from '../map_types';
diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx b/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
index b81667400303d..47f5b8f31e62b 100644
--- a/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { EuiLink, EuiSpacer, EuiText, EuiScreenReaderOnly } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { TextInputOption } from '../../../vis_type_vislib/public';
+import { TextInputOption } from '../../../../../plugins/charts/public';
 import { WMSOptions } from '../types';
 
 interface WmsInternalOptions {
diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx b/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
index 27127b781cd4d..b8535e72e8818 100644
--- a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
@@ -25,7 +25,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { TmsLayer } from 'ui/vis/map/service_settings';
 import { Vis } from '../../../../../plugins/visualizations/public';
 import { RegionMapVisParams } from '../../../region_map/public/types';
-import { SelectOption, SwitchOption } from '../../../vis_type_vislib/public';
+import { SelectOption, SwitchOption } from '../../../../../plugins/charts/public';
 import { WmsInternalOptions } from './wms_internal_options';
 import { WMSOptions, TileMapVisParams } from '../types';
 
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx b/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx
index 552fd63373554..16b2749c34e10 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx
+++ b/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx
@@ -22,7 +22,7 @@ import { EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
-import { RangeOption, SwitchOption } from '../../vis_type_vislib/public';
+import { RangeOption, SwitchOption } from '../../../../plugins/charts/public';
 import { MarkdownVisParams } from './types';
 
 function SettingsOptions({ stateParams, setValue }: VisOptionsProps<MarkdownVisParams>) {
diff --git a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_options.tsx b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_options.tsx
index 5c3032511f09a..56af0ee91878f 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_options.tsx
+++ b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_options.tsx
@@ -37,9 +37,9 @@ import {
   SwitchOption,
   RangeOption,
   SetColorSchemaOptionsValue,
-} from '../../../vis_type_vislib/public';
+  SetColorRangeValue,
+} from '../../../../../plugins/charts/public';
 import { MetricVisParam, VisParams } from '../types';
-import { SetColorRangeValue } from '../../../vis_type_vislib/public/components/common/color_ranges';
 
 function MetricVisOptions({
   stateParams,
diff --git a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts
index 03b412c6fff15..52784da1bd73b 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts
@@ -26,9 +26,8 @@ import {
   Render,
   Style,
 } from '../../../../plugins/expressions/public';
-import { ColorModes } from '../../vis_type_vislib/public';
 import { visType, DimensionsVisParam, VisParams } from './types';
-import { ColorSchemas, vislibColorMaps } from '../../../../plugins/charts/public';
+import { ColorSchemas, vislibColorMaps, ColorModes } from '../../../../plugins/charts/public';
 
 export type Input = KibanaDatatable;
 
diff --git a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts
index 3bbb8964122e5..ab31c56921412 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts
@@ -21,8 +21,7 @@ import { i18n } from '@kbn/i18n';
 
 import { MetricVisComponent } from './components/metric_vis_component';
 import { MetricVisOptions } from './components/metric_vis_options';
-import { ColorModes } from '../../vis_type_vislib/public';
-import { ColorSchemas, colorSchemas } from '../../../../plugins/charts/public';
+import { ColorSchemas, colorSchemas, ColorModes } from '../../../../plugins/charts/public';
 import { AggGroupNames } from '../../../../plugins/data/public';
 import { Schemas } from '../../../../plugins/vis_default_editor/public';
 
diff --git a/src/legacy/core_plugins/vis_type_metric/public/types.ts b/src/legacy/core_plugins/vis_type_metric/public/types.ts
index cae18dd8a2ab1..cdf62cba934d7 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/types.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/types.ts
@@ -19,8 +19,7 @@
 
 import { Range } from '../../../../plugins/expressions/public';
 import { SchemaConfig } from '../../../../plugins/visualizations/public';
-import { ColorModes, Labels, Style } from '../../vis_type_vislib/public';
-import { ColorSchemas } from '../../../../plugins/charts/public';
+import { ColorModes, ColorSchemas, Labels, Style } from '../../../../plugins/charts/public';
 
 export const visType = 'metric';
 
diff --git a/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx b/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx
index d01ab31e0a843..265528f33f9cd 100644
--- a/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx
+++ b/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx
@@ -25,7 +25,11 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { search } from '../../../../../plugins/data/public';
-import { NumberInputOption, SwitchOption, SelectOption } from '../../../vis_type_vislib/public';
+import {
+  SwitchOption,
+  SelectOption,
+  NumberInputOption,
+} from '../../../../../plugins/charts/public';
 import { TableVisParams } from '../types';
 import { totalAggregations } from './utils';
 
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx b/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx
index 80e4e1de7ddab..7a64549edd747 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx
@@ -22,7 +22,7 @@ import { EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { ValidatedDualRange } from '../../../../../../src/plugins/kibana_react/public';
-import { SelectOption, SwitchOption } from '../../../vis_type_vislib/public';
+import { SelectOption, SwitchOption } from '../../../../../plugins/charts/public';
 import { TagCloudVisParams } from '../types';
 
 function TagCloudOptions({ stateParams, setValue, vis }: VisOptionsProps<TagCloudVisParams>) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/area.ts b/src/legacy/core_plugins/vis_type_vislib/public/area.ts
index 68decacaaa040..8a196da64fc4b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/area.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/area.ts
@@ -33,13 +33,13 @@ import {
   AxisTypes,
   ScaleTypes,
   AxisModes,
-  Rotates,
   ThresholdLineStyles,
   getConfigCollections,
 } from './utils/collections';
 import { getAreaOptionTabs, countLabel } from './utils/common_config';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
+import { Rotates } from '../../../../plugins/charts/public';
 
 export const createAreaVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'area',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/index.ts b/src/legacy/core_plugins/vis_type_vislib/public/components/common/index.ts
index 05972d101f576..f0bec3167cb7c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/common/index.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/common/index.ts
@@ -17,13 +17,5 @@
  * under the License.
  */
 
-export { BasicOptions } from './basic_options';
-export { ColorRanges } from './color_ranges';
-export { ColorSchemaOptions, SetColorSchemaOptionsValue } from './color_schema';
-export { NumberInputOption } from './number_input';
-export { RangeOption } from './range';
-export { SelectOption } from './select';
-export { SwitchOption } from './switch';
-export { TextInputOption } from './text_input';
 export { TruncateLabelsOption } from './truncate_labels';
 export { ValidationWrapper, ValidationVisOptionsProps } from './validation_wrapper';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx
index b9bae1cad35e7..3fca9dc8adc08 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx
@@ -22,7 +22,7 @@ import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { SwitchOption, TextInputOption } from '../../common';
+import { SwitchOption, TextInputOption } from '../../../../../../../plugins/charts/public';
 import { GaugeOptionsInternalProps } from '.';
 
 function LabelsPanel({ stateParams, setValue, setGaugeValue }: GaugeOptionsInternalProps) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx
index 7de64e5888096..433cc4edeb47b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx
@@ -22,12 +22,16 @@ import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { ColorRanges, ColorSchemaOptions, SwitchOption } from '../../common';
+import {
+  ColorRanges,
+  ColorSchemaOptions,
+  ColorSchemaParams,
+  SetColorRangeValue,
+  SwitchOption,
+  ColorSchemas,
+} from '../../../../../../../plugins/charts/public';
 import { GaugeOptionsInternalProps } from '.';
-import { ColorSchemaVislibParams } from '../../../types';
 import { Gauge } from '../../../gauge';
-import { SetColorRangeValue } from '../../common/color_ranges';
-import { ColorSchemas } from '../../../../../../../plugins/charts/public';
 
 function RangesPanel({
   setGaugeValue,
@@ -39,7 +43,7 @@ function RangesPanel({
   vis,
 }: GaugeOptionsInternalProps) {
   const setColorSchemaOptions = useCallback(
-    <T extends keyof ColorSchemaVislibParams>(paramName: T, value: ColorSchemaVislibParams[T]) => {
+    <T extends keyof ColorSchemaParams>(paramName: T, value: ColorSchemaParams[T]) => {
       setGaugeValue(paramName, value as Gauge[T]);
       // set outline if color schema is changed to greys
       // if outline wasn't set explicitly yet
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
index 9254c3c18347c..48711de7d171a 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
@@ -22,7 +22,7 @@ import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { SelectOption } from '../../common';
+import { SelectOption } from '../../../../../../../plugins/charts/public';
 import { GaugeOptionsInternalProps } from '.';
 import { AggGroupNames } from '../../../../../../../plugins/data/public';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/index.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/index.tsx
index 715b5902b69da..dc207ad89286f 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/index.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/index.tsx
@@ -31,12 +31,12 @@ import {
   NumberInputOption,
   SelectOption,
   SwitchOption,
-} from '../../common';
-import { SetColorSchemaOptionsValue } from '../../common/color_schema';
+  SetColorSchemaOptionsValue,
+  SetColorRangeValue,
+} from '../../../../../../../plugins/charts/public';
 import { HeatmapVisParams } from '../../../heatmap';
 import { ValueAxis } from '../../../types';
 import { LabelsPanel } from './labels_panel';
-import { SetColorRangeValue } from '../../common/color_ranges';
 
 function HeatmapOptions(props: VisOptionsProps<HeatmapVisParams>) {
   const { stateParams, vis, uiState, setValue, setValidity, setTouched } = props;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx
index 38811bd836459..3d1629740df2c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx
@@ -26,7 +26,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { ValueAxis } from '../../../types';
 import { HeatmapVisParams } from '../../../heatmap';
-import { SwitchOption } from '../../common';
+import { SwitchOption } from '../../../../../../../plugins/charts/public';
 
 const VERTICAL_ROTATION = 270;
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx
index 915885388640c..246c20a14807c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx
@@ -25,7 +25,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { Axis } from '../../../types';
-import { SelectOption, SwitchOption } from '../../common';
+import { SelectOption, SwitchOption } from '../../../../../../../plugins/charts/public';
 import { LabelOptions, SetAxisLabel } from './label_options';
 import { Positions } from '../../../utils/collections';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx
index ec7a325ba43d1..89aab3a19c589 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx
@@ -25,7 +25,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { Vis } from '../../../../../../../plugins/visualizations/public';
 import { SeriesParam, ValueAxis } from '../../../types';
 import { ChartTypes } from '../../../utils/collections';
-import { SelectOption } from '../../common';
+import { SelectOption } from '../../../../../../../plugins/charts/public';
 import { LineOptions } from './line_options';
 import { SetParamByIndex, ChangeValueAxis } from './';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx
index 53b2ffa55a941..a3a97df9e35ae 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx
@@ -21,7 +21,7 @@ import React, { useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { ValueAxis } from '../../../types';
-import { NumberInputOption, SwitchOption } from '../../common';
+import { NumberInputOption, SwitchOption } from '../../../../../../../plugins/charts/public';
 import { YExtents } from './y_extents';
 import { SetScale } from './value_axis_options';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx
index b6b54193e9f4a..bc687e56646f6 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx
@@ -24,8 +24,9 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { Axis } from '../../../types';
-import { SelectOption, SwitchOption, TruncateLabelsOption } from '../../common';
+import { TruncateLabelsOption } from '../../common';
 import { getRotateOptions } from '../../../utils/collections';
+import { SelectOption, SwitchOption } from '../../../../../../../plugins/charts/public';
 
 export type SetAxisLabel = <T extends keyof Axis['labels']>(
   paramName: T,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx
index 1d29d39bfcb7f..5354bc9c033e6 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx
@@ -20,7 +20,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { LineOptions, LineOptionsParams } from './line_options';
-import { NumberInputOption } from '../../common';
+import { NumberInputOption } from '../../../../../../../plugins/charts/public';
 import { seriesParam, vis } from './mocks';
 
 jest.mock('ui/new_platform');
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx
index 01a69a6fac70b..76f95bd93caf8 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx
@@ -24,7 +24,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 
 import { Vis } from '../../../../../../../plugins/visualizations/public';
 import { SeriesParam } from '../../../types';
-import { NumberInputOption, SelectOption, SwitchOption } from '../../common';
+import {
+  NumberInputOption,
+  SelectOption,
+  SwitchOption,
+} from '../../../../../../../plugins/charts/public';
 import { SetChart } from './chart_options';
 
 export interface LineOptionsParams {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts
index 0d9fa8c25a4f7..a296281375dac 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts
@@ -18,7 +18,7 @@
  */
 
 import { Vis } from '../../../../../../../plugins/visualizations/public';
-import { Axis, ValueAxis, SeriesParam, Style } from '../../../types';
+import { Axis, ValueAxis, SeriesParam } from '../../../types';
 import {
   ChartTypes,
   ChartModes,
@@ -31,6 +31,7 @@ import {
   getPositions,
   getInterpolationModes,
 } from '../../../utils/collections';
+import { Style } from '../../../../../../../plugins/charts/public';
 
 const defaultValueAxisId = 'ValueAxis-1';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx
index 955867e66d09f..876a6917ee0b4 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ValueAxisOptions, ValueAxisOptionsParams } from './value_axis_options';
 import { ValueAxis } from '../../../types';
-import { TextInputOption } from '../../common';
+import { TextInputOption } from '../../../../../../../plugins/charts/public';
 import { LabelOptions } from './label_options';
 import { ScaleTypes, Positions } from '../../../utils/collections';
 import { valueAxis, vis } from './mocks';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
index 8f0327e78c7ab..1b89a766d0591 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
@@ -24,7 +24,11 @@ import { EuiSpacer, EuiAccordion, EuiHorizontalRule } from '@elastic/eui';
 import { Vis } from '../../../../../../../plugins/visualizations/public';
 import { ValueAxis } from '../../../types';
 import { Positions } from '../../../utils/collections';
-import { SelectOption, SwitchOption, TextInputOption } from '../../common';
+import {
+  SelectOption,
+  SwitchOption,
+  TextInputOption,
+} from '../../../../../../../plugins/charts/public';
 import { LabelOptions, SetAxisLabel } from './label_options';
 import { CustomExtentsOptions } from './custom_extents_options';
 import { isAxisHorizontal } from './utils';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx
index 17c47b35b20dc..b5ed475ca8e31 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { YExtents, YExtentsProps } from './y_extents';
 import { ScaleTypes } from '../../../utils/collections';
-import { NumberInputOption } from '../../common';
+import { NumberInputOption } from '../../../../../../../plugins/charts/public';
 
 jest.mock('ui/new_platform');
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx
index c0db58a612e71..faeb6069b5126 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 
 import { Scale } from '../../../types';
 import { ScaleTypes } from '../../../utils/collections';
-import { NumberInputOption } from '../../common';
+import { NumberInputOption } from '../../../../../../../plugins/charts/public';
 import { SetScale } from './value_axis_options';
 
 const rangeError = i18n.translate('visTypeVislib.controls.pointSeries.valueAxes.minErrorMessage', {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/pie.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/pie.tsx
index 4c0be456aad64..f6be9cd0bd8fe 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/pie.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/pie.tsx
@@ -23,7 +23,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
-import { BasicOptions, TruncateLabelsOption, SwitchOption } from '../common';
+import { TruncateLabelsOption } from '../common';
+import { BasicOptions, SwitchOption } from '../../../../../../plugins/charts/public';
 import { PieVisParams } from '../../pie';
 
 function PieOptions(props: VisOptionsProps<PieVisParams>) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx
index bb2b3f8fddb49..392d180d2c5f2 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
-import { SelectOption, SwitchOption } from '../../common';
+import { SelectOption, SwitchOption } from '../../../../../../../plugins/charts/public';
 import { BasicVislibParams, ValueAxis } from '../../../types';
 
 function GridPanel({ stateParams, setValue, hasHistogramAgg }: VisOptionsProps<BasicVislibParams>) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
index b9872ab94bd0b..903c1917751d9 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
@@ -21,7 +21,8 @@ import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { BasicOptions, SwitchOption, ValidationVisOptionsProps } from '../../common';
+import { ValidationVisOptionsProps } from '../../common';
+import { BasicOptions, SwitchOption } from '../../../../../../../plugins/charts/public';
 import { GridPanel } from './grid_panel';
 import { ThresholdPanel } from './threshold_panel';
 import { BasicVislibParams } from '../../../types';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx
index 7866ad74ede7f..12f058ec7dd1f 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx
@@ -21,8 +21,12 @@ import { EuiPanel, EuiTitle, EuiColorPicker, EuiFormRow, EuiSpacer } from '@elas
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { SelectOption, SwitchOption, ValidationVisOptionsProps } from '../../common';
-import { NumberInputOption } from '../../common/required_number_input';
+import { ValidationVisOptionsProps } from '../../common';
+import {
+  SelectOption,
+  SwitchOption,
+  RequiredNumberInputOption,
+} from '../../../../../../../plugins/charts/public';
 import { BasicVislibParams } from '../../../types';
 
 function ThresholdPanel({
@@ -73,7 +77,7 @@ function ThresholdPanel({
 
       {stateParams.thresholdLine.show && (
         <>
-          <NumberInputOption
+          <RequiredNumberInputOption
             label={i18n.translate('visTypeVislib.editors.pointSeries.thresholdLine.valueLabel', {
               defaultMessage: 'Threshold value',
             })}
@@ -83,7 +87,7 @@ function ThresholdPanel({
             setValidity={setThresholdLineValidity}
           />
 
-          <NumberInputOption
+          <RequiredNumberInputOption
             label={i18n.translate('visTypeVislib.editors.pointSeries.thresholdLine.widthLabel', {
               defaultMessage: 'Line width',
             })}
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts b/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts
index 7ad821dbf2f30..5e0b2b8fbd36c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts
@@ -22,13 +22,18 @@ import { i18n } from '@kbn/i18n';
 import { RangeValues, Schemas } from '../../../../plugins/vis_default_editor/public';
 import { AggGroupNames } from '../../../../plugins/data/public';
 import { GaugeOptions } from './components/options';
-import { getGaugeCollections, Alignments, ColorModes, GaugeTypes } from './utils/collections';
+import { getGaugeCollections, Alignments, GaugeTypes } from './utils/collections';
+import {
+  ColorModes,
+  ColorSchemas,
+  ColorSchemaParams,
+  Labels,
+  Style,
+} from '../../../../plugins/charts/public';
 import { createVislibVisController } from './vis_controller';
-import { ColorSchemaVislibParams, Labels, Style } from './types';
 import { VisTypeVislibDependencies } from './plugin';
-import { ColorSchemas } from '../../../../plugins/charts/public';
 
-export interface Gauge extends ColorSchemaVislibParams {
+export interface Gauge extends ColorSchemaParams {
   backStyle: 'Full';
   gaugeStyle: 'Full';
   orientation: 'vertical';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/goal.ts b/src/legacy/core_plugins/vis_type_vislib/public/goal.ts
index 6c311bebe0717..0f70dca69728d 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/goal.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/goal.ts
@@ -20,10 +20,10 @@
 import { i18n } from '@kbn/i18n';
 
 import { GaugeOptions } from './components/options';
-import { getGaugeCollections, GaugeTypes, ColorModes } from './utils/collections';
+import { getGaugeCollections, GaugeTypes } from './utils/collections';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
-import { ColorSchemas } from '../../../../plugins/charts/public';
+import { ColorModes, ColorSchemas } from '../../../../plugins/charts/public';
 import { AggGroupNames } from '../../../../plugins/data/public';
 import { Schemas } from '../../../../plugins/vis_default_editor/public';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts b/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts
index 88b4f0fcaf87e..9feed60b984ba 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts
@@ -25,11 +25,11 @@ import { AxisTypes, getHeatmapCollections, Positions, ScaleTypes } from './utils
 import { HeatmapOptions } from './components/options';
 import { createVislibVisController } from './vis_controller';
 import { TimeMarker } from './vislib/visualizations/time_marker';
-import { CommonVislibParams, ColorSchemaVislibParams, ValueAxis } from './types';
+import { CommonVislibParams, ValueAxis } from './types';
 import { VisTypeVislibDependencies } from './plugin';
-import { ColorSchemas } from '../../../../plugins/charts/public';
+import { ColorSchemas, ColorSchemaParams } from '../../../../plugins/charts/public';
 
-export interface HeatmapVisParams extends CommonVislibParams, ColorSchemaVislibParams {
+export interface HeatmapVisParams extends CommonVislibParams, ColorSchemaParams {
   type: 'heatmap';
   addLegend: boolean;
   enableHover: boolean;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts b/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts
index 54ec8f98203e2..54ccf66f362ca 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts
@@ -32,13 +32,13 @@ import {
   AxisTypes,
   ScaleTypes,
   AxisModes,
-  Rotates,
   ThresholdLineStyles,
   getConfigCollections,
 } from './utils/collections';
 import { getAreaOptionTabs, countLabel } from './utils/common_config';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
+import { Rotates } from '../../../../plugins/charts/public';
 
 export const createHistogramVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'histogram',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts b/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts
index dc47252ccd44f..6f73271726660 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts
@@ -32,13 +32,13 @@ import {
   AxisTypes,
   ScaleTypes,
   AxisModes,
-  Rotates,
   ThresholdLineStyles,
   getConfigCollections,
 } from './utils/collections';
 import { getAreaOptionTabs, countLabel } from './utils/common_config';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
+import { Rotates } from '../../../../plugins/charts/public';
 
 export const createHorizontalBarVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'horizontal_bar',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/index.ts b/src/legacy/core_plugins/vis_type_vislib/public/index.ts
index 1f773c4efcb02..4d7091ffb204b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/index.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/index.ts
@@ -24,18 +24,4 @@ export function plugin(initializerContext: PluginInitializerContext) {
   return new Plugin(initializerContext);
 }
 
-export {
-  BasicOptions,
-  RangeOption,
-  ColorRanges,
-  SelectOption,
-  SetColorSchemaOptionsValue,
-  ColorSchemaOptions,
-  NumberInputOption,
-  SwitchOption,
-  TextInputOption,
-} from './components';
-
-export { ColorModes } from './utils/collections';
-
 export * from './types';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/line.ts b/src/legacy/core_plugins/vis_type_vislib/public/line.ts
index 885ab295d11e1..1f9a8d77398e6 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/line.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/line.ts
@@ -32,7 +32,6 @@ import {
   AxisTypes,
   ScaleTypes,
   AxisModes,
-  Rotates,
   ThresholdLineStyles,
   InterpolationModes,
   getConfigCollections,
@@ -40,6 +39,7 @@ import {
 import { getAreaOptionTabs, countLabel } from './utils/common_config';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
+import { Rotates } from '../../../../plugins/charts/public';
 
 export const createLineVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'line',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/types.ts b/src/legacy/core_plugins/vis_type_vislib/public/types.ts
index f33b42483c53e..25c6ae5439fe8 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/types.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/types.ts
@@ -25,39 +25,16 @@ import {
   AxisModes,
   AxisTypes,
   InterpolationModes,
-  Rotates,
   ScaleTypes,
   ThresholdLineStyles,
 } from './utils/collections';
-import { ColorSchemas } from '../../../../plugins/charts/public';
+import { Labels, Style } from '../../../../plugins/charts/public';
 
 export interface CommonVislibParams {
   addTooltip: boolean;
   legendPosition: Positions;
 }
 
-export interface ColorSchemaVislibParams {
-  colorSchema: ColorSchemas;
-  invertColors: boolean;
-}
-
-export interface Labels {
-  color?: string;
-  filter?: boolean;
-  overwriteColor?: boolean;
-  rotate?: Rotates;
-  show: boolean;
-  truncate?: number | null;
-}
-
-export interface Style {
-  bgFill: string;
-  bgColor: boolean;
-  labelColor: boolean;
-  subText: string;
-  fontSize: number;
-}
-
 export interface Scale {
   boundsMargin?: number | '';
   defaultYExtents?: boolean;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/utils/collections.ts b/src/legacy/core_plugins/vis_type_vislib/public/utils/collections.ts
index f32b765cd6e57..2024c43dd1c8b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/utils/collections.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/utils/collections.ts
@@ -20,7 +20,7 @@
 import { i18n } from '@kbn/i18n';
 import { $Values } from '@kbn/utility-types';
 
-import { colorSchemas } from '../../../../../plugins/charts/public';
+import { colorSchemas, Rotates } from '../../../../../plugins/charts/public';
 
 export const Positions = Object.freeze({
   RIGHT: 'right' as 'right',
@@ -203,13 +203,6 @@ const getAxisModes = () => [
   },
 ];
 
-export const Rotates = Object.freeze({
-  HORIZONTAL: 0,
-  VERTICAL: 90,
-  ANGLED: 75,
-});
-export type Rotates = $Values<typeof Rotates>;
-
 export const ThresholdLineStyles = Object.freeze({
   FULL: 'full' as 'full',
   DASHED: 'dashed' as 'dashed',
@@ -265,13 +258,6 @@ export const GaugeTypes = Object.freeze({
 });
 export type GaugeTypes = $Values<typeof GaugeTypes>;
 
-export const ColorModes = Object.freeze({
-  BACKGROUND: 'Background' as 'Background',
-  LABELS: 'Labels' as 'Labels',
-  NONE: 'None' as 'None',
-});
-export type ColorModes = $Values<typeof ColorModes>;
-
 const getGaugeTypes = () => [
   {
     text: i18n.translate('visTypeVislib.gauge.gaugeTypes.arcText', {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/basic_options.tsx b/src/plugins/charts/public/static/components/basic_options.tsx
similarity index 90%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/basic_options.tsx
rename to src/plugins/charts/public/static/components/basic_options.tsx
index baf3e8ecd1b28..cac4c8d70d796 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/common/basic_options.tsx
+++ b/src/plugins/charts/public/static/components/basic_options.tsx
@@ -37,7 +37,7 @@ function BasicOptions<VisParams extends BasicOptionsParams>({
   return (
     <>
       <SelectOption
-        label={i18n.translate('visTypeVislib.controls.vislibBasicOptions.legendPositionLabel', {
+        label={i18n.translate('charts.controls.vislibBasicOptions.legendPositionLabel', {
           defaultMessage: 'Legend position',
         })}
         options={vis.type.editorConfig.collections.legendPositions}
@@ -46,7 +46,7 @@ function BasicOptions<VisParams extends BasicOptionsParams>({
         setValue={setValue}
       />
       <SwitchOption
-        label={i18n.translate('visTypeVislib.controls.vislibBasicOptions.showTooltipLabel', {
+        label={i18n.translate('charts.controls.vislibBasicOptions.showTooltipLabel', {
           defaultMessage: 'Show tooltip',
         })}
         paramName="addTooltip"
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/utils.ts b/src/plugins/charts/public/static/components/collections.ts
similarity index 67%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/utils.ts
rename to src/plugins/charts/public/static/components/collections.ts
index d51631106dda7..9dde50f2b44c9 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/common/utils.ts
+++ b/src/plugins/charts/public/static/components/collections.ts
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-import { useEffect } from 'react';
+import { $Values } from '@kbn/utility-types';
 
-function useValidation<ParamName extends string>(
-  setValidity: (paramName: ParamName, isValid: boolean) => void,
-  paramName: ParamName,
-  isValid: boolean
-) {
-  useEffect(() => {
-    setValidity(paramName, isValid);
+export const ColorModes = Object.freeze({
+  BACKGROUND: 'Background' as 'Background',
+  LABELS: 'Labels' as 'Labels',
+  NONE: 'None' as 'None',
+});
+export type ColorModes = $Values<typeof ColorModes>;
 
-    return () => setValidity(paramName, true);
-  }, [isValid, paramName, setValidity]);
-}
-
-export { useValidation };
+export const Rotates = Object.freeze({
+  HORIZONTAL: 0,
+  VERTICAL: 90,
+  ANGLED: 75,
+});
+export type Rotates = $Values<typeof Rotates>;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/color_ranges.tsx b/src/plugins/charts/public/static/components/color_ranges.tsx
similarity index 93%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/color_ranges.tsx
rename to src/plugins/charts/public/static/components/color_ranges.tsx
index 84c70f10b12da..a9b05d7d91c7c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/common/color_ranges.tsx
+++ b/src/plugins/charts/public/static/components/color_ranges.tsx
@@ -22,10 +22,7 @@ import { last } from 'lodash';
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  RangeValues,
-  RangesParamEditor,
-} from '../../../../../../plugins/vis_default_editor/public';
+import { RangeValues, RangesParamEditor } from '../../../../vis_default_editor/public';
 
 export type SetColorRangeValue = (paramName: string, value: RangeValues[]) => void;
 
@@ -74,7 +71,7 @@ function ColorRanges({
   return (
     <RangesParamEditor
       data-test-subj={dataTestSubj}
-      error={i18n.translate('visTypeVislib.controls.colorRanges.errorText', {
+      error={i18n.translate('charts.controls.colorRanges.errorText', {
         defaultMessage: 'Each range should be greater than previous.',
       })}
       hidePlaceholders={true}
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/color_schema.tsx b/src/plugins/charts/public/static/components/color_schema.tsx
similarity index 82%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/color_schema.tsx
rename to src/plugins/charts/public/static/components/color_schema.tsx
index 35d7f7b13235e..62fe3143f0481 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/common/color_schema.tsx
+++ b/src/plugins/charts/public/static/components/color_schema.tsx
@@ -25,15 +25,15 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { SelectOption } from './select';
 import { SwitchOption } from './switch';
-import { ColorSchemaVislibParams } from '../../types';
-import { ColorSchema } from '../../../../../../plugins/charts/public';
+import { ColorSchemaParams } from './types';
+import { ColorSchema } from '../color_maps';
 
-export type SetColorSchemaOptionsValue = <T extends keyof ColorSchemaVislibParams>(
+export type SetColorSchemaOptionsValue = <T extends keyof ColorSchemaParams>(
   paramName: T,
-  value: ColorSchemaVislibParams[T]
+  value: ColorSchemaParams[T]
 ) => void;
 
-interface ColorSchemaOptionsProps extends ColorSchemaVislibParams {
+interface ColorSchemaOptionsProps extends ColorSchemaParams {
   disabled?: boolean;
   colorSchemas: ColorSchema[];
   uiState: VisOptionsProps['uiState'];
@@ -67,7 +67,7 @@ function ColorSchemaOptions({
         }}
       >
         <FormattedMessage
-          id="visTypeVislib.controls.colorSchema.resetColorsButtonLabel"
+          id="charts.controls.colorSchema.resetColorsButtonLabel"
           defaultMessage="Reset colors"
         />
       </EuiLink>
@@ -80,11 +80,11 @@ function ColorSchemaOptions({
         disabled={disabled}
         helpText={
           showHelpText &&
-          i18n.translate('visTypeVislib.controls.colorSchema.howToChangeColorsDescription', {
+          i18n.translate('charts.controls.colorSchema.howToChangeColorsDescription', {
             defaultMessage: 'Individual colors can be changed in the legend.',
           })
         }
-        label={i18n.translate('visTypeVislib.controls.colorSchema.colorSchemaLabel', {
+        label={i18n.translate('charts.controls.colorSchema.colorSchemaLabel', {
           defaultMessage: 'Color schema',
         })}
         labelAppend={isCustomColors && resetColorsButton}
@@ -96,7 +96,7 @@ function ColorSchemaOptions({
 
       <SwitchOption
         disabled={disabled}
-        label={i18n.translate('visTypeVislib.controls.colorSchema.reverseColorSchemaLabel', {
+        label={i18n.translate('charts.controls.colorSchema.reverseColorSchemaLabel', {
           defaultMessage: 'Reverse schema',
         })}
         paramName="invertColors"
diff --git a/src/plugins/charts/public/static/components/index.ts b/src/plugins/charts/public/static/components/index.ts
new file mode 100644
index 0000000000000..48c9e40145481
--- /dev/null
+++ b/src/plugins/charts/public/static/components/index.ts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { BasicOptions } from './basic_options';
+export { ColorModes, Rotates } from './collections';
+export { ColorRanges, SetColorRangeValue } from './color_ranges';
+export { ColorSchemaOptions, SetColorSchemaOptionsValue } from './color_schema';
+export { ColorSchemaParams, Labels, Style } from './types';
+export { NumberInputOption } from './number_input';
+export { RangeOption } from './range';
+export { RequiredNumberInputOption } from './required_number_input';
+export { SelectOption } from './select';
+export { SwitchOption } from './switch';
+export { TextInputOption } from './text_input';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/number_input.tsx b/src/plugins/charts/public/static/components/number_input.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/number_input.tsx
rename to src/plugins/charts/public/static/components/number_input.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/range.tsx b/src/plugins/charts/public/static/components/range.tsx
similarity index 96%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/range.tsx
rename to src/plugins/charts/public/static/components/range.tsx
index 56774f8898bb7..5c713180924df 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/common/range.tsx
+++ b/src/plugins/charts/public/static/components/range.tsx
@@ -49,7 +49,7 @@ function RangeOption<ParamName extends string>({
   const [stateValue, setStateValue] = useState(value);
   const [isValidState, setIsValidState] = useState(true);
 
-  const error = i18n.translate('visTypeVislib.controls.rangeErrorMessage', {
+  const error = i18n.translate('charts.controls.rangeErrorMessage', {
     defaultMessage: 'Values must be on or between {min} and {max}',
     values: { min, max },
   });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/required_number_input.tsx b/src/plugins/charts/public/static/components/required_number_input.tsx
similarity index 87%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/required_number_input.tsx
rename to src/plugins/charts/public/static/components/required_number_input.tsx
index 7b62016c4e502..7594c775b07ad 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/common/required_number_input.tsx
+++ b/src/plugins/charts/public/static/components/required_number_input.tsx
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-import React, { ReactNode, useCallback, ChangeEvent } from 'react';
+import React, { ReactNode, useCallback, ChangeEvent, useEffect } from 'react';
 import { EuiFormRow, EuiFieldNumber } from '@elastic/eui';
-import { useValidation } from './utils';
 
 interface NumberInputOptionProps<ParamName extends string> {
   disabled?: boolean;
@@ -42,7 +41,7 @@ interface NumberInputOptionProps<ParamName extends string> {
  *
  * @param {number} props.value Should be numeric only
  */
-function NumberInputOption<ParamName extends string>({
+function RequiredNumberInputOption<ParamName extends string>({
   disabled,
   error,
   isInvalid,
@@ -57,7 +56,12 @@ function NumberInputOption<ParamName extends string>({
   'data-test-subj': dataTestSubj,
 }: NumberInputOptionProps<ParamName>) {
   const isValid = value !== null;
-  useValidation(setValidity, paramName, isValid);
+
+  useEffect(() => {
+    setValidity(paramName, isValid);
+
+    return () => setValidity(paramName, true);
+  }, [isValid, paramName, setValidity]);
 
   const onChange = useCallback(
     (ev: ChangeEvent<HTMLInputElement>) =>
@@ -84,4 +88,4 @@ function NumberInputOption<ParamName extends string>({
   );
 }
 
-export { NumberInputOption };
+export { RequiredNumberInputOption };
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/select.tsx b/src/plugins/charts/public/static/components/select.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/select.tsx
rename to src/plugins/charts/public/static/components/select.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/switch.tsx b/src/plugins/charts/public/static/components/switch.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/switch.tsx
rename to src/plugins/charts/public/static/components/switch.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/text_input.tsx b/src/plugins/charts/public/static/components/text_input.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/text_input.tsx
rename to src/plugins/charts/public/static/components/text_input.tsx
diff --git a/src/plugins/charts/public/static/components/types.ts b/src/plugins/charts/public/static/components/types.ts
new file mode 100644
index 0000000000000..196eb60b06aec
--- /dev/null
+++ b/src/plugins/charts/public/static/components/types.ts
@@ -0,0 +1,43 @@
+/*
+ * 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 { ColorSchemas } from '../color_maps';
+import { Rotates } from './collections';
+
+export interface ColorSchemaParams {
+  colorSchema: ColorSchemas;
+  invertColors: boolean;
+}
+
+export interface Labels {
+  color?: string;
+  filter?: boolean;
+  overwriteColor?: boolean;
+  rotate?: Rotates;
+  show: boolean;
+  truncate?: number | null;
+}
+
+export interface Style {
+  bgFill: string;
+  bgColor: boolean;
+  labelColor: boolean;
+  subText: string;
+  fontSize: number;
+}
diff --git a/src/plugins/charts/public/static/index.ts b/src/plugins/charts/public/static/index.ts
index bee58e4f1e3e1..6fc097d05467f 100644
--- a/src/plugins/charts/public/static/index.ts
+++ b/src/plugins/charts/public/static/index.ts
@@ -18,3 +18,4 @@
  */
 
 export * from './color_maps';
+export * from './components';
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index c07ec68e99b4f..09903c34e2e5e 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -130,6 +130,14 @@
     "charts.colormaps.greysText": "グレー",
     "charts.colormaps.redsText": "赤",
     "charts.colormaps.yellowToRedText": "黄色から赤",
+    "charts.controls.colorRanges.errorText": "各範囲は前の範囲よりも大きくなければなりません。",
+    "charts.controls.colorSchema.colorSchemaLabel": "配色",
+    "charts.controls.colorSchema.howToChangeColorsDescription": "それぞれの色は凡例で変更できます。",
+    "charts.controls.colorSchema.resetColorsButtonLabel": "色をリセット",
+    "charts.controls.colorSchema.reverseColorSchemaLabel": "図表を反転",
+    "charts.controls.rangeErrorMessage": "値は {min} と {max} の間でなければなりません",
+    "charts.controls.vislibBasicOptions.legendPositionLabel": "凡例位置",
+    "charts.controls.vislibBasicOptions.showTooltipLabel": "ツールヒントを表示",
     "common.ui.errorAutoCreateIndex.breadcrumbs.errorText": "エラー",
     "common.ui.errorAutoCreateIndex.errorDescription": "Elasticsearch クラスターの {autoCreateIndexActionConfig} 設定が原因で、Kibana が保存されたオブジェクトを格納するインデックスを自動的に作成できないようです。Kibana は、保存されたオブジェクトインデックスが適切なマッピング/スキーマを使用し Kibana から Elasticsearch へのポーリングの回数を減らすための最適な手段であるため、この Elasticsearch の機能を使用します。",
     "common.ui.errorAutoCreateIndex.errorDisclaimer": "申し訳ございませんが、この問題が解決されるまで Kibana で何も保存することができません。",
@@ -3831,11 +3839,6 @@
     "visTypeVislib.chartTypes.areaText": "エリア",
     "visTypeVislib.chartTypes.barText": "バー",
     "visTypeVislib.chartTypes.lineText": "折れ線",
-    "visTypeVislib.controls.colorRanges.errorText": "各範囲は前の範囲よりも大きくなければなりません。",
-    "visTypeVislib.controls.colorSchema.colorSchemaLabel": "配色",
-    "visTypeVislib.controls.colorSchema.howToChangeColorsDescription": "それぞれの色は凡例で変更できます。",
-    "visTypeVislib.controls.colorSchema.resetColorsButtonLabel": "色をリセット",
-    "visTypeVislib.controls.colorSchema.reverseColorSchemaLabel": "図表を反転",
     "visTypeVislib.controls.gaugeOptions.alignmentLabel": "アラインメント",
     "visTypeVislib.controls.gaugeOptions.autoExtendRangeLabel": "範囲を自動拡張",
     "visTypeVislib.controls.gaugeOptions.displayWarningsLabel": "警告を表示",
@@ -3902,10 +3905,7 @@
     "visTypeVislib.controls.pointSeries.valueAxes.toggleCustomExtendsAriaLabel": "カスタム範囲を切り替える",
     "visTypeVislib.controls.pointSeries.valueAxes.toggleOptionsAriaLabel": "{axisName} オプションを切り替える",
     "visTypeVislib.controls.pointSeries.valueAxes.yAxisTitle": "Y 軸",
-    "visTypeVislib.controls.rangeErrorMessage": "値は {min} と {max} の間でなければなりません",
     "visTypeVislib.controls.truncateLabel": "切り捨て",
-    "visTypeVislib.controls.vislibBasicOptions.legendPositionLabel": "凡例位置",
-    "visTypeVislib.controls.vislibBasicOptions.showTooltipLabel": "ツールヒントを表示",
     "visTypeVislib.editors.heatmap.basicSettingsTitle": "基本設定",
     "visTypeVislib.editors.heatmap.heatmapSettingsTitle": "ヒートマップ設定",
     "visTypeVislib.editors.heatmap.highlightLabel": "ハイライト範囲",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index de8aaa75632ee..cc1b7d7980a0b 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -130,6 +130,14 @@
     "charts.colormaps.greysText": "灰色",
     "charts.colormaps.redsText": "红色",
     "charts.colormaps.yellowToRedText": "黄到红",
+    "charts.controls.colorRanges.errorText": "每个范围应大于前一范围。",
+    "charts.controls.colorSchema.colorSchemaLabel": "颜色模式",
+    "charts.controls.colorSchema.howToChangeColorsDescription": "可以更改图例中的各个颜色。",
+    "charts.controls.colorSchema.resetColorsButtonLabel": "重置颜色",
+    "charts.controls.colorSchema.reverseColorSchemaLabel": "反转模式",
+    "charts.controls.rangeErrorMessage": "值必须是在 {min} 到 {max} 的范围内",
+    "charts.controls.vislibBasicOptions.legendPositionLabel": "图例位置",
+    "charts.controls.vislibBasicOptions.showTooltipLabel": "显示工具提示",
     "common.ui.errorAutoCreateIndex.breadcrumbs.errorText": "错误",
     "common.ui.errorAutoCreateIndex.errorDescription": "似乎 Elasticsearch 集群的 {autoCreateIndexActionConfig} 设置使 Kibana 无法自动创建用于存储已保存对象的索引。Kibana 将使用此 Elasticsearch 功能，因为这是确保已保存对象索引使用正确映射/架构的最好方式，而且其允许 Kibana 较少地轮询 Elasticsearch。",
     "common.ui.errorAutoCreateIndex.errorDisclaimer": "但是，只有解决了此问题后，您才能在 Kibana 保存内容。",
@@ -3832,11 +3840,6 @@
     "visTypeVislib.chartTypes.areaText": "面积图",
     "visTypeVislib.chartTypes.barText": "条形图",
     "visTypeVislib.chartTypes.lineText": "折线图",
-    "visTypeVislib.controls.colorRanges.errorText": "每个范围应大于前一范围。",
-    "visTypeVislib.controls.colorSchema.colorSchemaLabel": "颜色模式",
-    "visTypeVislib.controls.colorSchema.howToChangeColorsDescription": "可以更改图例中的各个颜色。",
-    "visTypeVislib.controls.colorSchema.resetColorsButtonLabel": "重置颜色",
-    "visTypeVislib.controls.colorSchema.reverseColorSchemaLabel": "反转模式",
     "visTypeVislib.controls.gaugeOptions.alignmentLabel": "对齐方式",
     "visTypeVislib.controls.gaugeOptions.autoExtendRangeLabel": "自动扩展范围",
     "visTypeVislib.controls.gaugeOptions.displayWarningsLabel": "显示警告",
@@ -3903,10 +3906,7 @@
     "visTypeVislib.controls.pointSeries.valueAxes.toggleCustomExtendsAriaLabel": "切换定制范围",
     "visTypeVislib.controls.pointSeries.valueAxes.toggleOptionsAriaLabel": "切换 {axisName} 选项",
     "visTypeVislib.controls.pointSeries.valueAxes.yAxisTitle": "Y 轴",
-    "visTypeVislib.controls.rangeErrorMessage": "值必须是在 {min} 到 {max} 的范围内",
     "visTypeVislib.controls.truncateLabel": "截断",
-    "visTypeVislib.controls.vislibBasicOptions.legendPositionLabel": "图例位置",
-    "visTypeVislib.controls.vislibBasicOptions.showTooltipLabel": "显示工具提示",
     "visTypeVislib.editors.heatmap.basicSettingsTitle": "基本设置",
     "visTypeVislib.editors.heatmap.heatmapSettingsTitle": "热图设置",
     "visTypeVislib.editors.heatmap.highlightLabel": "高亮范围",

From 36acb373876f3c6ea5077caae81d3a1cad239dfd Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Fri, 10 Apr 2020 11:18:12 -0400
Subject: [PATCH 15/36] Make uptime alert flyout test a little more resilient
 (#62702)

---
 .../apps/uptime/alert_flyout.ts               | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts
index 2a0358160da51..3e5a8c57c4c7e 100644
--- a/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts
@@ -33,7 +33,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       // put the fetch code in a retry block with a timeout.
       let alert: any;
       await retry.tryForTime(15000, async () => {
-        const apiResponse = await supertest.get('/api/alert/_find');
+        const apiResponse = await supertest.get('/api/alert/_find?search=uptime-test');
         const alertsFromThisTest = apiResponse.body.data.filter(
           ({ name }: { name: string }) => name === 'uptime-test'
         );
@@ -54,25 +54,27 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         tags,
       } = alert;
 
-      // we're not testing the flyout's ability to associate alerts with action connectors
-      expect(actions).to.eql([]);
+      try {
+        // we're not testing the flyout's ability to associate alerts with action connectors
+        expect(actions).to.eql([]);
 
-      expect(alertTypeId).to.eql('xpack.uptime.alerts.monitorStatus');
-      expect(consumer).to.eql('uptime');
-      expect(interval).to.eql('11m');
-      expect(tags).to.eql(['uptime', 'another']);
-      expect(numTimes).to.be(3);
-      expect(timerange.from).to.be('now-1h');
-      expect(timerange.to).to.be('now');
-      expect(locations).to.eql(['mpls']);
-      expect(filters).to.eql(
-        '{"bool":{"should":[{"match_phrase":{"monitor.id":"0001-up"}}],"minimum_should_match":1}}'
-      );
-
-      await supertest
-        .delete(`/api/alert/${id}`)
-        .set('kbn-xsrf', 'true')
-        .expect(204);
+        expect(alertTypeId).to.eql('xpack.uptime.alerts.monitorStatus');
+        expect(consumer).to.eql('uptime');
+        expect(interval).to.eql('11m');
+        expect(tags).to.eql(['uptime', 'another']);
+        expect(numTimes).to.be(3);
+        expect(timerange.from).to.be('now-1h');
+        expect(timerange.to).to.be('now');
+        expect(locations).to.eql(['mpls']);
+        expect(filters).to.eql(
+          '{"bool":{"should":[{"match_phrase":{"monitor.id":"0001-up"}}],"minimum_should_match":1}}'
+        );
+      } finally {
+        await supertest
+          .delete(`/api/alert/${id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(204);
+      }
     });
   });
 };

From 55a3cc45835ccf267c06c2d0d62000027d2bf006 Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Fri, 10 Apr 2020 09:55:38 -0600
Subject: [PATCH 16/36] [SIEM] [Cases] Unit tests for case UI components
 (#63005)

---
 .../components/filter_popover/index.tsx       |   1 +
 .../components/header_page/editable_title.tsx |   9 +-
 .../siem/public/containers/case/api.ts        |   4 +-
 .../case/configure/use_configure.tsx          |   4 +-
 .../plugins/siem/public/pages/case/case.tsx   |   9 +-
 .../siem/public/pages/case/case_details.tsx   |   6 +-
 .../case/components/__mock__/case_data.tsx    | 226 ++++++++++++
 .../pages/case/components/__mock__/form.ts    |  37 ++
 .../pages/case/components/__mock__/router.ts  |  39 +++
 .../components/add_comment/index.test.tsx     | 144 ++++++++
 .../case/components/add_comment/index.tsx     |   6 +-
 .../components/all_cases/__mock__/index.tsx   | 115 ------
 .../components/all_cases/columns.test.tsx     |  48 +++
 .../case/components/all_cases/columns.tsx     |  14 +-
 .../case/components/all_cases/index.test.tsx  |  66 +++-
 .../all_cases/table_filters.test.tsx          | 121 +++++++
 .../components/all_cases/table_filters.tsx    |   7 +-
 .../case/components/all_cases/translations.ts |   4 +
 .../pages/case/components/callout/helpers.tsx |   4 +-
 .../case/components/callout/index.test.tsx    |  71 ++++
 .../pages/case/components/callout/index.tsx   |  10 +-
 .../case/components/case_status/index.tsx     |   2 +-
 .../components/case_view/__mock__/index.tsx   |  93 -----
 .../components/case_view/actions.test.tsx     |  10 +-
 .../case/components/case_view/actions.tsx     |   1 -
 .../case/components/case_view/index.test.tsx  | 320 +++++++++++++----
 .../pages/case/components/case_view/index.tsx |   8 +-
 .../case/components/create/index.test.tsx     | 121 +++++++
 .../pages/case/components/create/index.tsx    |   7 +-
 .../case/components/tag_list/index.test.tsx   | 138 ++++++++
 .../pages/case/components/tag_list/index.tsx  |  17 +-
 .../use_push_to_service/index.test.tsx        | 192 ++++++++++
 .../components/use_push_to_service/index.tsx  |   5 +-
 .../user_action_tree/helpers.test.tsx         | 143 ++++++++
 .../components/user_action_tree/helpers.tsx   |  12 +-
 .../user_action_tree/index.test.tsx           | 331 ++++++++++++++++++
 .../components/user_action_tree/index.tsx     |  10 +-
 .../user_action_tree/user_action_item.tsx     |  15 +-
 .../user_action_tree/user_action_markdown.tsx |  20 +-
 .../user_action_title.test.tsx                |  57 +++
 .../user_action_tree/user_action_title.tsx    |  16 +-
 .../siem/public/pages/case/translations.ts    |   4 +
 .../scripts/generate_case_and_comment_data.sh |   6 +-
 .../case/server/scripts/generate_case_data.sh |   4 +-
 44 files changed, 2117 insertions(+), 360 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/case_data.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/form.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/router.ts
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.test.tsx
 delete mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/__mock__/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.test.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/table_filters.test.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/callout/index.test.tsx
 delete mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/case_view/__mock__/index.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/create/index.test.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.test.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/use_push_to_service/index.test.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.test.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.test.tsx
 create mode 100644 x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.test.tsx

diff --git a/x-pack/legacy/plugins/siem/public/components/filter_popover/index.tsx b/x-pack/legacy/plugins/siem/public/components/filter_popover/index.tsx
index 3c01ec18a879f..fca6396a53745 100644
--- a/x-pack/legacy/plugins/siem/public/components/filter_popover/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/filter_popover/index.tsx
@@ -89,6 +89,7 @@ export const FilterPopoverComponent = ({
         {options.map((option, index) => (
           <EuiFilterSelectItem
             checked={selectedOptions.includes(option) ? 'on' : undefined}
+            data-test-subj={`options-filter-popover-item-${index}`}
             key={`${index}-${option}`}
             onClick={toggleSelectedGroupCb.bind(null, option)}
           >
diff --git a/x-pack/legacy/plugins/siem/public/components/header_page/editable_title.tsx b/x-pack/legacy/plugins/siem/public/components/header_page/editable_title.tsx
index 165be00384779..0c6f7258d09dc 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_page/editable_title.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_page/editable_title.tsx
@@ -60,12 +60,9 @@ const EditableTitleComponent: React.FC<Props> = ({
   }, [changedTitle, title]);
 
   const handleOnChange = useCallback(
-    (e: ChangeEvent<HTMLInputElement>) => {
-      onTitleChange(e.target.value);
-    },
-    [onTitleChange]
+    (e: ChangeEvent<HTMLInputElement>) => onTitleChange(e.target.value),
+    []
   );
-
   return editMode ? (
     <EuiFlexGroup alignItems="center" gutterSize="m" justifyContent="spaceBetween">
       <EuiFlexItem grow={false}>
@@ -107,7 +104,7 @@ const EditableTitleComponent: React.FC<Props> = ({
         <Title title={title} />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        {isLoading && <MySpinner />}
+        {isLoading && <MySpinner data-test-subj="editable-title-loading" />}
         {!isLoading && (
           <MyEuiButtonIcon
             isDisabled={disabled}
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/api.ts b/x-pack/legacy/plugins/siem/public/containers/case/api.ts
index 69e1602b3d981..12b4c80a2dd89 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/case/api.ts
@@ -204,13 +204,13 @@ export const patchComment = async (
   return convertToCamelCase<CaseResponse, Case>(decodeCaseResponse(response));
 };
 
-export const deleteCases = async (caseIds: string[], signal: AbortSignal): Promise<boolean> => {
+export const deleteCases = async (caseIds: string[], signal: AbortSignal): Promise<string> => {
   const response = await KibanaServices.get().http.fetch<string>(CASES_URL, {
     method: 'DELETE',
     query: { ids: JSON.stringify(caseIds) },
     signal,
   });
-  return response === 'true' ? true : false;
+  return response;
 };
 
 export const pushCase = async (
diff --git a/x-pack/legacy/plugins/siem/public/containers/case/configure/use_configure.tsx b/x-pack/legacy/plugins/siem/public/containers/case/configure/use_configure.tsx
index 7f57149d4e56d..1c03a09a8c2ea 100644
--- a/x-pack/legacy/plugins/siem/public/containers/case/configure/use_configure.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/case/configure/use_configure.tsx
@@ -55,7 +55,6 @@ export const useCaseConfigure = ({
         setLoading(true);
         const res = await getCaseConfigure({ signal: abortCtrl.signal });
         if (!didCancel) {
-          setLoading(false);
           if (res != null) {
             setConnector(res.connectorId, res.connectorName);
             if (setClosureType != null) {
@@ -73,6 +72,7 @@ export const useCaseConfigure = ({
               }
             }
           }
+          setLoading(false);
         }
       } catch (error) {
         if (!didCancel) {
@@ -117,7 +117,6 @@ export const useCaseConfigure = ({
                   abortCtrl.signal
                 );
           if (!didCancel) {
-            setPersistLoading(false);
             setConnector(res.connectorId);
             if (setClosureType) {
               setClosureType(res.closureType);
@@ -131,6 +130,7 @@ export const useCaseConfigure = ({
             }
 
             displaySuccessToast(i18n.SUCCESS_CONFIGURE, dispatchToaster);
+            setPersistLoading(false);
           }
         } catch (error) {
           if (!didCancel) {
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/case.tsx b/x-pack/legacy/plugins/siem/public/pages/case/case.tsx
index 2ae35796387b8..aefb0a93366b8 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/case.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/case.tsx
@@ -11,11 +11,9 @@ import { useGetUserSavedObjectPermissions } from '../../lib/kibana';
 import { SpyRoute } from '../../utils/route/spy_routes';
 import { AllCases } from './components/all_cases';
 
-import { getSavedObjectReadOnly, CaseCallOut } from './components/callout';
+import { savedObjectReadOnly, CaseCallOut } from './components/callout';
 import { CaseSavedObjectNoPermissions } from './saved_object_no_permissions';
 
-const infoReadSavedObject = getSavedObjectReadOnly();
-
 export const CasesPage = React.memo(() => {
   const userPermissions = useGetUserSavedObjectPermissions();
 
@@ -24,10 +22,11 @@ export const CasesPage = React.memo(() => {
       <WrapperPage>
         {userPermissions != null && !userPermissions?.crud && userPermissions?.read && (
           <CaseCallOut
-            title={infoReadSavedObject.title}
-            message={infoReadSavedObject.description}
+            title={savedObjectReadOnly.title}
+            message={savedObjectReadOnly.description}
           />
         )}
+        <CaseCallOut title={savedObjectReadOnly.title} message={savedObjectReadOnly.description} />
         <AllCases userCanCrud={userPermissions?.crud ?? false} />
       </WrapperPage>
       <SpyRoute />
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/case_details.tsx b/x-pack/legacy/plugins/siem/public/pages/case/case_details.tsx
index cbc7bbc62fbf9..4bb8afa7f8d42 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/case_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/case_details.tsx
@@ -13,9 +13,7 @@ import { SpyRoute } from '../../utils/route/spy_routes';
 import { getCaseUrl } from '../../components/link_to';
 import { navTabs } from '../home/home_navigations';
 import { CaseView } from './components/case_view';
-import { getSavedObjectReadOnly, CaseCallOut } from './components/callout';
-
-const infoReadSavedObject = getSavedObjectReadOnly();
+import { savedObjectReadOnly, CaseCallOut } from './components/callout';
 
 export const CaseDetailsPage = React.memo(() => {
   const userPermissions = useGetUserSavedObjectPermissions();
@@ -29,7 +27,7 @@ export const CaseDetailsPage = React.memo(() => {
   return caseId != null ? (
     <>
       {userPermissions != null && !userPermissions?.crud && userPermissions?.read && (
-        <CaseCallOut title={infoReadSavedObject.title} message={infoReadSavedObject.description} />
+        <CaseCallOut title={savedObjectReadOnly.title} message={savedObjectReadOnly.description} />
       )}
       <CaseView caseId={caseId} userCanCrud={userPermissions?.crud ?? false} />
       <SpyRoute />
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/case_data.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/case_data.tsx
new file mode 100644
index 0000000000000..64c6276fc1be2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/case_data.tsx
@@ -0,0 +1,226 @@
+/*
+ * 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 { CaseProps } from '../case_view';
+import { Case, Comment, SortFieldCase } from '../../../../containers/case/types';
+import { UseGetCasesState } from '../../../../containers/case/use_get_cases';
+import { UserAction, UserActionField } from '../../../../../../../../plugins/case/common/api/cases';
+
+const updateCase = jest.fn();
+const fetchCase = jest.fn();
+
+const basicCaseId = 'basic-case-id';
+const basicCommentId = 'basic-comment-id';
+const basicCreatedAt = '2020-02-20T23:06:33.798Z';
+const elasticUser = {
+  fullName: 'Leslie Knope',
+  username: 'lknope',
+  email: 'leslie.knope@elastic.co',
+};
+
+export const basicComment: Comment = {
+  comment: 'Solve this fast!',
+  id: basicCommentId,
+  createdAt: basicCreatedAt,
+  createdBy: elasticUser,
+  pushedAt: null,
+  pushedBy: null,
+  updatedAt: '2020-02-20T23:06:33.798Z',
+  updatedBy: {
+    username: 'elastic',
+  },
+  version: 'WzQ3LDFc',
+};
+
+export const basicCase: Case = {
+  closedAt: null,
+  closedBy: null,
+  id: basicCaseId,
+  comments: [basicComment],
+  createdAt: '2020-02-13T19:44:23.627Z',
+  createdBy: elasticUser,
+  description: 'Security banana Issue',
+  externalService: null,
+  status: 'open',
+  tags: ['defacement'],
+  title: 'Another horrible breach!!',
+  totalComment: 1,
+  updatedAt: '2020-02-19T15:02:57.995Z',
+  updatedBy: {
+    username: 'elastic',
+  },
+  version: 'WzQ3LDFd',
+};
+
+export const caseProps: CaseProps = {
+  caseId: basicCaseId,
+  userCanCrud: true,
+  caseData: basicCase,
+  fetchCase,
+  updateCase,
+};
+
+export const caseClosedProps: CaseProps = {
+  ...caseProps,
+  caseData: {
+    ...caseProps.caseData,
+    closedAt: '2020-02-20T23:06:33.798Z',
+    closedBy: {
+      username: 'elastic',
+    },
+    status: 'closed',
+  },
+};
+
+export const basicCaseClosed: Case = {
+  ...caseClosedProps.caseData,
+};
+
+const basicAction = {
+  actionAt: basicCreatedAt,
+  actionBy: elasticUser,
+  oldValue: null,
+  newValue: 'what a cool value',
+  caseId: basicCaseId,
+  commentId: null,
+};
+export const caseUserActions = [
+  {
+    ...basicAction,
+    actionBy: elasticUser,
+    actionField: ['comment'],
+    action: 'create',
+    actionId: 'tt',
+  },
+];
+
+export const useGetCasesMockState: UseGetCasesState = {
+  data: {
+    countClosedCases: 0,
+    countOpenCases: 5,
+    cases: [
+      basicCase,
+      {
+        closedAt: null,
+        closedBy: null,
+        id: '362a5c10-4e99-11ea-9290-35d05cb55c15',
+        createdAt: '2020-02-13T19:44:13.328Z',
+        createdBy: { username: 'elastic' },
+        comments: [],
+        description: 'Security banana Issue',
+        externalService: {
+          pushedAt: '2020-02-13T19:45:01.901Z',
+          pushedBy: 'elastic',
+          connectorId: 'string',
+          connectorName: 'string',
+          externalId: 'string',
+          externalTitle: 'string',
+          externalUrl: 'string',
+        },
+        status: 'open',
+        tags: ['phishing'],
+        title: 'Bad email',
+        totalComment: 0,
+        updatedAt: '2020-02-13T15:45:01.901Z',
+        updatedBy: { username: 'elastic' },
+        version: 'WzQ3LDFd',
+      },
+      {
+        closedAt: null,
+        closedBy: null,
+        id: '34f8b9e0-4e99-11ea-9290-35d05cb55c15',
+        createdAt: '2020-02-13T19:44:11.328Z',
+        createdBy: { username: 'elastic' },
+        comments: [],
+        description: 'Security banana Issue',
+        externalService: {
+          pushedAt: '2020-02-13T19:45:01.901Z',
+          pushedBy: 'elastic',
+          connectorId: 'string',
+          connectorName: 'string',
+          externalId: 'string',
+          externalTitle: 'string',
+          externalUrl: 'string',
+        },
+        status: 'open',
+        tags: ['phishing'],
+        title: 'Bad email',
+        totalComment: 0,
+        updatedAt: '2020-02-14T19:45:01.901Z',
+        updatedBy: { username: 'elastic' },
+        version: 'WzQ3LDFd',
+      },
+      {
+        closedAt: '2020-02-13T19:44:13.328Z',
+        closedBy: { username: 'elastic' },
+        id: '31890e90-4e99-11ea-9290-35d05cb55c15',
+        createdAt: '2020-02-13T19:44:05.563Z',
+        createdBy: { username: 'elastic' },
+        comments: [],
+        description: 'Security banana Issue',
+        externalService: null,
+        status: 'closed',
+        tags: ['phishing'],
+        title: 'Uh oh',
+        totalComment: 0,
+        updatedAt: null,
+        updatedBy: null,
+        version: 'WzQ3LDFd',
+      },
+      {
+        closedAt: null,
+        closedBy: null,
+        id: '2f5b3210-4e99-11ea-9290-35d05cb55c15',
+        createdAt: '2020-02-13T19:44:01.901Z',
+        createdBy: { username: 'elastic' },
+        comments: [],
+        description: 'Security banana Issue',
+        externalService: null,
+        status: 'open',
+        tags: ['phishing'],
+        title: 'Uh oh',
+        totalComment: 0,
+        updatedAt: null,
+        updatedBy: null,
+        version: 'WzQ3LDFd',
+      },
+    ],
+    page: 1,
+    perPage: 5,
+    total: 10,
+  },
+  loading: [],
+  selectedCases: [],
+  isError: false,
+  queryParams: {
+    page: 1,
+    perPage: 5,
+    sortField: SortFieldCase.createdAt,
+    sortOrder: 'desc',
+  },
+  filterOptions: { search: '', reporters: [], tags: [], status: 'open' },
+};
+
+const basicPush = {
+  connector_id: 'connector_id',
+  connector_name: 'connector name',
+  external_id: 'external_id',
+  external_title: 'external title',
+  external_url: 'basicPush.com',
+  pushed_at: basicCreatedAt,
+  pushed_by: elasticUser,
+};
+export const getUserAction = (af: UserActionField, a: UserAction) => ({
+  ...basicAction,
+  actionId: `${af[0]}-${a}`,
+  actionField: af,
+  action: a,
+  commentId: af[0] === 'comment' ? basicCommentId : null,
+  newValue:
+    a === 'push-to-service' && af[0] === 'pushed'
+      ? JSON.stringify(basicPush)
+      : basicAction.newValue,
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/form.ts b/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/form.ts
new file mode 100644
index 0000000000000..9d2ac29bc47d7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/form.ts
@@ -0,0 +1,37 @@
+/*
+ * 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 const mockFormHook = {
+  isSubmitted: false,
+  isSubmitting: false,
+  isValid: true,
+  submit: jest.fn(),
+  subscribe: jest.fn(),
+  setFieldValue: jest.fn(),
+  setFieldErrors: jest.fn(),
+  getFields: jest.fn(),
+  getFormData: jest.fn(),
+  getFieldDefaultValue: jest.fn(),
+  /* Returns a list of all errors in the form */
+  getErrors: jest.fn(),
+  reset: jest.fn(),
+  __options: {},
+  __formData$: {},
+  __addField: jest.fn(),
+  __removeField: jest.fn(),
+  __validateFields: jest.fn(),
+  __updateFormDataAt: jest.fn(),
+  __readFieldConfigFromSchema: jest.fn(),
+};
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const getFormMock = (sampleData: any) => ({
+  ...mockFormHook,
+  submit: () =>
+    Promise.resolve({
+      data: sampleData,
+      isValid: true,
+    }),
+  getFormData: () => sampleData,
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/router.ts b/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/router.ts
new file mode 100644
index 0000000000000..a20ab00852a36
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/__mock__/router.ts
@@ -0,0 +1,39 @@
+/*
+ * 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 { Router } from 'react-router-dom';
+// eslint-disable-next-line @kbn/eslint/module_migration
+import routeData from 'react-router';
+type Action = 'PUSH' | 'POP' | 'REPLACE';
+const pop: Action = 'POP';
+const location = {
+  pathname: '/network',
+  search: '',
+  state: '',
+  hash: '',
+};
+export const mockHistory = {
+  length: 2,
+  location,
+  action: pop,
+  push: jest.fn(),
+  replace: jest.fn(),
+  go: jest.fn(),
+  goBack: jest.fn(),
+  goForward: jest.fn(),
+  block: jest.fn(),
+  createHref: jest.fn(),
+  listen: jest.fn(),
+};
+
+export const mockLocation = {
+  pathname: '/welcome',
+  hash: '',
+  search: '',
+  state: '',
+};
+
+export { Router, routeData };
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.test.tsx
new file mode 100644
index 0000000000000..74f6411f17fa0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.test.tsx
@@ -0,0 +1,144 @@
+/*
+ * 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 { mount } from 'enzyme';
+
+import { AddComment } from './';
+import { TestProviders } from '../../../../mock';
+import { getFormMock } from '../__mock__/form';
+import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router';
+
+import { useInsertTimeline } from '../../../../components/timeline/insert_timeline_popover/use_insert_timeline';
+import { usePostComment } from '../../../../containers/case/use_post_comment';
+import { useForm } from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form';
+import { wait } from '../../../../lib/helpers';
+jest.mock(
+  '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'
+);
+jest.mock('../../../../components/timeline/insert_timeline_popover/use_insert_timeline');
+jest.mock('../../../../containers/case/use_post_comment');
+
+export const useFormMock = useForm as jest.Mock;
+
+const useInsertTimelineMock = useInsertTimeline as jest.Mock;
+const usePostCommentMock = usePostComment as jest.Mock;
+
+const onCommentSaving = jest.fn();
+const onCommentPosted = jest.fn();
+const postComment = jest.fn();
+const handleCursorChange = jest.fn();
+const handleOnTimelineChange = jest.fn();
+
+const addCommentProps = {
+  caseId: '1234',
+  disabled: false,
+  insertQuote: null,
+  onCommentSaving,
+  onCommentPosted,
+  showLoading: false,
+};
+
+const defaultInsertTimeline = {
+  cursorPosition: {
+    start: 0,
+    end: 0,
+  },
+  handleCursorChange,
+  handleOnTimelineChange,
+};
+
+const defaultPostCommment = {
+  isLoading: false,
+  isError: false,
+  postComment,
+};
+const sampleData = {
+  comment: 'what a cool comment',
+};
+describe('AddComment ', () => {
+  const formHookMock = getFormMock(sampleData);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    useInsertTimelineMock.mockImplementation(() => defaultInsertTimeline);
+    usePostCommentMock.mockImplementation(() => defaultPostCommment);
+    useFormMock.mockImplementation(() => ({ form: formHookMock }));
+    jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocation);
+  });
+
+  it('should post comment on submit click', async () => {
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <AddComment {...addCommentProps} />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper.find(`[data-test-subj="add-comment"]`).exists()).toBeTruthy();
+    expect(wrapper.find(`[data-test-subj="loading-spinner"]`).exists()).toBeFalsy();
+
+    wrapper
+      .find(`[data-test-subj="submit-comment"]`)
+      .first()
+      .simulate('click');
+    await wait();
+    expect(onCommentSaving).toBeCalled();
+    expect(postComment).toBeCalledWith(sampleData, onCommentPosted);
+    expect(formHookMock.reset).toBeCalled();
+  });
+
+  it('should render spinner and disable submit when loading', () => {
+    usePostCommentMock.mockImplementation(() => ({ ...defaultPostCommment, isLoading: true }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <AddComment {...{ ...addCommentProps, showLoading: true }} />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper.find(`[data-test-subj="loading-spinner"]`).exists()).toBeTruthy();
+    expect(
+      wrapper
+        .find(`[data-test-subj="submit-comment"]`)
+        .first()
+        .prop('isDisabled')
+    ).toBeTruthy();
+  });
+
+  it('should disable submit button when disabled prop passed', () => {
+    usePostCommentMock.mockImplementation(() => ({ ...defaultPostCommment, isLoading: true }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <AddComment {...{ ...addCommentProps, disabled: true }} />
+        </Router>
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="submit-comment"]`)
+        .first()
+        .prop('isDisabled')
+    ).toBeTruthy();
+  });
+
+  it('should insert a quote if one is available', () => {
+    const sampleQuote = 'what a cool quote';
+    mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <AddComment {...{ ...addCommentProps, insertQuote: sampleQuote }} />
+        </Router>
+      </TestProviders>
+    );
+
+    expect(formHookMock.setFieldValue).toBeCalledWith(
+      'comment',
+      `${sampleData.comment}\n\n${sampleQuote}`
+    );
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
index ecc57c50e28eb..eaba708948a99 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/add_comment/index.tsx
@@ -71,10 +71,9 @@ export const AddComment = React.memo<AddCommentProps>(
         form.reset();
       }
     }, [form, onCommentPosted, onCommentSaving]);
-
     return (
       <span id="add-comment-permLink">
-        {isLoading && showLoading && <MySpinner size="xl" />}
+        {isLoading && showLoading && <MySpinner data-test-subj="loading-spinner" size="xl" />}
         <Form form={form}>
           <UseField
             path="comment"
@@ -82,11 +81,12 @@ export const AddComment = React.memo<AddCommentProps>(
             componentProps={{
               idAria: 'caseComment',
               isDisabled: isLoading,
-              dataTestSubj: 'caseComment',
+              dataTestSubj: 'add-comment',
               placeholder: i18n.ADD_COMMENT_HELP_TEXT,
               onCursorPositionUpdate: handleCursorChange,
               bottomRightContent: (
                 <EuiButton
+                  data-test-subj="submit-comment"
                   iconType="plusInCircle"
                   isDisabled={isLoading || disabled}
                   isLoading={isLoading}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/__mock__/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/__mock__/index.tsx
deleted file mode 100644
index d4ec32dfd070b..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/__mock__/index.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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 { SortFieldCase } from '../../../../../containers/case/types';
-import { UseGetCasesState } from '../../../../../containers/case/use_get_cases';
-
-export const useGetCasesMockState: UseGetCasesState = {
-  data: {
-    countClosedCases: 0,
-    countOpenCases: 5,
-    cases: [
-      {
-        closedAt: null,
-        closedBy: null,
-        id: '3c4ddcc0-4e99-11ea-9290-35d05cb55c15',
-        createdAt: '2020-02-13T19:44:23.627Z',
-        createdBy: { username: 'elastic' },
-        comments: [],
-        description: 'Security banana Issue',
-        externalService: null,
-        status: 'open',
-        tags: ['defacement'],
-        title: 'Another horrible breach',
-        totalComment: 0,
-        updatedAt: null,
-        updatedBy: null,
-        version: 'WzQ3LDFd',
-      },
-      {
-        closedAt: null,
-        closedBy: null,
-        id: '362a5c10-4e99-11ea-9290-35d05cb55c15',
-        createdAt: '2020-02-13T19:44:13.328Z',
-        createdBy: { username: 'elastic' },
-        comments: [],
-        description: 'Security banana Issue',
-        externalService: null,
-        status: 'open',
-        tags: ['phishing'],
-        title: 'Bad email',
-        totalComment: 0,
-        updatedAt: null,
-        updatedBy: null,
-        version: 'WzQ3LDFd',
-      },
-      {
-        closedAt: null,
-        closedBy: null,
-        id: '34f8b9e0-4e99-11ea-9290-35d05cb55c15',
-        createdAt: '2020-02-13T19:44:11.328Z',
-        createdBy: { username: 'elastic' },
-        comments: [],
-        description: 'Security banana Issue',
-        externalService: null,
-        status: 'open',
-        tags: ['phishing'],
-        title: 'Bad email',
-        totalComment: 0,
-        updatedAt: null,
-        updatedBy: null,
-        version: 'WzQ3LDFd',
-      },
-      {
-        closedAt: '2020-02-13T19:44:13.328Z',
-        closedBy: { username: 'elastic' },
-        id: '31890e90-4e99-11ea-9290-35d05cb55c15',
-        createdAt: '2020-02-13T19:44:05.563Z',
-        createdBy: { username: 'elastic' },
-        comments: [],
-        description: 'Security banana Issue',
-        externalService: null,
-        status: 'closed',
-        tags: ['phishing'],
-        title: 'Uh oh',
-        totalComment: 0,
-        updatedAt: null,
-        updatedBy: null,
-        version: 'WzQ3LDFd',
-      },
-      {
-        closedAt: null,
-        closedBy: null,
-        id: '2f5b3210-4e99-11ea-9290-35d05cb55c15',
-        createdAt: '2020-02-13T19:44:01.901Z',
-        createdBy: { username: 'elastic' },
-        comments: [],
-        description: 'Security banana Issue',
-        externalService: null,
-        status: 'open',
-        tags: ['phishing'],
-        title: 'Uh oh',
-        totalComment: 0,
-        updatedAt: null,
-        updatedBy: null,
-        version: 'WzQ3LDFd',
-      },
-    ],
-    page: 1,
-    perPage: 5,
-    total: 10,
-  },
-  loading: [],
-  selectedCases: [],
-  isError: false,
-  queryParams: {
-    page: 1,
-    perPage: 5,
-    sortField: SortFieldCase.createdAt,
-    sortOrder: 'desc',
-  },
-  filterOptions: { search: '', reporters: [], tags: [], status: 'open' },
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.test.tsx
new file mode 100644
index 0000000000000..e008b94ab9e16
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.test.tsx
@@ -0,0 +1,48 @@
+/*
+ * 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 { mount } from 'enzyme';
+
+import { ServiceNowColumn } from './columns';
+
+import { useGetCasesMockState } from '../__mock__/case_data';
+
+describe('ServiceNowColumn ', () => {
+  it('Not pushed render', () => {
+    const wrapper = mount(
+      <ServiceNowColumn {...{ theCase: useGetCasesMockState.data.cases[0] }} />
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="case-table-column-external-notPushed"]`)
+        .last()
+        .exists()
+    ).toBeTruthy();
+  });
+  it('Up to date', () => {
+    const wrapper = mount(
+      <ServiceNowColumn {...{ theCase: useGetCasesMockState.data.cases[1] }} />
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="case-table-column-external-upToDate"]`)
+        .last()
+        .exists()
+    ).toBeTruthy();
+  });
+  it('Needs update', () => {
+    const wrapper = mount(
+      <ServiceNowColumn {...{ theCase: useGetCasesMockState.data.cases[2] }} />
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="case-table-column-external-requiresUpdate"]`)
+        .last()
+        .exists()
+    ).toBeTruthy();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
index 0e12f78e29bc2..e48e5cb0c5959 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/columns.tsx
@@ -114,7 +114,9 @@ export const getCasesColumns = (
     name: i18n.COMMENTS,
     sortable: true,
     render: (totalComment: Case['totalComment']) =>
-      renderStringField(`${totalComment}`, `case-table-column-commentCount`),
+      totalComment != null
+        ? renderStringField(`${totalComment}`, `case-table-column-commentCount`)
+        : getEmptyTagValue(),
   },
   filterStatus === 'open'
     ? {
@@ -150,7 +152,7 @@ export const getCasesColumns = (
         },
       },
   {
-    name: 'ServiceNow Incident',
+    name: i18n.SERVICENOW_INCIDENT,
     render: (theCase: Case) => {
       if (theCase.id != null) {
         return <ServiceNowColumn theCase={theCase} />;
@@ -159,7 +161,7 @@ export const getCasesColumns = (
     },
   },
   {
-    name: 'Actions',
+    name: i18n.ACTIONS,
     actions,
   },
 ];
@@ -168,7 +170,7 @@ interface Props {
   theCase: Case;
 }
 
-const ServiceNowColumn: React.FC<Props> = ({ theCase }) => {
+export const ServiceNowColumn: React.FC<Props> = ({ theCase }) => {
   const handleRenderDataToPush = useCallback(() => {
     const lastCaseUpdate = theCase.updatedAt != null ? new Date(theCase.updatedAt) : null;
     const lastCasePush =
@@ -190,7 +192,9 @@ const ServiceNowColumn: React.FC<Props> = ({ theCase }) => {
         >
           {theCase.externalService?.externalTitle}
         </EuiLink>
-        {hasDataToPush ? i18n.REQUIRES_UPDATE : i18n.UP_TO_DATE}
+        {hasDataToPush
+          ? renderStringField(i18n.REQUIRES_UPDATE, `case-table-column-external-requiresUpdate`)
+          : renderStringField(i18n.UP_TO_DATE, `case-table-column-external-upToDate`)}
       </p>
     );
   }, [theCase]);
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.test.tsx
index a6da45a8c5bb1..f65736e7cd109 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.test.tsx
@@ -9,11 +9,15 @@ import { mount } from 'enzyme';
 import moment from 'moment-timezone';
 import { AllCases } from './';
 import { TestProviders } from '../../../../mock';
-import { useGetCasesMockState } from './__mock__';
+import { useGetCasesMockState } from '../__mock__/case_data';
+import * as i18n from './translations';
+
+import { getEmptyTagValue } from '../../../../components/empty_value';
 import { useDeleteCases } from '../../../../containers/case/use_delete_cases';
 import { useGetCases } from '../../../../containers/case/use_get_cases';
 import { useGetCasesStatus } from '../../../../containers/case/use_get_cases_status';
 import { useUpdateCases } from '../../../../containers/case/use_bulk_update_case';
+import { getCasesColumns } from './columns';
 jest.mock('../../../../containers/case/use_bulk_update_case');
 jest.mock('../../../../containers/case/use_delete_cases');
 jest.mock('../../../../containers/case/use_get_cases');
@@ -35,6 +39,7 @@ describe('AllCases', () => {
   const setSelectedCases = jest.fn();
   const updateBulkStatus = jest.fn();
   const fetchCasesStatus = jest.fn();
+  const emptyTag = getEmptyTagValue().props.children;
 
   const defaultGetCases = {
     ...useGetCasesMockState,
@@ -115,7 +120,7 @@ describe('AllCases', () => {
         .find(`[data-test-subj="case-table-column-createdBy"]`)
         .first()
         .text()
-    ).toEqual(useGetCasesMockState.data.cases[0].createdBy.username);
+    ).toEqual(useGetCasesMockState.data.cases[0].createdBy.fullName);
     expect(
       wrapper
         .find(`[data-test-subj="case-table-column-createdAt"]`)
@@ -129,6 +134,39 @@ describe('AllCases', () => {
         .text()
     ).toEqual('Showing 10 cases');
   });
+  it('should render empty fields', () => {
+    useGetCasesMock.mockImplementation(() => ({
+      ...defaultGetCases,
+      data: {
+        ...defaultGetCases.data,
+        cases: [
+          {
+            ...defaultGetCases.data.cases[0],
+            id: null,
+            createdAt: null,
+            createdBy: null,
+            tags: null,
+            title: null,
+            totalComment: null,
+          },
+        ],
+      },
+    }));
+    const wrapper = mount(
+      <TestProviders>
+        <AllCases userCanCrud={true} />
+      </TestProviders>
+    );
+    const checkIt = (columnName: string, key: number) => {
+      const column = wrapper.find('[data-test-subj="cases-table"] tbody .euiTableRowCell').at(key);
+      if (columnName === i18n.ACTIONS) {
+        return;
+      }
+      expect(column.find('.euiTableRowCell--hideForDesktop').text()).toEqual(columnName);
+      expect(column.find('span').text()).toEqual(emptyTag);
+    };
+    getCasesColumns([], 'open').map((i, key) => i.name != null && checkIt(`${i.name}`, key));
+  });
   it('should tableHeaderSortButton AllCases', () => {
     const wrapper = mount(
       <TestProviders>
@@ -165,6 +203,30 @@ describe('AllCases', () => {
       version: firstCase.version,
     });
   });
+  it('opens case when row action icon clicked', () => {
+    useGetCasesMock.mockImplementation(() => ({
+      ...defaultGetCases,
+      filterOptions: { ...defaultGetCases.filterOptions, status: 'closed' },
+    }));
+
+    const wrapper = mount(
+      <TestProviders>
+        <AllCases userCanCrud={true} />
+      </TestProviders>
+    );
+    wrapper
+      .find('[data-test-subj="action-open"]')
+      .first()
+      .simulate('click');
+    const firstCase = useGetCasesMockState.data.cases[0];
+    expect(dispatchUpdateCaseProperty).toBeCalledWith({
+      caseId: firstCase.id,
+      updateKey: 'status',
+      updateValue: 'open',
+      refetchCasesStatus: fetchCasesStatus,
+      version: firstCase.version,
+    });
+  });
   it('Bulk delete', () => {
     useGetCasesMock.mockImplementation(() => ({
       ...defaultGetCases,
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/table_filters.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/table_filters.test.tsx
new file mode 100644
index 0000000000000..615d052347203
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/table_filters.test.tsx
@@ -0,0 +1,121 @@
+/*
+ * 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 { mount } from 'enzyme';
+
+import { CasesTableFilters } from './table_filters';
+import { TestProviders } from '../../../../mock';
+
+import { useGetTags } from '../../../../containers/case/use_get_tags';
+import { useGetReporters } from '../../../../containers/case/use_get_reporters';
+import { DEFAULT_FILTER_OPTIONS } from '../../../../containers/case/use_get_cases';
+jest.mock('../../../../components/timeline/insert_timeline_popover/use_insert_timeline');
+jest.mock('../../../../containers/case/use_get_reporters');
+jest.mock('../../../../containers/case/use_get_tags');
+
+const onFilterChanged = jest.fn();
+const fetchReporters = jest.fn();
+
+const props = {
+  countClosedCases: 1234,
+  countOpenCases: 99,
+  onFilterChanged,
+  initial: DEFAULT_FILTER_OPTIONS,
+};
+describe('CasesTableFilters ', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    (useGetTags as jest.Mock).mockReturnValue({ tags: ['coke', 'pepsi'] });
+    (useGetReporters as jest.Mock).mockReturnValue({
+      reporters: ['casetester'],
+      respReporters: [{ username: 'casetester' }],
+      isLoading: true,
+      isError: false,
+      fetchReporters,
+    });
+  });
+  it('should render the initial case count', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <CasesTableFilters {...props} />
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="open-case-count"]`)
+        .last()
+        .text()
+    ).toEqual('Open cases (99)');
+    expect(
+      wrapper
+        .find(`[data-test-subj="closed-case-count"]`)
+        .last()
+        .text()
+    ).toEqual('Closed cases (1234)');
+  });
+  it('should call onFilterChange when tags change', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <CasesTableFilters {...props} />
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="options-filter-popover-button-Tags"]`)
+      .last()
+      .simulate('click');
+    wrapper
+      .find(`[data-test-subj="options-filter-popover-item-0"]`)
+      .last()
+      .simulate('click');
+
+    expect(onFilterChanged).toBeCalledWith({ tags: ['coke'] });
+  });
+  it('should call onFilterChange when reporters change', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <CasesTableFilters {...props} />
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="options-filter-popover-button-Reporter"]`)
+      .last()
+      .simulate('click');
+
+    wrapper
+      .find(`[data-test-subj="options-filter-popover-item-0"]`)
+      .last()
+      .simulate('click');
+
+    expect(onFilterChanged).toBeCalledWith({ reporters: [{ username: 'casetester' }] });
+  });
+  it('should call onFilterChange when search changes', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <CasesTableFilters {...props} />
+      </TestProviders>
+    );
+
+    wrapper
+      .find(`[data-test-subj="search-cases"]`)
+      .last()
+      .simulate('keyup', { keyCode: 13, target: { value: 'My search' } });
+    expect(onFilterChanged).toBeCalledWith({ search: 'My search' });
+  });
+  it('should call onFilterChange when status toggled', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <CasesTableFilters {...props} />
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="closed-case-count"]`)
+      .last()
+      .simulate('click');
+
+    expect(onFilterChanged).toBeCalledWith({ status: 'closed' });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/table_filters.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/table_filters.tsx
index a344dd7891010..da477a56c0a22 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/table_filters.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/table_filters.tsx
@@ -42,7 +42,7 @@ const CasesTableFiltersComponent = ({
   onFilterChanged,
   initial = defaultInitial,
 }: CasesTableFiltersProps) => {
-  const [selectedReporters, setselectedReporters] = useState(
+  const [selectedReporters, setSelectedReporters] = useState(
     initial.reporters.map(r => r.full_name ?? r.username ?? '')
   );
   const [search, setSearch] = useState(initial.search);
@@ -54,7 +54,7 @@ const CasesTableFiltersComponent = ({
   const handleSelectedReporters = useCallback(
     newReporters => {
       if (!isEqual(newReporters, selectedReporters)) {
-        setselectedReporters(newReporters);
+        setSelectedReporters(newReporters);
         const reportersObj = respReporters.filter(
           r => newReporters.includes(r.username) || newReporters.includes(r.full_name)
         );
@@ -97,6 +97,7 @@ const CasesTableFiltersComponent = ({
       <EuiFlexItem grow={true}>
         <EuiFieldSearch
           aria-label={i18n.SEARCH_CASES}
+          data-test-subj="search-cases"
           fullWidth
           incremental={false}
           placeholder={i18n.SEARCH_PLACEHOLDER}
@@ -107,6 +108,7 @@ const CasesTableFiltersComponent = ({
       <EuiFlexItem grow={false}>
         <EuiFilterGroup>
           <EuiFilterButton
+            data-test-subj="open-case-count"
             withNext
             hasActiveFilters={showOpenCases}
             onClick={handleToggleFilter.bind(null, true)}
@@ -115,6 +117,7 @@ const CasesTableFiltersComponent = ({
             {countOpenCases != null ? ` (${countOpenCases})` : ''}
           </EuiFilterButton>
           <EuiFilterButton
+            data-test-subj="closed-case-count"
             hasActiveFilters={!showOpenCases}
             onClick={handleToggleFilter.bind(null, false)}
           >
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/translations.ts
index 1bee96bc23fff..d3dcfa50ecfa5 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/translations.ts
@@ -46,6 +46,10 @@ export const BULK_ACTIONS = i18n.translate('xpack.siem.case.caseTable.bulkAction
   defaultMessage: 'Bulk actions',
 });
 
+export const SERVICENOW_INCIDENT = i18n.translate('xpack.siem.case.caseTable.snIncident', {
+  defaultMessage: 'ServiceNow Incident',
+});
+
 export const SEARCH_PLACEHOLDER = i18n.translate('xpack.siem.case.caseTable.searchPlaceholder', {
   defaultMessage: 'e.g. case name',
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/callout/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/callout/helpers.tsx
index 929e8640dceb6..3237104274473 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/callout/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/callout/helpers.tsx
@@ -6,7 +6,7 @@
 
 import * as i18n from './translations';
 
-export const getSavedObjectReadOnly = () => ({
+export const savedObjectReadOnly = {
   title: i18n.READ_ONLY_SAVED_OBJECT_TITLE,
   description: i18n.READ_ONLY_SAVED_OBJECT_MSG,
-});
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/callout/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/callout/index.test.tsx
new file mode 100644
index 0000000000000..126ea13e96af6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/callout/index.test.tsx
@@ -0,0 +1,71 @@
+/*
+ * 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 { mount } from 'enzyme';
+
+import { CaseCallOut } from './';
+
+const defaultProps = {
+  title: 'hey title',
+};
+
+describe('CaseCallOut ', () => {
+  it('Renders single message callout', () => {
+    const props = {
+      ...defaultProps,
+      message: 'we have one message',
+    };
+    const wrapper = mount(<CaseCallOut {...props} />);
+    expect(
+      wrapper
+        .find(`[data-test-subj="callout-message"]`)
+        .last()
+        .exists()
+    ).toBeTruthy();
+    expect(
+      wrapper
+        .find(`[data-test-subj="callout-messages"]`)
+        .last()
+        .exists()
+    ).toBeFalsy();
+  });
+  it('Renders multi message callout', () => {
+    const props = {
+      ...defaultProps,
+      messages: [
+        { ...defaultProps, description: <p>{'we have two messages'}</p> },
+        { ...defaultProps, description: <p>{'for real'}</p> },
+      ],
+    };
+    const wrapper = mount(<CaseCallOut {...props} />);
+    expect(
+      wrapper
+        .find(`[data-test-subj="callout-message"]`)
+        .last()
+        .exists()
+    ).toBeFalsy();
+    expect(
+      wrapper
+        .find(`[data-test-subj="callout-messages"]`)
+        .last()
+        .exists()
+    ).toBeTruthy();
+  });
+  it('Dismisses callout', () => {
+    const props = {
+      ...defaultProps,
+      message: 'we have one message',
+    };
+    const wrapper = mount(<CaseCallOut {...props} />);
+    expect(wrapper.find(`[data-test-subj="case-call-out"]`).exists()).toBeTruthy();
+    wrapper
+      .find(`[data-test-subj="callout-dismiss"]`)
+      .last()
+      .simulate('click');
+    expect(wrapper.find(`[data-test-subj="case-call-out"]`).exists()).toBeFalsy();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/callout/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/callout/index.tsx
index 30a95db2d82a5..0fc93af7f318d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/callout/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/callout/index.tsx
@@ -24,10 +24,12 @@ const CaseCallOutComponent = ({ title, message, messages }: CaseCallOutProps) =>
 
   return showCallOut ? (
     <>
-      <EuiCallOut title={title} color="primary" iconType="gear">
-        {!isEmpty(messages) && <EuiDescriptionList listItems={messages} />}
-        {!isEmpty(message) && <p>{message}</p>}
-        <EuiButton color="primary" onClick={handleCallOut}>
+      <EuiCallOut title={title} color="primary" iconType="gear" data-test-subj="case-call-out">
+        {!isEmpty(messages) && (
+          <EuiDescriptionList data-test-subj="callout-messages" listItems={messages} />
+        )}
+        {!isEmpty(message) && <p data-test-subj="callout-message">{message}</p>}
+        <EuiButton data-test-subj="callout-dismiss" color="primary" onClick={handleCallOut}>
           {i18n.DISMISS_CALLOUT}
         </EuiButton>
       </EuiCallOut>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_status/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_status/index.tsx
index 2b16dfa150d61..718eb95767f2e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_status/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_status/index.tsx
@@ -84,7 +84,7 @@ const CaseStatusComp: React.FC<CaseStatusProps> = ({
     <EuiFlexItem grow={false}>
       <EuiFlexGroup gutterSize="l" alignItems="center">
         <EuiFlexItem>
-          <EuiButtonEmpty iconType="refresh" onClick={onRefresh}>
+          <EuiButtonEmpty data-test-subj="case-refresh" iconType="refresh" onClick={onRefresh}>
             {i18n.CASE_REFRESH}
           </EuiButtonEmpty>
         </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/__mock__/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/__mock__/index.tsx
deleted file mode 100644
index 0e57326707e97..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/__mock__/index.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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 { CaseProps } from '../index';
-import { Case } from '../../../../../containers/case/types';
-
-const updateCase = jest.fn();
-const fetchCase = jest.fn();
-
-export const caseProps: CaseProps = {
-  caseId: '3c4ddcc0-4e99-11ea-9290-35d05cb55c15',
-  userCanCrud: true,
-  caseData: {
-    closedAt: null,
-    closedBy: null,
-    id: '3c4ddcc0-4e99-11ea-9290-35d05cb55c15',
-    comments: [
-      {
-        comment: 'Solve this fast!',
-        id: 'a357c6a0-5435-11ea-b427-fb51a1fcb7b8',
-        createdAt: '2020-02-20T23:06:33.798Z',
-        createdBy: {
-          fullName: 'Steph Milovic',
-          username: 'smilovic',
-          email: 'notmyrealemailfool@elastic.co',
-        },
-        pushedAt: null,
-        pushedBy: null,
-        updatedAt: '2020-02-20T23:06:33.798Z',
-        updatedBy: {
-          username: 'elastic',
-        },
-        version: 'WzQ3LDFd',
-      },
-    ],
-    createdAt: '2020-02-13T19:44:23.627Z',
-    createdBy: { fullName: null, email: 'testemail@elastic.co', username: 'elastic' },
-    description: 'Security banana Issue',
-    externalService: null,
-    status: 'open',
-    tags: ['defacement'],
-    title: 'Another horrible breach!!',
-    totalComment: 1,
-    updatedAt: '2020-02-19T15:02:57.995Z',
-    updatedBy: {
-      username: 'elastic',
-    },
-    version: 'WzQ3LDFd',
-  },
-  fetchCase,
-  updateCase,
-};
-
-export const caseClosedProps: CaseProps = {
-  ...caseProps,
-  caseData: {
-    ...caseProps.caseData,
-    closedAt: '2020-02-20T23:06:33.798Z',
-    closedBy: {
-      username: 'elastic',
-    },
-    status: 'closed',
-  },
-};
-
-export const data: Case = {
-  ...caseProps.caseData,
-};
-
-export const dataClosed: Case = {
-  ...caseClosedProps.caseData,
-};
-
-export const caseUserActions = [
-  {
-    actionField: ['comment'],
-    action: 'create',
-    actionAt: '2020-03-20T17:10:09.814Z',
-    actionBy: {
-      fullName: 'Steph Milovic',
-      username: 'smilovic',
-      email: 'notmyrealemailfool@elastic.co',
-    },
-    newValue: 'Solve this fast!',
-    oldValue: null,
-    actionId: '3c4ddcc0-4e99-11ea-9290-35d05cb55c15',
-    caseId: '9b833a50-6acd-11ea-8fad-af86b1071bd9',
-    commentId: 'a357c6a0-5435-11ea-b427-fb51a1fcb7b8',
-  },
-];
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/actions.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/actions.test.tsx
index 49f5f44cba271..8a25a2121104d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/actions.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/actions.test.tsx
@@ -9,7 +9,7 @@ import { mount } from 'enzyme';
 
 import { useDeleteCases } from '../../../../containers/case/use_delete_cases';
 import { TestProviders } from '../../../../mock';
-import { data } from './__mock__';
+import { basicCase } from '../__mock__/case_data';
 import { CaseViewActions } from './actions';
 jest.mock('../../../../containers/case/use_delete_cases');
 const useDeleteCasesMock = useDeleteCases as jest.Mock;
@@ -34,7 +34,7 @@ describe('CaseView actions', () => {
   it('clicking trash toggles modal', () => {
     const wrapper = mount(
       <TestProviders>
-        <CaseViewActions caseData={data} />
+        <CaseViewActions caseData={basicCase} />
       </TestProviders>
     );
 
@@ -54,12 +54,14 @@ describe('CaseView actions', () => {
     }));
     const wrapper = mount(
       <TestProviders>
-        <CaseViewActions caseData={data} />
+        <CaseViewActions caseData={basicCase} />
       </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="confirm-delete-case-modal"]').exists()).toBeTruthy();
     wrapper.find('button[data-test-subj="confirmModalConfirmButton"]').simulate('click');
-    expect(handleOnDeleteConfirm.mock.calls[0][0]).toEqual([{ id: data.id, title: data.title }]);
+    expect(handleOnDeleteConfirm.mock.calls[0][0]).toEqual([
+      { id: basicCase.id, title: basicCase.title },
+    ]);
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/actions.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/actions.tsx
index 0b08b866df964..216180eb2cf0a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/actions.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/actions.tsx
@@ -40,7 +40,6 @@ const CaseViewActionsComponent: React.FC<CaseViewActions> = ({ caseData, disable
     ),
     [isDisplayConfirmDeleteModal, caseData]
   );
-  // TO DO refactor each of these const's into their own components
   const propertyActions = useMemo(
     () => [
       {
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx
index 3f5b3a3127177..3721a5a727ca5 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx
@@ -5,56 +5,43 @@
  */
 
 import React from 'react';
-import { Router } from 'react-router-dom';
 import { mount } from 'enzyme';
-/* eslint-disable @kbn/eslint/module_migration */
-import routeData from 'react-router';
-/* eslint-enable @kbn/eslint/module_migration */
-import { CaseComponent } from './';
-import { caseProps, caseClosedProps, data, dataClosed, caseUserActions } from './__mock__';
+
+import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router';
+import { CaseComponent, CaseView } from './';
+import {
+  basicCaseClosed,
+  caseClosedProps,
+  caseProps,
+  caseUserActions,
+} from '../__mock__/case_data';
 import { TestProviders } from '../../../../mock';
 import { useUpdateCase } from '../../../../containers/case/use_update_case';
+import { useGetCase } from '../../../../containers/case/use_get_case';
 import { useGetCaseUserActions } from '../../../../containers/case/use_get_case_user_actions';
 import { wait } from '../../../../lib/helpers';
 import { usePushToService } from '../use_push_to_service';
 jest.mock('../../../../containers/case/use_update_case');
 jest.mock('../../../../containers/case/use_get_case_user_actions');
+jest.mock('../../../../containers/case/use_get_case');
 jest.mock('../use_push_to_service');
 const useUpdateCaseMock = useUpdateCase as jest.Mock;
 const useGetCaseUserActionsMock = useGetCaseUserActions as jest.Mock;
 const usePushToServiceMock = usePushToService as jest.Mock;
-type Action = 'PUSH' | 'POP' | 'REPLACE';
-const pop: Action = 'POP';
-const location = {
-  pathname: '/network',
-  search: '',
-  state: '',
-  hash: '',
-};
-const mockHistory = {
-  length: 2,
-  location,
-  action: pop,
-  push: jest.fn(),
-  replace: jest.fn(),
-  go: jest.fn(),
-  goBack: jest.fn(),
-  goForward: jest.fn(),
-  block: jest.fn(),
-  createHref: jest.fn(),
-  listen: jest.fn(),
-};
-
-const mockLocation = {
-  pathname: '/welcome',
-  hash: '',
-  search: '',
-  state: '',
-};
 
 describe('CaseView ', () => {
   const updateCaseProperty = jest.fn();
   const fetchCaseUserActions = jest.fn();
+  const fetchCase = jest.fn();
+  const updateCase = jest.fn();
+  const data = caseProps.caseData;
+  const defaultGetCase = {
+    isLoading: false,
+    isError: false,
+    data,
+    updateCase,
+    fetchCase,
+  };
   /* eslint-disable no-console */
   // Silence until enzyme fixed to use ReactTestUtils.act()
   const originalError = console.error;
@@ -84,17 +71,23 @@ describe('CaseView ', () => {
     participants: [data.createdBy],
   };
 
-  const defaultUsePushToServiceMock = {
-    pushButton: <>{'Hello Button'}</>,
-    pushCallouts: null,
-  };
-
   beforeEach(() => {
     jest.resetAllMocks();
     useUpdateCaseMock.mockImplementation(() => defaultUpdateCaseState);
     jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocation);
     useGetCaseUserActionsMock.mockImplementation(() => defaultUseGetCaseUserActions);
-    usePushToServiceMock.mockImplementation(() => defaultUsePushToServiceMock);
+    usePushToServiceMock.mockImplementation(({ updateCase: updateCaseMockCall }) => ({
+      pushButton: (
+        <button
+          data-test-subj="mock-button"
+          onClick={() => updateCaseMockCall(caseProps.caseData)}
+          type="button"
+        >
+          {'Hello Button'}
+        </button>
+      ),
+      pushCallouts: null,
+    }));
   });
 
   it('should render CaseComponent', async () => {
@@ -120,7 +113,7 @@ describe('CaseView ', () => {
     ).toEqual(data.status);
     expect(
       wrapper
-        .find(`[data-test-subj="case-view-tag-list"] .euiBadge__text`)
+        .find(`[data-test-subj="case-view-tag-list"] [data-test-subj="case-tag"]`)
         .first()
         .text()
     ).toEqual(data.tags[0]);
@@ -139,7 +132,7 @@ describe('CaseView ', () => {
     ).toEqual(data.createdAt);
     expect(
       wrapper
-        .find(`[data-test-subj="case-view-description"]`)
+        .find(`[data-test-subj="description-action"] [data-test-subj="user-action-markdown"]`)
         .first()
         .prop('raw')
     ).toEqual(data.description);
@@ -148,7 +141,7 @@ describe('CaseView ', () => {
   it('should show closed indicators in header when case is closed', async () => {
     useUpdateCaseMock.mockImplementation(() => ({
       ...defaultUpdateCaseState,
-      caseData: dataClosed,
+      caseData: basicCaseClosed,
     }));
     const wrapper = mount(
       <TestProviders>
@@ -164,13 +157,13 @@ describe('CaseView ', () => {
         .find(`[data-test-subj="case-view-closedAt"]`)
         .first()
         .prop('value')
-    ).toEqual(dataClosed.closedAt);
+    ).toEqual(basicCaseClosed.closedAt);
     expect(
       wrapper
         .find(`[data-test-subj="case-view-status"]`)
         .first()
         .text()
-    ).toEqual(dataClosed.status);
+    ).toEqual(basicCaseClosed.status);
   });
 
   it('should dispatch update state when button is toggled', async () => {
@@ -188,7 +181,12 @@ describe('CaseView ', () => {
     expect(updateCaseProperty).toHaveBeenCalled();
   });
 
-  it('should render comments', async () => {
+  it('should display EditableTitle isLoading', () => {
+    useUpdateCaseMock.mockImplementation(() => ({
+      ...defaultUpdateCaseState,
+      isLoading: true,
+      updateKey: 'title',
+    }));
     const wrapper = mount(
       <TestProviders>
         <Router history={mockHistory}>
@@ -196,32 +194,230 @@ describe('CaseView ', () => {
         </Router>
       </TestProviders>
     );
-    await wait();
     expect(
       wrapper
-        .find(
-          `div[data-test-subj="user-action-${data.comments[0].id}-avatar"] [data-test-subj="user-action-avatar"]`
-        )
+        .find('[data-test-subj="editable-title-loading"]')
+        .first()
+        .exists()
+    ).toBeTruthy();
+    expect(
+      wrapper
+        .find('[data-test-subj="editable-title-edit-icon"]')
         .first()
-        .prop('name')
-    ).toEqual(data.comments[0].createdBy.fullName);
+        .exists()
+    ).toBeFalsy();
+  });
 
+  it('should display Toggle Status isLoading', () => {
+    useUpdateCaseMock.mockImplementation(() => ({
+      ...defaultUpdateCaseState,
+      isLoading: true,
+      updateKey: 'status',
+    }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseComponent {...caseProps} />
+        </Router>
+      </TestProviders>
+    );
     expect(
       wrapper
-        .find(
-          `div[data-test-subj="user-action-${data.comments[0].id}"] [data-test-subj="user-action-title"] strong`
-        )
+        .find('[data-test-subj="toggle-case-status"]')
         .first()
-        .text()
-    ).toEqual(data.comments[0].createdBy.username);
+        .prop('isLoading')
+    ).toBeTruthy();
+  });
 
+  it('should display description isLoading', () => {
+    useUpdateCaseMock.mockImplementation(() => ({
+      ...defaultUpdateCaseState,
+      isLoading: true,
+      updateKey: 'description',
+    }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseComponent {...caseProps} />
+        </Router>
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find('[data-test-subj="description-action"] [data-test-subj="user-action-title-loading"]')
+        .first()
+        .exists()
+    ).toBeTruthy();
+    expect(
+      wrapper
+        .find('[data-test-subj="description-action"] [data-test-subj="property-actions"]')
+        .first()
+        .exists()
+    ).toBeFalsy();
+  });
+
+  it('should display tags isLoading', () => {
+    useUpdateCaseMock.mockImplementation(() => ({
+      ...defaultUpdateCaseState,
+      isLoading: true,
+      updateKey: 'tags',
+    }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseComponent {...caseProps} />
+        </Router>
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find('[data-test-subj="case-view-tag-list"] [data-test-subj="tag-list-loading"]')
+        .first()
+        .exists()
+    ).toBeTruthy();
     expect(
       wrapper
-        .find(
-          `div[data-test-subj="user-action-${data.comments[0].id}"] [data-test-subj="markdown"]`
-        )
+        .find('[data-test-subj="tag-list-edit"]')
         .first()
-        .prop('source')
-    ).toEqual(data.comments[0].comment);
+        .exists()
+    ).toBeFalsy();
+  });
+
+  it('should update title', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseComponent {...caseProps} />
+        </Router>
+      </TestProviders>
+    );
+    const newTitle = 'The new title';
+    wrapper
+      .find(`[data-test-subj="editable-title-edit-icon"]`)
+      .first()
+      .simulate('click');
+    wrapper.update();
+    wrapper
+      .find(`[data-test-subj="editable-title-input-field"]`)
+      .last()
+      .simulate('change', { target: { value: newTitle } });
+
+    wrapper.update();
+    wrapper
+      .find(`[data-test-subj="editable-title-submit-btn"]`)
+      .first()
+      .simulate('click');
+
+    wrapper.update();
+    const updateObject = updateCaseProperty.mock.calls[0][0];
+    expect(updateObject.updateKey).toEqual('title');
+    expect(updateObject.updateValue).toEqual(newTitle);
+  });
+
+  it('should push updates on button click', async () => {
+    useGetCaseUserActionsMock.mockImplementation(() => ({
+      ...defaultUseGetCaseUserActions,
+      hasDataToPush: true,
+    }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseComponent {...{ ...caseProps, updateCase }} />
+        </Router>
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find('[data-test-subj="has-data-to-push-button"]')
+        .first()
+        .exists()
+    ).toBeTruthy();
+    wrapper
+      .find('[data-test-subj="mock-button"]')
+      .first()
+      .simulate('click');
+    wrapper.update();
+    await wait();
+    expect(updateCase).toBeCalledWith(caseProps.caseData);
+    expect(fetchCaseUserActions).toBeCalledWith(caseProps.caseData.id);
+  });
+
+  it('should return null if error', () => {
+    (useGetCase as jest.Mock).mockImplementation(() => ({
+      ...defaultGetCase,
+      isError: true,
+    }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseView
+            {...{
+              caseId: '1234',
+              userCanCrud: true,
+            }}
+          />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper).toEqual({});
+  });
+
+  it('should return spinner if loading', () => {
+    (useGetCase as jest.Mock).mockImplementation(() => ({
+      ...defaultGetCase,
+      isLoading: true,
+    }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseView
+            {...{
+              caseId: '1234',
+              userCanCrud: true,
+            }}
+          />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper.find('[data-test-subj="case-view-loading"]').exists()).toBeTruthy();
+  });
+
+  it('should return case view when data is there', () => {
+    (useGetCase as jest.Mock).mockImplementation(() => defaultGetCase);
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseView
+            {...{
+              caseId: '1234',
+              userCanCrud: true,
+            }}
+          />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper.find('[data-test-subj="case-view-title"]').exists()).toBeTruthy();
+  });
+
+  it('should refresh data on refresh', () => {
+    (useGetCase as jest.Mock).mockImplementation(() => defaultGetCase);
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <CaseView
+            {...{
+              caseId: '1234',
+              userCanCrud: true,
+            }}
+          />
+        </Router>
+      </TestProviders>
+    );
+    wrapper
+      .find('[data-test-subj="case-refresh"]')
+      .first()
+      .simulate('click');
+    expect(fetchCaseUserActions).toBeCalledWith(caseProps.caseData.id);
+    expect(fetchCase).toBeCalled();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
index 947da51365d66..3cf0405f40637 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.tsx
@@ -271,7 +271,11 @@ export const CaseComponent = React.memo<CaseProps>(
                           onChange={toggleStatusCase}
                         />
                       </EuiFlexItem>
-                      {hasDataToPush && <EuiFlexItem grow={false}>{pushButton}</EuiFlexItem>}
+                      {hasDataToPush && (
+                        <EuiFlexItem data-test-subj="has-data-to-push-button" grow={false}>
+                          {pushButton}
+                        </EuiFlexItem>
+                      )}
                     </EuiFlexGroup>
                   </>
                 )}
@@ -316,7 +320,7 @@ export const CaseView = React.memo(({ caseId, userCanCrud }: Props) => {
     return (
       <MyEuiFlexGroup justifyContent="center" alignItems="center">
         <EuiFlexItem grow={false}>
-          <EuiLoadingSpinner size="xl" />
+          <EuiLoadingSpinner data-test-subj="case-view-loading" size="xl" />
         </EuiFlexItem>
       </MyEuiFlexGroup>
     );
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/create/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/create/index.test.tsx
new file mode 100644
index 0000000000000..d480744fc932a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/create/index.test.tsx
@@ -0,0 +1,121 @@
+/*
+ * 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 { mount } from 'enzyme';
+
+import { Create } from './';
+import { TestProviders } from '../../../../mock';
+import { getFormMock } from '../__mock__/form';
+import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router';
+
+import { useInsertTimeline } from '../../../../components/timeline/insert_timeline_popover/use_insert_timeline';
+import { usePostCase } from '../../../../containers/case/use_post_case';
+jest.mock('../../../../components/timeline/insert_timeline_popover/use_insert_timeline');
+jest.mock('../../../../containers/case/use_post_case');
+import { useForm } from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks';
+import { wait } from '../../../../lib/helpers';
+import { SiemPageName } from '../../../home/types';
+jest.mock(
+  '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'
+);
+
+export const useFormMock = useForm as jest.Mock;
+
+const useInsertTimelineMock = useInsertTimeline as jest.Mock;
+const usePostCaseMock = usePostCase as jest.Mock;
+
+const postCase = jest.fn();
+const handleCursorChange = jest.fn();
+const handleOnTimelineChange = jest.fn();
+
+const defaultInsertTimeline = {
+  cursorPosition: {
+    start: 0,
+    end: 0,
+  },
+  handleCursorChange,
+  handleOnTimelineChange,
+};
+const sampleData = {
+  description: 'what a great description',
+  tags: ['coke', 'pepsi'],
+  title: 'what a cool title',
+};
+const defaultPostCase = {
+  isLoading: false,
+  isError: false,
+  caseData: null,
+  postCase,
+};
+describe('Create case', () => {
+  const formHookMock = getFormMock(sampleData);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    useInsertTimelineMock.mockImplementation(() => defaultInsertTimeline);
+    usePostCaseMock.mockImplementation(() => defaultPostCase);
+    useFormMock.mockImplementation(() => ({ form: formHookMock }));
+    jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocation);
+  });
+
+  it('should post case on submit click', async () => {
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <Create />
+        </Router>
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="create-case-submit"]`)
+      .first()
+      .simulate('click');
+    await wait();
+    expect(postCase).toBeCalledWith(sampleData);
+  });
+
+  it('should redirect to all cases on cancel click', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <Create />
+        </Router>
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="create-case-cancel"]`)
+      .first()
+      .simulate('click');
+    expect(mockHistory.replace.mock.calls[0][0].pathname).toEqual(`/${SiemPageName.case}`);
+  });
+  it('should redirect to new case when caseData is there', () => {
+    const sampleId = '777777';
+    usePostCaseMock.mockImplementation(() => ({ ...defaultPostCase, caseData: { id: sampleId } }));
+    mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <Create />
+        </Router>
+      </TestProviders>
+    );
+    expect(mockHistory.replace.mock.calls[0][0].pathname).toEqual(
+      `/${SiemPageName.case}/${sampleId}`
+    );
+  });
+
+  it('should render spinner when loading', () => {
+    usePostCaseMock.mockImplementation(() => ({ ...defaultPostCase, isLoading: true }));
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <Create />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper.find(`[data-test-subj="create-case-loading-spinner"]`).exists()).toBeTruthy();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/create/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/create/index.tsx
index 740909db408ec..53b792bb9b5eb 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/create/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/create/index.tsx
@@ -73,7 +73,7 @@ export const Create = React.memo(() => {
 
   const handleSetIsCancel = useCallback(() => {
     setIsCancel(true);
-  }, [isCancel]);
+  }, []);
 
   if (caseData != null && caseData.id) {
     return <Redirect to={`/${SiemPageName.case}/${caseData.id}`} />;
@@ -85,7 +85,7 @@ export const Create = React.memo(() => {
 
   return (
     <EuiPanel>
-      {isLoading && <MySpinner size="xl" />}
+      {isLoading && <MySpinner data-test-subj="create-case-loading-spinner" size="xl" />}
       <Form form={form}>
         <CommonUseField
           path="title"
@@ -107,7 +107,7 @@ export const Create = React.memo(() => {
               euiFieldProps: {
                 fullWidth: true,
                 placeholder: '',
-                isDisabled: isLoading,
+                disabled: isLoading,
               },
             }}
           />
@@ -151,6 +151,7 @@ export const Create = React.memo(() => {
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
+              data-test-subj="create-case-submit"
               fill
               iconType="plusInCircle"
               isDisabled={isLoading}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.test.tsx
new file mode 100644
index 0000000000000..8ad2f8f8cb737
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.test.tsx
@@ -0,0 +1,138 @@
+/*
+ * 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 { mount } from 'enzyme';
+
+import { TagList } from './';
+import { getFormMock } from '../__mock__/form';
+import { TestProviders } from '../../../../mock';
+import { wait } from '../../../../lib/helpers';
+import { useForm } from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks';
+import { act } from 'react-dom/test-utils';
+
+jest.mock(
+  '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'
+);
+const onSubmit = jest.fn();
+const defaultProps = {
+  disabled: false,
+  isLoading: false,
+  onSubmit,
+  tags: [],
+};
+
+describe('TagList ', () => {
+  const sampleTags = ['coke', 'pepsi'];
+  const formHookMock = getFormMock({ tags: sampleTags });
+  beforeEach(() => {
+    jest.resetAllMocks();
+    (useForm as jest.Mock).mockImplementation(() => ({ form: formHookMock }));
+  });
+  it('Renders no tags, and then edit', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <TagList {...defaultProps} />
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="no-tags"]`)
+        .last()
+        .exists()
+    ).toBeTruthy();
+    wrapper
+      .find(`[data-test-subj="tag-list-edit-button"]`)
+      .last()
+      .simulate('click');
+    expect(
+      wrapper
+        .find(`[data-test-subj="no-tags"]`)
+        .last()
+        .exists()
+    ).toBeFalsy();
+    expect(
+      wrapper
+        .find(`[data-test-subj="edit-tags"]`)
+        .last()
+        .exists()
+    ).toBeTruthy();
+  });
+  it('Edit tag on submit', async () => {
+    const wrapper = mount(
+      <TestProviders>
+        <TagList {...defaultProps} />
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="tag-list-edit-button"]`)
+      .last()
+      .simulate('click');
+    await act(async () => {
+      wrapper
+        .find(`[data-test-subj="edit-tags-submit"]`)
+        .last()
+        .simulate('click');
+      await wait();
+      expect(onSubmit).toBeCalledWith(sampleTags);
+    });
+  });
+  it('Cancels on cancel', async () => {
+    const props = {
+      ...defaultProps,
+      tags: ['pepsi'],
+    };
+    const wrapper = mount(
+      <TestProviders>
+        <TagList {...props} />
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="case-tag"]`)
+        .last()
+        .exists()
+    ).toBeTruthy();
+    wrapper
+      .find(`[data-test-subj="tag-list-edit-button"]`)
+      .last()
+      .simulate('click');
+    await act(async () => {
+      expect(
+        wrapper
+          .find(`[data-test-subj="case-tag"]`)
+          .last()
+          .exists()
+      ).toBeFalsy();
+      wrapper
+        .find(`[data-test-subj="edit-tags-cancel"]`)
+        .last()
+        .simulate('click');
+      await wait();
+      wrapper.update();
+      expect(
+        wrapper
+          .find(`[data-test-subj="case-tag"]`)
+          .last()
+          .exists()
+      ).toBeTruthy();
+    });
+  });
+  it('Renders disabled button', () => {
+    const props = { ...defaultProps, disabled: true };
+    const wrapper = mount(
+      <TestProviders>
+        <TagList {...props} />
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="tag-list-edit-button"]`)
+        .last()
+        .prop('disabled')
+    ).toBeTruthy();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.tsx
index f7d890ca60b16..9bac000b93235 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/tag_list/index.tsx
@@ -61,10 +61,11 @@ export const TagList = React.memo(
           <EuiFlexItem grow={false}>
             <h4>{i18n.TAGS}</h4>
           </EuiFlexItem>
-          {isLoading && <EuiLoadingSpinner />}
+          {isLoading && <EuiLoadingSpinner data-test-subj="tag-list-loading" />}
           {!isLoading && (
-            <EuiFlexItem grow={false}>
+            <EuiFlexItem data-test-subj="tag-list-edit" grow={false}>
               <EuiButtonIcon
+                data-test-subj="tag-list-edit-button"
                 isDisabled={disabled}
                 aria-label={i18n.EDIT_TAGS_ARIA}
                 iconType={'pencil'}
@@ -74,17 +75,19 @@ export const TagList = React.memo(
           )}
         </EuiFlexGroup>
         <EuiHorizontalRule margin="xs" />
-        <MyFlexGroup gutterSize="xs">
-          {tags.length === 0 && !isEditTags && <p>{i18n.NO_TAGS}</p>}
+        <MyFlexGroup gutterSize="xs" data-test-subj="grr">
+          {tags.length === 0 && !isEditTags && <p data-test-subj="no-tags">{i18n.NO_TAGS}</p>}
           {tags.length > 0 &&
             !isEditTags &&
             tags.map((tag, key) => (
               <EuiFlexItem grow={false} key={`${tag}${key}`}>
-                <EuiBadge color="hollow">{tag}</EuiBadge>
+                <EuiBadge data-test-subj="case-tag" color="hollow">
+                  {tag}
+                </EuiBadge>
               </EuiFlexItem>
             ))}
           {isEditTags && (
-            <EuiFlexGroup direction="column">
+            <EuiFlexGroup data-test-subj="edit-tags" direction="column">
               <EuiFlexItem>
                 <Form form={form}>
                   <CommonUseField
@@ -105,6 +108,7 @@ export const TagList = React.memo(
                   <EuiFlexItem grow={false}>
                     <EuiButton
                       color="secondary"
+                      data-test-subj="edit-tags-submit"
                       fill
                       iconType="save"
                       onClick={onSubmitTags}
@@ -115,6 +119,7 @@ export const TagList = React.memo(
                   </EuiFlexItem>
                   <EuiFlexItem grow={false}>
                     <EuiButtonEmpty
+                      data-test-subj="edit-tags-cancel"
                       iconType="cross"
                       onClick={setIsEditTags.bind(null, false)}
                       size="s"
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/use_push_to_service/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/use_push_to_service/index.test.tsx
new file mode 100644
index 0000000000000..77215e2318ded
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/use_push_to_service/index.test.tsx
@@ -0,0 +1,192 @@
+/*
+ * 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.
+ */
+/* eslint-disable react/display-name */
+import React from 'react';
+import { renderHook, act } from '@testing-library/react-hooks';
+import { usePushToService, ReturnUsePushToService, UsePushToService } from './';
+import { TestProviders } from '../../../../mock';
+import { usePostPushToService } from '../../../../containers/case/use_post_push_to_service';
+import { ClosureType } from '../../../../../../../../plugins/case/common/api/cases';
+import * as i18n from './translations';
+import { useGetActionLicense } from '../../../../containers/case/use_get_action_license';
+import { getKibanaConfigError, getLicenseError } from './helpers';
+import * as api from '../../../../containers/case/configure/api';
+jest.mock('../../../../containers/case/use_get_action_license');
+jest.mock('../../../../containers/case/use_post_push_to_service');
+jest.mock('../../../../containers/case/configure/api');
+
+describe('usePushToService', () => {
+  const caseId = '12345';
+  const updateCase = jest.fn();
+  const postPushToService = jest.fn();
+  const mockPostPush = {
+    isLoading: false,
+    postPushToService,
+  };
+  const closureType: ClosureType = 'close-by-user';
+  const mockConnector = {
+    connectorId: 'c00l',
+    connectorName: 'name',
+  };
+  const mockCaseConfigure = {
+    ...mockConnector,
+    createdAt: 'string',
+    createdBy: {},
+    closureType,
+    updatedAt: 'string',
+    updatedBy: {},
+    version: 'string',
+  };
+  const getConfigureMock = jest.spyOn(api, 'getCaseConfigure');
+  const actionLicense = {
+    id: '.servicenow',
+    name: 'ServiceNow',
+    minimumLicenseRequired: 'platinum',
+    enabled: true,
+    enabledInConfig: true,
+    enabledInLicense: true,
+  };
+  beforeEach(() => {
+    jest.resetAllMocks();
+    (usePostPushToService as jest.Mock).mockImplementation(() => mockPostPush);
+    (useGetActionLicense as jest.Mock).mockImplementation(() => ({
+      isLoading: false,
+      actionLicense,
+    }));
+    getConfigureMock.mockImplementation(() => Promise.resolve(mockCaseConfigure));
+  });
+  it('push case button posts the push with correct args', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<UsePushToService, ReturnUsePushToService>(
+        () =>
+          usePushToService({
+            caseId,
+            caseStatus: 'open',
+            isNew: false,
+            updateCase,
+            userCanCrud: true,
+          }),
+        {
+          wrapper: ({ children }) => <TestProviders> {children}</TestProviders>,
+        }
+      );
+      await waitForNextUpdate();
+      await waitForNextUpdate();
+      expect(getConfigureMock).toBeCalled();
+      result.current.pushButton.props.children.props.onClick();
+      expect(postPushToService).toBeCalledWith({ ...mockConnector, caseId, updateCase });
+      expect(result.current.pushCallouts).toBeNull();
+    });
+  });
+  it('Displays message when user does not have premium license', async () => {
+    (useGetActionLicense as jest.Mock).mockImplementation(() => ({
+      isLoading: false,
+      actionLicense: {
+        ...actionLicense,
+        enabledInLicense: false,
+      },
+    }));
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<UsePushToService, ReturnUsePushToService>(
+        () =>
+          usePushToService({
+            caseId,
+            caseStatus: 'open',
+            isNew: false,
+            updateCase,
+            userCanCrud: true,
+          }),
+        {
+          wrapper: ({ children }) => <TestProviders> {children}</TestProviders>,
+        }
+      );
+      await waitForNextUpdate();
+      await waitForNextUpdate();
+      const errorsMsg = result.current.pushCallouts?.props.messages;
+      expect(errorsMsg).toHaveLength(1);
+      expect(errorsMsg[0].title).toEqual(getLicenseError().title);
+    });
+  });
+  it('Displays message when user does not have case enabled in config', async () => {
+    (useGetActionLicense as jest.Mock).mockImplementation(() => ({
+      isLoading: false,
+      actionLicense: {
+        ...actionLicense,
+        enabledInConfig: false,
+      },
+    }));
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<UsePushToService, ReturnUsePushToService>(
+        () =>
+          usePushToService({
+            caseId,
+            caseStatus: 'open',
+            isNew: false,
+            updateCase,
+            userCanCrud: true,
+          }),
+        {
+          wrapper: ({ children }) => <TestProviders> {children}</TestProviders>,
+        }
+      );
+      await waitForNextUpdate();
+      await waitForNextUpdate();
+      const errorsMsg = result.current.pushCallouts?.props.messages;
+      expect(errorsMsg).toHaveLength(1);
+      expect(errorsMsg[0].title).toEqual(getKibanaConfigError().title);
+    });
+  });
+  it('Displays message when user does not have a connector configured', async () => {
+    getConfigureMock.mockImplementation(() =>
+      Promise.resolve({
+        ...mockCaseConfigure,
+        connectorId: 'none',
+      })
+    );
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<UsePushToService, ReturnUsePushToService>(
+        () =>
+          usePushToService({
+            caseId,
+            caseStatus: 'open',
+            isNew: false,
+            updateCase,
+            userCanCrud: true,
+          }),
+        {
+          wrapper: ({ children }) => <TestProviders> {children}</TestProviders>,
+        }
+      );
+      await waitForNextUpdate();
+      await waitForNextUpdate();
+      const errorsMsg = result.current.pushCallouts?.props.messages;
+      expect(errorsMsg).toHaveLength(1);
+      expect(errorsMsg[0].title).toEqual(i18n.PUSH_DISABLE_BY_NO_CASE_CONFIG_TITLE);
+    });
+  });
+  it('Displays message when case is closed', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<UsePushToService, ReturnUsePushToService>(
+        () =>
+          usePushToService({
+            caseId,
+            caseStatus: 'closed',
+            isNew: false,
+            updateCase,
+            userCanCrud: true,
+          }),
+        {
+          wrapper: ({ children }) => <TestProviders> {children}</TestProviders>,
+        }
+      );
+      await waitForNextUpdate();
+      await waitForNextUpdate();
+      const errorsMsg = result.current.pushCallouts?.props.messages;
+      expect(errorsMsg).toHaveLength(1);
+      expect(errorsMsg[0].title).toEqual(i18n.PUSH_DISABLE_BECAUSE_CASE_CLOSED_TITLE);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/use_push_to_service/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/use_push_to_service/index.tsx
index 4f370ec978906..5092cba6872e3 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/use_push_to_service/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/use_push_to_service/index.tsx
@@ -19,7 +19,7 @@ import { CaseCallOut } from '../callout';
 import { getLicenseError, getKibanaConfigError } from './helpers';
 import * as i18n from './translations';
 
-interface UsePushToService {
+export interface UsePushToService {
   caseId: string;
   caseStatus: string;
   isNew: boolean;
@@ -32,7 +32,7 @@ interface Connector {
   connectorName: string;
 }
 
-interface ReturnUsePushToService {
+export interface ReturnUsePushToService {
   pushButton: JSX.Element;
   pushCallouts: JSX.Element | null;
 }
@@ -122,6 +122,7 @@ export const usePushToService = ({
   const pushToServiceButton = useMemo(
     () => (
       <EuiButton
+        data-test-subj="push-to-service-now"
         fill
         iconType="importAction"
         onClick={handlePushToService}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.test.tsx
new file mode 100644
index 0000000000000..5c342538f0feb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.test.tsx
@@ -0,0 +1,143 @@
+/*
+ * 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 { getUserAction } from '../__mock__/case_data';
+import { getLabelTitle } from './helpers';
+import * as i18n from '../case_view/translations';
+import { mount } from 'enzyme';
+
+describe('User action tree helpers', () => {
+  it('label title generated for update tags', () => {
+    const action = getUserAction(['title'], 'update');
+    const result: string | JSX.Element = getLabelTitle({
+      action,
+      field: 'tags',
+      firstIndexPushToService: 0,
+      index: 0,
+    });
+
+    const wrapper = mount(<>{result}</>);
+    expect(
+      wrapper
+        .find(`[data-test-subj="ua-tags-label"]`)
+        .first()
+        .text()
+    ).toEqual(` ${i18n.TAGS.toLowerCase()}`);
+
+    expect(
+      wrapper
+        .find(`[data-test-subj="ua-tag"]`)
+        .first()
+        .text()
+    ).toEqual(action.newValue);
+  });
+  it('label title generated for update title', () => {
+    const action = getUserAction(['title'], 'update');
+    const result: string | JSX.Element = getLabelTitle({
+      action,
+      field: 'title',
+      firstIndexPushToService: 0,
+      index: 0,
+    });
+
+    expect(result).toEqual(
+      `${i18n.CHANGED_FIELD.toLowerCase()} ${i18n.CASE_NAME.toLowerCase()}  ${i18n.TO} "${
+        action.newValue
+      }"`
+    );
+  });
+  it('label title generated for update description', () => {
+    const action = getUserAction(['description'], 'update');
+    const result: string | JSX.Element = getLabelTitle({
+      action,
+      field: 'description',
+      firstIndexPushToService: 0,
+      index: 0,
+    });
+
+    expect(result).toEqual(`${i18n.EDITED_FIELD} ${i18n.DESCRIPTION.toLowerCase()}`);
+  });
+  it('label title generated for update status to open', () => {
+    const action = { ...getUserAction(['status'], 'update'), newValue: 'open' };
+    const result: string | JSX.Element = getLabelTitle({
+      action,
+      field: 'status',
+      firstIndexPushToService: 0,
+      index: 0,
+    });
+
+    expect(result).toEqual(`${i18n.REOPENED_CASE.toLowerCase()} ${i18n.CASE}`);
+  });
+  it('label title generated for update status to closed', () => {
+    const action = { ...getUserAction(['status'], 'update'), newValue: 'closed' };
+    const result: string | JSX.Element = getLabelTitle({
+      action,
+      field: 'status',
+      firstIndexPushToService: 0,
+      index: 0,
+    });
+
+    expect(result).toEqual(`${i18n.CLOSED_CASE.toLowerCase()} ${i18n.CASE}`);
+  });
+  it('label title generated for update comment', () => {
+    const action = getUserAction(['comment'], 'update');
+    const result: string | JSX.Element = getLabelTitle({
+      action,
+      field: 'comment',
+      firstIndexPushToService: 0,
+      index: 0,
+    });
+
+    expect(result).toEqual(`${i18n.EDITED_FIELD} ${i18n.COMMENT.toLowerCase()}`);
+  });
+  it('label title generated for pushed incident', () => {
+    const action = getUserAction(['pushed'], 'push-to-service');
+    const result: string | JSX.Element = getLabelTitle({
+      action,
+      field: 'pushed',
+      firstIndexPushToService: 0,
+      index: 0,
+    });
+
+    const wrapper = mount(<>{result}</>);
+    expect(
+      wrapper
+        .find(`[data-test-subj="pushed-label"]`)
+        .first()
+        .text()
+    ).toEqual(i18n.PUSHED_NEW_INCIDENT);
+    expect(
+      wrapper
+        .find(`[data-test-subj="pushed-value"]`)
+        .first()
+        .prop('href')
+    ).toEqual(JSON.parse(action.newValue).external_url);
+  });
+  it('label title generated for needs update incident', () => {
+    const action = getUserAction(['pushed'], 'push-to-service');
+    const result: string | JSX.Element = getLabelTitle({
+      action,
+      field: 'pushed',
+      firstIndexPushToService: 0,
+      index: 1,
+    });
+
+    const wrapper = mount(<>{result}</>);
+    expect(
+      wrapper
+        .find(`[data-test-subj="pushed-label"]`)
+        .first()
+        .text()
+    ).toEqual(i18n.UPDATE_INCIDENT);
+    expect(
+      wrapper
+        .find(`[data-test-subj="pushed-value"]`)
+        .first()
+        .prop('href')
+    ).toEqual(JSON.parse(action.newValue).external_url);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx
index 008f4d7048f56..d6016e540bdc0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx
@@ -41,14 +41,16 @@ export const getLabelTitle = ({ action, field, firstIndexPushToService, index }:
 
 const getTagsLabelTitle = (action: CaseUserActions) => (
   <EuiFlexGroup alignItems="baseline" gutterSize="xs" component="span">
-    <EuiFlexItem>
+    <EuiFlexItem data-test-subj="ua-tags-label">
       {action.action === 'add' && i18n.ADDED_FIELD}
       {action.action === 'delete' && i18n.REMOVED_FIELD} {i18n.TAGS.toLowerCase()}
     </EuiFlexItem>
     {action.newValue != null &&
       action.newValue.split(',').map(tag => (
         <EuiFlexItem grow={false} key={tag}>
-          <EuiBadge color="default">{tag}</EuiBadge>
+          <EuiBadge data-test-subj={`ua-tag`} color="default">
+            {tag}
+          </EuiBadge>
         </EuiFlexItem>
       ))}
   </EuiFlexGroup>
@@ -61,12 +63,12 @@ const getPushedServiceLabelTitle = (
 ) => {
   const pushedVal = JSON.parse(action.newValue ?? '') as CaseFullExternalService;
   return (
-    <EuiFlexGroup alignItems="baseline" gutterSize="xs">
-      <EuiFlexItem>
+    <EuiFlexGroup alignItems="baseline" gutterSize="xs" data-test-subj="pushed-service-label-title">
+      <EuiFlexItem data-test-subj="pushed-label">
         {firstIndexPushToService === index ? i18n.PUSHED_NEW_INCIDENT : i18n.UPDATE_INCIDENT}
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <EuiLink href={pushedVal?.external_url} target="_blank">
+        <EuiLink data-test-subj="pushed-value" href={pushedVal?.external_url} target="_blank">
           {pushedVal?.connector_name} {pushedVal?.external_title}
         </EuiLink>
       </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.test.tsx
new file mode 100644
index 0000000000000..0d8cd729b4a1d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.test.tsx
@@ -0,0 +1,331 @@
+/*
+ * 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 { mount } from 'enzyme';
+
+import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router';
+import { getFormMock } from '../__mock__/form';
+import { useUpdateComment } from '../../../../containers/case/use_update_comment';
+import { basicCase, getUserAction } from '../__mock__/case_data';
+import { UserActionTree } from './';
+import { TestProviders } from '../../../../mock';
+import { useFormMock } from '../create/index.test';
+import { wait } from '../../../../lib/helpers';
+import { act } from 'react-dom/test-utils';
+jest.mock(
+  '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'
+);
+
+const fetchUserActions = jest.fn();
+const onUpdateField = jest.fn();
+const updateCase = jest.fn();
+const defaultProps = {
+  data: basicCase,
+  caseUserActions: [],
+  firstIndexPushToService: -1,
+  isLoadingDescription: false,
+  isLoadingUserActions: false,
+  lastIndexPushToService: -1,
+  userCanCrud: true,
+  fetchUserActions,
+  onUpdateField,
+  updateCase,
+};
+const useUpdateCommentMock = useUpdateComment as jest.Mock;
+jest.mock('../../../../containers/case/use_update_comment');
+
+const patchComment = jest.fn();
+describe('UserActionTree ', () => {
+  const sampleData = {
+    content: 'what a great comment update',
+  };
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    useUpdateCommentMock.mockImplementation(() => ({
+      isLoadingIds: [],
+      patchComment,
+    }));
+    const formHookMock = getFormMock(sampleData);
+    useFormMock.mockImplementation(() => ({ form: formHookMock }));
+    jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocation);
+  });
+
+  it('Loading spinner when user actions loading and displays fullName/username', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...{ ...defaultProps, isLoadingUserActions: true }} />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper.find(`[data-test-subj="user-actions-loading"]`).exists()).toBeTruthy();
+
+    expect(
+      wrapper
+        .find(`[data-test-subj="user-action-avatar"]`)
+        .first()
+        .prop('name')
+    ).toEqual(defaultProps.data.createdBy.fullName);
+    expect(
+      wrapper
+        .find(`[data-test-subj="user-action-title"] strong`)
+        .first()
+        .text()
+    ).toEqual(defaultProps.data.createdBy.username);
+  });
+  it('Renders service now update line with top and bottom when push is required', () => {
+    const ourActions = [
+      getUserAction(['comment'], 'push-to-service'),
+      getUserAction(['comment'], 'update'),
+    ];
+    const props = {
+      ...defaultProps,
+      caseUserActions: ourActions,
+      lastIndexPushToService: 0,
+    };
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...props} />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper.find(`[data-test-subj="show-top-footer"]`).exists()).toBeTruthy();
+    expect(wrapper.find(`[data-test-subj="show-bottom-footer"]`).exists()).toBeTruthy();
+  });
+  it('Renders service now update line with top only when push is up to date', () => {
+    const ourActions = [getUserAction(['comment'], 'push-to-service')];
+    const props = {
+      ...defaultProps,
+      caseUserActions: ourActions,
+      lastIndexPushToService: 0,
+    };
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...props} />
+        </Router>
+      </TestProviders>
+    );
+    expect(wrapper.find(`[data-test-subj="show-top-footer"]`).exists()).toBeTruthy();
+    expect(wrapper.find(`[data-test-subj="show-bottom-footer"]`).exists()).toBeFalsy();
+  });
+
+  it('Outlines comment when update move to link is clicked', () => {
+    const ourActions = [getUserAction(['comment'], 'create'), getUserAction(['comment'], 'update')];
+    const props = {
+      ...defaultProps,
+      caseUserActions: ourActions,
+    };
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...props} />
+        </Router>
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="comment-create-action"]`)
+        .first()
+        .prop('idToOutline')
+    ).toEqual('');
+    wrapper
+      .find(`[data-test-subj="comment-update-action"] [data-test-subj="move-to-link"]`)
+      .first()
+      .simulate('click');
+    expect(
+      wrapper
+        .find(`[data-test-subj="comment-create-action"]`)
+        .first()
+        .prop('idToOutline')
+    ).toEqual(ourActions[0].commentId);
+  });
+
+  it('Switches to markdown when edit is clicked and back to panel when canceled', () => {
+    const ourActions = [getUserAction(['comment'], 'create')];
+    const props = {
+      ...defaultProps,
+      caseUserActions: ourActions,
+    };
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...props} />
+        </Router>
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find(
+          `[data-test-subj="user-action-${props.data.comments[0].id}"] [data-test-subj="user-action-markdown-form"]`
+        )
+        .exists()
+    ).toEqual(false);
+    wrapper
+      .find(`[data-test-subj="comment-create-action"] [data-test-subj="property-actions-ellipses"]`)
+      .first()
+      .simulate('click');
+    wrapper
+      .find(`[data-test-subj="comment-create-action"] [data-test-subj="property-actions-pencil"]`)
+      .first()
+      .simulate('click');
+    expect(
+      wrapper
+        .find(
+          `[data-test-subj="user-action-${props.data.comments[0].id}"] [data-test-subj="user-action-markdown-form"]`
+        )
+        .exists()
+    ).toEqual(true);
+    wrapper
+      .find(
+        `[data-test-subj="user-action-${props.data.comments[0].id}"] [data-test-subj="user-action-cancel-markdown"]`
+      )
+      .first()
+      .simulate('click');
+    expect(
+      wrapper
+        .find(
+          `[data-test-subj="user-action-${props.data.comments[0].id}"] [data-test-subj="user-action-markdown-form"]`
+        )
+        .exists()
+    ).toEqual(false);
+  });
+
+  it('calls update comment when comment markdown is saved', async () => {
+    const ourActions = [getUserAction(['comment'], 'create')];
+    const props = {
+      ...defaultProps,
+      caseUserActions: ourActions,
+    };
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...props} />
+        </Router>
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="comment-create-action"] [data-test-subj="property-actions-ellipses"]`)
+      .first()
+      .simulate('click');
+    wrapper
+      .find(`[data-test-subj="comment-create-action"] [data-test-subj="property-actions-pencil"]`)
+      .first()
+      .simulate('click');
+    wrapper
+      .find(
+        `[data-test-subj="user-action-${props.data.comments[0].id}"] [data-test-subj="user-action-save-markdown"]`
+      )
+      .first()
+      .simulate('click');
+    await act(async () => {
+      await wait();
+      wrapper.update();
+      expect(
+        wrapper
+          .find(
+            `[data-test-subj="user-action-${props.data.comments[0].id}"] [data-test-subj="user-action-markdown-form"]`
+          )
+          .exists()
+      ).toEqual(false);
+      expect(patchComment).toBeCalledWith({
+        commentUpdate: sampleData.content,
+        caseId: props.data.id,
+        commentId: props.data.comments[0].id,
+        fetchUserActions,
+        updateCase,
+        version: props.data.comments[0].version,
+      });
+    });
+  });
+
+  it('calls update description when description markdown is saved', async () => {
+    const props = defaultProps;
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...props} />
+        </Router>
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="description-action"] [data-test-subj="property-actions-ellipses"]`)
+      .first()
+      .simulate('click');
+    wrapper
+      .find(`[data-test-subj="description-action"] [data-test-subj="property-actions-pencil"]`)
+      .first()
+      .simulate('click');
+    wrapper
+      .find(
+        `[data-test-subj="user-action-description"] [data-test-subj="user-action-save-markdown"]`
+      )
+      .first()
+      .simulate('click');
+    await act(async () => {
+      await wait();
+      expect(
+        wrapper
+          .find(
+            `[data-test-subj="user-action-${props.data.id}"] [data-test-subj="user-action-markdown-form"]`
+          )
+          .exists()
+      ).toEqual(false);
+      expect(onUpdateField).toBeCalledWith('description', sampleData.content);
+    });
+  });
+
+  it('quotes', async () => {
+    const commentData = {
+      comment: '',
+    };
+    const formHookMock = getFormMock(commentData);
+    const setFieldValue = jest.fn();
+    useFormMock.mockImplementation(() => ({ form: { ...formHookMock, setFieldValue } }));
+    const props = defaultProps;
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...props} />
+        </Router>
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="description-action"] [data-test-subj="property-actions-ellipses"]`)
+      .first()
+      .simulate('click');
+    wrapper
+      .find(`[data-test-subj="description-action"] [data-test-subj="property-actions-quote"]`)
+      .first()
+      .simulate('click');
+    expect(setFieldValue).toBeCalledWith('comment', `> ${props.data.description} \n`);
+  });
+  it('Outlines comment when url param is provided', () => {
+    const commentId = 'neat-comment-id';
+    const ourActions = [getUserAction(['comment'], 'create')];
+    const props = {
+      ...defaultProps,
+      caseUserActions: ourActions,
+    };
+    jest.spyOn(routeData, 'useParams').mockReturnValue({ commentId });
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTree {...props} />
+        </Router>
+      </TestProviders>
+    );
+    expect(
+      wrapper
+        .find(`[data-test-subj="comment-create-action"]`)
+        .first()
+        .prop('idToOutline')
+    ).toEqual(commentId);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
index 0892d5dcb3ee7..f8f3f0651fa3c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/index.tsx
@@ -60,7 +60,6 @@ export const UserActionTree = React.memo(
     const currentUser = useCurrentUser();
     const [manageMarkdownEditIds, setManangeMardownEditIds] = useState<string[]>([]);
     const [insertQuote, setInsertQuote] = useState<string | null>(null);
-
     const handleManageMarkdownEditId = useCallback(
       (id: string) => {
         if (!manageMarkdownEditIds.includes(id)) {
@@ -74,7 +73,6 @@ export const UserActionTree = React.memo(
 
     const handleSaveComment = useCallback(
       ({ id, version }: { id: string; version: string }, content: string) => {
-        handleManageMarkdownEditId(id);
         patchComment({
           caseId: caseData.id,
           commentId: id,
@@ -135,7 +133,6 @@ export const UserActionTree = React.memo(
           content={caseData.description}
           isEditable={manageMarkdownEditIds.includes(DESCRIPTION_ID)}
           onSaveContent={(content: string) => {
-            handleManageMarkdownEditId(DESCRIPTION_ID);
             onUpdateField(DESCRIPTION_ID, content);
           }}
           onChangeEditable={handleManageMarkdownEditId}
@@ -166,11 +163,11 @@ export const UserActionTree = React.memo(
         }
       }
     }, [commentId, initLoading, isLoadingUserActions, isLoadingIds]);
-
     return (
       <>
         <UserActionItem
           createdAt={caseData.createdAt}
+          data-test-subj="description-action"
           disabled={!userCanCrud}
           id={DESCRIPTION_ID}
           isEditable={manageMarkdownEditIds.includes(DESCRIPTION_ID)}
@@ -193,6 +190,7 @@ export const UserActionTree = React.memo(
                 <UserActionItem
                   key={action.actionId}
                   createdAt={comment.createdAt}
+                  data-test-subj={`comment-create-action`}
                   disabled={!userCanCrud}
                   id={comment.id}
                   idToOutline={selectedOutlineCommentId}
@@ -236,6 +234,7 @@ export const UserActionTree = React.memo(
               <UserActionItem
                 key={action.actionId}
                 createdAt={action.actionAt}
+                data-test-subj={`${action.actionField[0]}-${action.action}-action`}
                 disabled={!userCanCrud}
                 id={action.actionId}
                 isEditable={false}
@@ -263,11 +262,12 @@ export const UserActionTree = React.memo(
         {(isLoadingUserActions || isLoadingIds.includes(NEW_ID)) && (
           <MyEuiFlexGroup justifyContent="center" alignItems="center">
             <EuiFlexItem grow={false}>
-              <EuiLoadingSpinner size="l" />
+              <EuiLoadingSpinner data-test-subj="user-actions-loading" size="l" />
             </EuiFlexItem>
           </MyEuiFlexGroup>
         )}
         <UserActionItem
+          data-test-subj={`add-comment`}
           createdAt={new Date().toISOString()}
           disabled={!userCanCrud}
           id={NEW_ID}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
index bcb4edd6129a6..0acd0623f9413 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx
@@ -21,6 +21,7 @@ import * as i18n from './translations';
 
 interface UserActionItemProps {
   createdAt: string;
+  'data-test-subj'?: string;
   disabled: boolean;
   id: string;
   isEditable: boolean;
@@ -112,6 +113,7 @@ const PushedInfoContainer = styled.div`
 export const UserActionItem = ({
   createdAt,
   disabled,
+  'data-test-subj': dataTestSubj,
   id,
   idToOutline,
   isEditable,
@@ -130,7 +132,7 @@ export const UserActionItem = ({
   username,
   updatedAt,
 }: UserActionItemProps) => (
-  <UserActionItemContainer gutterSize={'none'} direction="column">
+  <UserActionItemContainer data-test-subj={dataTestSubj} gutterSize={'none'} direction="column">
     <EuiFlexItem>
       <EuiFlexGroup gutterSize={'none'}>
         <EuiFlexItem data-test-subj={`user-action-${id}-avatar`} grow={false}>
@@ -145,24 +147,25 @@ export const UserActionItem = ({
           {!isEditable && (
             <MyEuiPanel
               className="userAction__panel"
+              data-test-subj={`user-action-panel`}
               paddingSize="none"
               showoutline={id === idToOutline ? 'true' : 'false'}
             >
               <UserActionTitle
                 createdAt={createdAt}
                 disabled={disabled}
+                fullName={fullName}
                 id={id}
                 isLoading={isLoading}
                 labelEditAction={labelEditAction}
                 labelQuoteAction={labelQuoteAction}
                 labelTitle={labelTitle ?? <></>}
                 linkId={linkId}
-                fullName={fullName}
-                username={username}
-                updatedAt={updatedAt}
                 onEdit={onEdit}
                 onQuote={onQuote}
                 outlineComment={outlineComment}
+                updatedAt={updatedAt}
+                username={username}
               />
               {markdown}
             </MyEuiPanel>
@@ -171,7 +174,7 @@ export const UserActionItem = ({
       </EuiFlexGroup>
     </EuiFlexItem>
     {showTopFooter && (
-      <PushedContainer>
+      <PushedContainer data-test-subj="show-top-footer">
         <PushedInfoContainer>
           <EuiText size="xs" color="subdued">
             {i18n.ALREADY_PUSHED_TO_SERVICE}
@@ -179,7 +182,7 @@ export const UserActionItem = ({
         </PushedInfoContainer>
         <EuiHorizontalRule />
         {showBottomFooter && (
-          <PushedInfoContainer>
+          <PushedInfoContainer data-test-subj="show-bottom-footer">
             <EuiText size="xs" color="subdued">
               {i18n.REQUIRED_UPDATE_TO_SERVICE}
             </EuiText>
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx
index e8503bf43375c..827fe2df120ab 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx
@@ -62,12 +62,24 @@ export const UserActionMarkdown = ({
       return (
         <EuiFlexGroup gutterSize="s" alignItems="center">
           <EuiFlexItem grow={false}>
-            <EuiButtonEmpty size="s" onClick={cancelAction} iconType="cross">
+            <EuiButtonEmpty
+              data-test-subj="user-action-cancel-markdown"
+              size="s"
+              onClick={cancelAction}
+              iconType="cross"
+            >
               {i18n.CANCEL}
             </EuiButtonEmpty>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiButton color="secondary" fill iconType="save" onClick={saveAction} size="s">
+            <EuiButton
+              data-test-subj="user-action-save-markdown"
+              color="secondary"
+              fill
+              iconType="save"
+              onClick={saveAction}
+              size="s"
+            >
               {i18n.SAVE}
             </EuiButton>
           </EuiFlexItem>
@@ -77,7 +89,7 @@ export const UserActionMarkdown = ({
     [handleCancelAction, handleSaveAction]
   );
   return isEditable ? (
-    <Form form={form}>
+    <Form form={form} data-test-subj="user-action-markdown-form">
       <UseField
         path="content"
         component={MarkdownEditorForm}
@@ -99,7 +111,7 @@ export const UserActionMarkdown = ({
     </Form>
   ) : (
     <ContentWrapper>
-      <Markdown raw={content} data-test-subj="case-view-description" />
+      <Markdown raw={content} data-test-subj="user-action-markdown" />
     </ContentWrapper>
   );
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.test.tsx
new file mode 100644
index 0000000000000..e2189367068ca
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.test.tsx
@@ -0,0 +1,57 @@
+/*
+ * 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 { mount } from 'enzyme';
+import copy from 'copy-to-clipboard';
+import { Router, routeData, mockHistory } from '../__mock__/router';
+import { caseUserActions as basicUserActions } from '../__mock__/case_data';
+import { UserActionTitle } from './user_action_title';
+import { TestProviders } from '../../../../mock';
+
+const outlineComment = jest.fn();
+const onEdit = jest.fn();
+const onQuote = jest.fn();
+
+jest.mock('copy-to-clipboard');
+const defaultProps = {
+  createdAt: basicUserActions[0].actionAt,
+  disabled: false,
+  fullName: basicUserActions[0].actionBy.fullName,
+  id: basicUserActions[0].actionId,
+  isLoading: false,
+  labelEditAction: 'labelEditAction',
+  labelQuoteAction: 'labelQuoteAction',
+  labelTitle: <>{'cool'}</>,
+  linkId: basicUserActions[0].commentId,
+  onEdit,
+  onQuote,
+  outlineComment,
+  updatedAt: basicUserActions[0].actionAt,
+  username: basicUserActions[0].actionBy.username,
+};
+
+describe('UserActionTitle ', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.spyOn(routeData, 'useParams').mockReturnValue({ commentId: '123' });
+  });
+
+  it('Calls copy when copy link is clicked', async () => {
+    const wrapper = mount(
+      <TestProviders>
+        <Router history={mockHistory}>
+          <UserActionTitle {...defaultProps} />
+        </Router>
+      </TestProviders>
+    );
+    wrapper
+      .find(`[data-test-subj="copy-link"]`)
+      .first()
+      .simulate('click');
+    expect(copy).toBeCalledTimes(1);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
index 9ccf921c87602..a1edbab7e1fa2 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx
@@ -52,18 +52,18 @@ interface UserActionTitleProps {
 export const UserActionTitle = ({
   createdAt,
   disabled,
+  fullName,
   id,
   isLoading,
   labelEditAction,
   labelQuoteAction,
   labelTitle,
   linkId,
-  fullName,
-  username,
-  updatedAt,
   onEdit,
   onQuote,
   outlineComment,
+  updatedAt,
+  username,
 }: UserActionTitleProps) => {
   const { detailName: caseId } = useParams();
   const urlSearch = useGetUrlSearch(navTabs.case);
@@ -94,10 +94,7 @@ export const UserActionTitle = ({
 
   const handleAnchorLink = useCallback(() => {
     copy(
-      `${window.location.origin}${window.location.pathname}#${SiemPageName.case}/${caseId}/${id}${urlSearch}`,
-      {
-        debug: true,
-      }
+      `${window.location.origin}${window.location.pathname}#${SiemPageName.case}/${caseId}/${id}${urlSearch}`
     );
   }, [caseId, id, urlSearch]);
 
@@ -106,7 +103,6 @@ export const UserActionTitle = ({
       outlineComment(linkId);
     }
   }, [linkId, outlineComment]);
-
   return (
     <EuiText size="s" className="userAction__title" data-test-subj={`user-action-title`}>
       <EuiFlexGroup
@@ -155,6 +151,7 @@ export const UserActionTitle = ({
                 <EuiToolTip position="top" content={<p>{i18n.MOVE_TO_ORIGINAL_COMMENT}</p>}>
                   <EuiButtonIcon
                     aria-label={i18n.MOVE_TO_ORIGINAL_COMMENT}
+                    data-test-subj={`move-to-link`}
                     onClick={handleMoveToLink}
                     iconType="arrowUp"
                   />
@@ -165,6 +162,7 @@ export const UserActionTitle = ({
               <EuiToolTip position="top" content={<p>{i18n.COPY_REFERENCE_LINK}</p>}>
                 <EuiButtonIcon
                   aria-label={i18n.COPY_REFERENCE_LINK}
+                  data-test-subj={`copy-link`}
                   onClick={handleAnchorLink}
                   iconType="link"
                   id={`${id}-permLink`}
@@ -173,7 +171,7 @@ export const UserActionTitle = ({
             </EuiFlexItem>
             {propertyActions.length > 0 && (
               <EuiFlexItem grow={false}>
-                {isLoading && <MySpinner />}
+                {isLoading && <MySpinner data-test-subj="user-action-title-loading" />}
                 {!isLoading && <PropertyActions propertyActions={propertyActions} />}
               </EuiFlexItem>
             )}
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
index 0d1e6d1435ca3..097b8220156e2 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
@@ -131,6 +131,10 @@ export const TAGS = i18n.translate('xpack.siem.case.caseView.tags', {
   defaultMessage: 'Tags',
 });
 
+export const ACTIONS = i18n.translate('xpack.siem.case.allCases.actions', {
+  defaultMessage: 'Actions',
+});
+
 export const NO_TAGS_AVAILABLE = i18n.translate('xpack.siem.case.allCases.noTagsAvailable', {
   defaultMessage: 'No tags available',
 });
diff --git a/x-pack/plugins/case/server/scripts/generate_case_and_comment_data.sh b/x-pack/plugins/case/server/scripts/generate_case_and_comment_data.sh
index 9b6f472d798e0..7ec7dc5a70e92 100755
--- a/x-pack/plugins/case/server/scripts/generate_case_and_comment_data.sh
+++ b/x-pack/plugins/case/server/scripts/generate_case_and_comment_data.sh
@@ -22,9 +22,9 @@ POSTED_COMMENT="$(curl -s -k \
   -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
   -X POST "${KIBANA_URL}${SPACE_URL}/api/cases/$CASE_ID/comments" \
   -d @${COMMENT} \
-  | jq '{ commentId: .id, commentVersion: .version }'
-)"
+  | jq '{ commentId: .comments[0].id, commentVersion: .comments[0].version }' \
+-j)"
 POSTED_CASE=$(./get_case.sh $CASE_ID | jq '{ caseId: .id, caseVersion: .version }' -j)
 
 echo ${POSTED_COMMENT} ${POSTED_CASE} \
-  | jq -s add;
\ No newline at end of file
+| jq -s add;
diff --git a/x-pack/plugins/case/server/scripts/generate_case_data.sh b/x-pack/plugins/case/server/scripts/generate_case_data.sh
index f8f6142a5d733..d3a4d3833ad2e 100755
--- a/x-pack/plugins/case/server/scripts/generate_case_data.sh
+++ b/x-pack/plugins/case/server/scripts/generate_case_data.sh
@@ -11,6 +11,6 @@
 # ./generate_case_data.sh
 
 set -e
-./check_env_variables.sh
-./post_case.sh | jq '{ id: .id, version: .version }' -j;
+  ./check_env_variables.sh
+  ./post_case.sh | jq '{ id: .id, version: .version }';
 

From d5d610f168895ba373dec0db3d0caa64bf6a4b47 Mon Sep 17 00:00:00 2001
From: Robert Austin <robert.austin@elastic.co>
Date: Fri, 10 Apr 2020 12:19:29 -0400
Subject: [PATCH 17/36] Endpoint: Remove unused `lib` module (#63248)

---
 .../public/applications/endpoint/lib/index.ts |   7 -
 .../applications/endpoint/lib/saga.test.ts    | 114 -------------
 .../public/applications/endpoint/lib/saga.ts  | 159 ------------------
 3 files changed, 280 deletions(-)
 delete mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/lib/index.ts
 delete mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/lib/saga.test.ts
 delete mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/lib/saga.ts

diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/lib/index.ts b/x-pack/plugins/endpoint/public/applications/endpoint/lib/index.ts
deleted file mode 100644
index ba2e1ce8f9fe6..0000000000000
--- a/x-pack/plugins/endpoint/public/applications/endpoint/lib/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * 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 * from './saga';
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/lib/saga.test.ts b/x-pack/plugins/endpoint/public/applications/endpoint/lib/saga.test.ts
deleted file mode 100644
index 7c06681184085..0000000000000
--- a/x-pack/plugins/endpoint/public/applications/endpoint/lib/saga.test.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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 { createSagaMiddleware, SagaContext, SagaMiddleware } from './index';
-import { applyMiddleware, createStore, Reducer, Store } from 'redux';
-
-describe('saga', () => {
-  const INCREMENT_COUNTER = 'INCREMENT';
-  const DELAYED_INCREMENT_COUNTER = 'DELAYED INCREMENT COUNTER';
-  const STOP_SAGA_PROCESSING = 'BREAK ASYNC ITERATOR';
-
-  const sleep = (ms = 100) => new Promise(resolve => setTimeout(resolve, ms));
-  let store: Store;
-  let reducerA: Reducer;
-  let sideAffect: (a: unknown, s: unknown) => void;
-  let sagaExe: (sagaContext: SagaContext) => Promise<void>;
-  let sagaExeReduxMiddleware: SagaMiddleware;
-
-  beforeEach(() => {
-    reducerA = jest.fn((prevState = { count: 0 }, { type }) => {
-      switch (type) {
-        case INCREMENT_COUNTER:
-          return { ...prevState, count: prevState.count + 1 };
-        default:
-          return prevState;
-      }
-    });
-
-    sideAffect = jest.fn();
-
-    sagaExe = jest.fn(async ({ actionsAndState, dispatch }: SagaContext) => {
-      for await (const { action, state } of actionsAndState()) {
-        expect(action).toBeDefined();
-        expect(state).toBeDefined();
-
-        if (action.type === STOP_SAGA_PROCESSING) {
-          break;
-        }
-
-        sideAffect(action, state);
-
-        if (action.type === DELAYED_INCREMENT_COUNTER) {
-          await sleep(1);
-          dispatch({
-            type: INCREMENT_COUNTER,
-          });
-        }
-      }
-    });
-
-    sagaExeReduxMiddleware = createSagaMiddleware(sagaExe);
-    store = createStore(reducerA, applyMiddleware(sagaExeReduxMiddleware));
-  });
-
-  afterEach(() => {
-    sagaExeReduxMiddleware.stop();
-  });
-
-  test('it does nothing if saga is not started', () => {
-    expect(sagaExe).not.toHaveBeenCalled();
-  });
-
-  test('it can dispatch store actions once running', async () => {
-    sagaExeReduxMiddleware.start();
-    expect(store.getState()).toEqual({ count: 0 });
-    expect(sagaExe).toHaveBeenCalled();
-
-    store.dispatch({ type: DELAYED_INCREMENT_COUNTER });
-    expect(store.getState()).toEqual({ count: 0 });
-
-    await sleep();
-
-    expect(sideAffect).toHaveBeenCalled();
-    expect(store.getState()).toEqual({ count: 1 });
-  });
-
-  test('it stops processing if break out of loop', async () => {
-    sagaExeReduxMiddleware.start();
-    store.dispatch({ type: DELAYED_INCREMENT_COUNTER });
-    await sleep();
-
-    expect(store.getState()).toEqual({ count: 1 });
-    expect(sideAffect).toHaveBeenCalledTimes(2);
-
-    store.dispatch({ type: STOP_SAGA_PROCESSING });
-    await sleep();
-
-    store.dispatch({ type: DELAYED_INCREMENT_COUNTER });
-    await sleep();
-
-    expect(store.getState()).toEqual({ count: 1 });
-    expect(sideAffect).toHaveBeenCalledTimes(2);
-  });
-
-  test('it stops saga middleware when stop() is called', async () => {
-    sagaExeReduxMiddleware.start();
-    store.dispatch({ type: DELAYED_INCREMENT_COUNTER });
-    await sleep();
-
-    expect(store.getState()).toEqual({ count: 1 });
-    expect(sideAffect).toHaveBeenCalledTimes(2);
-
-    sagaExeReduxMiddleware.stop();
-
-    store.dispatch({ type: DELAYED_INCREMENT_COUNTER });
-    await sleep();
-
-    expect(store.getState()).toEqual({ count: 1 });
-    expect(sideAffect).toHaveBeenCalledTimes(2);
-  });
-});
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/lib/saga.ts b/x-pack/plugins/endpoint/public/applications/endpoint/lib/saga.ts
deleted file mode 100644
index 2a79827847f2e..0000000000000
--- a/x-pack/plugins/endpoint/public/applications/endpoint/lib/saga.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * 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 { AnyAction, Dispatch, Middleware, MiddlewareAPI } from 'redux';
-import { GlobalState } from '../types';
-
-interface QueuedAction<TAction = AnyAction> {
-  /**
-   * The Redux action that was dispatched
-   */
-  action: TAction;
-  /**
-   * The Global state at the time the action was dispatched
-   */
-  state: GlobalState;
-}
-
-interface IteratorInstance {
-  queue: QueuedAction[];
-  nextResolve: null | ((inst: QueuedAction) => void);
-}
-
-type Saga = (storeContext: SagaContext) => Promise<void>;
-
-type StoreActionsAndState<TAction = AnyAction> = AsyncIterableIterator<QueuedAction<TAction>>;
-
-export interface SagaContext<TAction extends AnyAction = AnyAction> {
-  /**
-   * A generator function that will `yield` `Promise`s that resolve with a `QueuedAction`
-   */
-  actionsAndState: () => StoreActionsAndState<TAction>;
-  dispatch: Dispatch<TAction>;
-}
-
-export interface SagaMiddleware extends Middleware {
-  /**
-   * Start the saga. Should be called after the `store` has been created
-   */
-  start: () => void;
-
-  /**
-   * Stop the saga by exiting the internal generator `for await...of` loop.
-   */
-  stop: () => void;
-}
-
-const noop = () => {};
-const STOP = Symbol('STOP');
-
-/**
- * Creates Saga Middleware for use with Redux.
- *
- * @param {Saga} saga The `saga` should initialize a long-running `for await...of` loop against
- * the return value of the `actionsAndState()` method provided by the `SagaContext`.
- *
- * @return {SagaMiddleware}
- *
- * @example
- *
- * type TPossibleActions = { type: 'add', payload: any[] };
- * //...
- * const endpointsSaga = async ({ actionsAndState, dispatch }: SagaContext<TPossibleActions>) => {
- *   for await (const { action, state } of actionsAndState()) {
- *     if (action.type === "userRequestedResource") {
- *       const resourceData = await doApiFetch('of/some/resource');
- *       dispatch({
- *         type: 'add',
- *         payload: [ resourceData ]
- *       });
- *     }
- *   }
- * }
- * const endpointsSagaMiddleware = createSagaMiddleware(endpointsSaga);
- * //....
- * const store = createStore(reducers, [ endpointsSagaMiddleware ]);
- */
-export function createSagaMiddleware(saga: Saga): SagaMiddleware {
-  const iteratorInstances = new Set<IteratorInstance>();
-  let runSaga: () => void = noop;
-  let stopSaga: () => void = noop;
-  let runningPromise: Promise<symbol>;
-
-  async function* getActionsAndStateIterator(): StoreActionsAndState {
-    const instance: IteratorInstance = { queue: [], nextResolve: null };
-    iteratorInstances.add(instance);
-
-    try {
-      while (true) {
-        const actionAndState = await Promise.race([nextActionAndState(), runningPromise]);
-
-        if (actionAndState === STOP) {
-          break;
-        }
-
-        yield actionAndState as QueuedAction;
-      }
-    } finally {
-      // If the consumer stops consuming this (e.g. `break` or `return` is called in the `for await`
-      // then this `finally` block will run and unregister this instance and reset `runSaga`
-      iteratorInstances.delete(instance);
-      runSaga = stopSaga = noop;
-    }
-
-    function nextActionAndState() {
-      if (instance.queue.length) {
-        return Promise.resolve(instance.queue.shift() as QueuedAction);
-      } else {
-        return new Promise<QueuedAction>(function(resolve) {
-          instance.nextResolve = resolve;
-        });
-      }
-    }
-  }
-
-  function enqueue(value: QueuedAction) {
-    for (const iteratorInstance of iteratorInstances) {
-      iteratorInstance.queue.push(value);
-      if (iteratorInstance.nextResolve !== null) {
-        iteratorInstance.nextResolve(iteratorInstance.queue.shift() as QueuedAction);
-        iteratorInstance.nextResolve = null;
-      }
-    }
-  }
-
-  function middleware({ getState, dispatch }: MiddlewareAPI) {
-    if (runSaga === noop) {
-      runSaga = saga.bind<null, SagaContext, any[], Promise<void>>(null, {
-        actionsAndState: getActionsAndStateIterator,
-        dispatch,
-      });
-    }
-    return (next: Dispatch<AnyAction>) => (action: AnyAction) => {
-      // Call the next dispatch method in the middleware chain.
-      const returnValue = next(action);
-
-      enqueue({
-        action,
-        state: getState(),
-      });
-
-      // This will likely be the action itself, unless a middleware further in chain changed it.
-      return returnValue;
-    };
-  }
-
-  middleware.start = () => {
-    runningPromise = new Promise(resolve => (stopSaga = () => resolve(STOP)));
-    runSaga();
-  };
-
-  middleware.stop = () => {
-    stopSaga();
-  };
-
-  return middleware;
-}

From f96f928e6990d64cd7abdb4bedadc1d84557d39c Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Fri, 10 Apr 2020 12:29:26 -0400
Subject: [PATCH 18/36] [Lens] Fix error in query from generated suggestion
 (#63018)

* [Lens] Fix error in query from generated suggestion

* Update from review comments

* Fix test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../indexpattern_suggestions.test.tsx             |  4 ++--
 .../indexpattern_suggestions.ts                   | 15 +++++++--------
 .../operations/definitions/terms.test.tsx         |  2 +-
 .../operations/definitions/terms.tsx              |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
index e36622f876acd..fe14e5de5c1e3 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
@@ -824,10 +824,10 @@ describe('IndexPattern Data Source suggestions', () => {
             state: expect.objectContaining({
               layers: expect.objectContaining({
                 currentLayer: expect.objectContaining({
-                  columnOrder: ['cola', 'id1'],
+                  columnOrder: ['cola', 'colb'],
                   columns: {
                     cola: initialState.layers.currentLayer.columns.cola,
-                    id1: expect.objectContaining({
+                    colb: expect.objectContaining({
                       operationType: 'avg',
                       sourceField: 'memory',
                     }),
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
index 96127caa67bb4..d339171a5ae1f 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
@@ -15,8 +15,8 @@ import {
   operationDefinitionMap,
   IndexPatternColumn,
 } from './operations';
-import { hasField } from './utils';
 import { operationDefinitions } from './operations/definitions';
+import { hasField } from './utils';
 import {
   IndexPattern,
   IndexPatternPrivateState,
@@ -196,7 +196,7 @@ function addFieldAsMetricOperation(
     suggestedPriority: undefined,
     field,
   });
-  const newColumnId = generateId();
+  const addedColumnId = generateId();
 
   const [, metrics] = separateBucketColumns(layer);
 
@@ -206,20 +206,19 @@ function addFieldAsMetricOperation(
       indexPatternId: indexPattern.id,
       columns: {
         ...layer.columns,
-        [newColumnId]: newColumn,
+        [addedColumnId]: newColumn,
       },
-      columnOrder: [...layer.columnOrder, newColumnId],
+      columnOrder: [...layer.columnOrder, addedColumnId],
     };
   }
 
-  // If only one metric, replace instead of add
-  const newColumns = { ...layer.columns, [newColumnId]: newColumn };
-  delete newColumns[metrics[0]];
+  // Replacing old column with new column, keeping the old ID
+  const newColumns = { ...layer.columns, [metrics[0]]: newColumn };
 
   return {
     indexPatternId: indexPattern.id,
     columns: newColumns,
-    columnOrder: [...layer.columnOrder.filter(c => c !== metrics[0]), newColumnId],
+    columnOrder: layer.columnOrder, // Order is kept by replacing
   };
 }
 
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
index 226246714f18d..fc0c9746b2f98 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
@@ -274,7 +274,7 @@ describe('terms', () => {
       expect(updatedColumn).toBe(initialColumn);
     });
 
-    it('should switch to alphabetical ordering if the order column is removed', () => {
+    it('should switch to alphabetical ordering if there are no columns to order by', () => {
       const termsColumn = termsOperation.onOtherColumnChanged!(
         {
           label: 'Top value of category',
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
index cd0dcc0b7e9ce..387b197c9235c 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
@@ -135,7 +135,7 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn> = {
     }
     return currentColumn;
   },
-  paramEditor: ({ state, setState, currentColumn, columnId: currentColumnId, layerId }) => {
+  paramEditor: ({ state, setState, currentColumn, layerId }) => {
     const SEPARATOR = '$$$';
     function toValue(orderBy: TermsIndexPatternColumn['params']['orderBy']) {
       if (orderBy.type === 'alphabetical') {

From 9d2ecc7c06d16ece27449fe2907801024dd438ec Mon Sep 17 00:00:00 2001
From: Brent Kimmel <bkimmel@users.noreply.github.com>
Date: Fri, 10 Apr 2020 12:38:26 -0400
Subject: [PATCH 19/36] Resolver/node svg 2 html (#62958)

* Remove some SVG in Resolver nodes and replace with HTML
---
 .../public/embeddables/resolver/view/defs.tsx |  44 +---
 .../resolver/view/process_event_dot.tsx       | 199 ++++++++++--------
 2 files changed, 113 insertions(+), 130 deletions(-)

diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx b/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx
index 8ee9bfafc630e..de9c3c7e8f8f3 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/view/defs.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { memo } from 'react';
-import { saturate, lighten } from 'polished';
+import { saturate } from 'polished';
 
 import {
   htmlIdGenerator,
@@ -79,8 +79,6 @@ const idGenerator = htmlIdGenerator();
  * Ids of paint servers to be referenced by fill and stroke attributes
  */
 export const PaintServerIds = {
-  runningProcess: idGenerator('psRunningProcess'),
-  runningTrigger: idGenerator('psRunningTrigger'),
   runningProcessCube: idGenerator('psRunningProcessCube'),
   runningTriggerCube: idGenerator('psRunningTriggerCube'),
   terminatedProcessCube: idGenerator('psTerminatedProcessCube'),
@@ -93,46 +91,6 @@ export const PaintServerIds = {
  */
 const PaintServers = memo(() => (
   <>
-    <linearGradient
-      id={PaintServerIds.runningProcess}
-      x1="0"
-      y1="0"
-      x2="1"
-      y2="0"
-      spreadMethod="reflect"
-      gradientUnits="objectBoundingBox"
-    >
-      <stop
-        offset="0%"
-        stopColor={saturate(0.7, lighten(0.05, NamedColors.runningProcessStart))}
-        stopOpacity="1"
-      />
-      <stop
-        offset="100%"
-        stopColor={saturate(0.7, lighten(0.05, NamedColors.runningProcessEnd))}
-        stopOpacity="1"
-      />
-    </linearGradient>
-    <linearGradient
-      id={PaintServerIds.runningTrigger}
-      x1="0"
-      y1="0"
-      x2="1"
-      y2="0"
-      spreadMethod="reflect"
-      gradientUnits="objectBoundingBox"
-    >
-      <stop
-        offset="0%"
-        stopColor={saturate(0.7, lighten(0.05, NamedColors.runningTriggerStart))}
-        stopOpacity="1"
-      />
-      <stop
-        offset="100%"
-        stopColor={saturate(0.7, lighten(0.05, NamedColors.runningTriggerEnd))}
-        stopOpacity="1"
-      />
-    </linearGradient>
     <linearGradient
       id={PaintServerIds.terminatedProcessCube}
       x1="-381.23752"
diff --git a/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx b/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
index 2e3981de74d34..10e331ffff02d 100644
--- a/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
+++ b/x-pack/plugins/endpoint/public/embeddables/resolver/view/process_event_dot.tsx
@@ -11,7 +11,7 @@ import { htmlIdGenerator, EuiKeyboardAccessible } from '@elastic/eui';
 import { useSelector } from 'react-redux';
 import { applyMatrix3 } from '../lib/vector2';
 import { Vector2, Matrix3, AdjacentProcessMap, ResolverProcessType } from '../types';
-import { SymbolIds, NamedColors, PaintServerIds } from './defs';
+import { SymbolIds, NamedColors } from './defs';
 import { ResolverEvent } from '../../../../common/types';
 import { useResolverDispatch } from './use_resolver_dispatch';
 import * as eventModel from '../../../../common/models/event';
@@ -21,7 +21,7 @@ import * as selectors from '../store/selectors';
 const nodeAssets = {
   runningProcessCube: {
     cubeSymbol: `#${SymbolIds.runningProcessCube}`,
-    labelFill: `url(#${PaintServerIds.runningProcess})`,
+    labelBackground: NamedColors.fullLabelBackground,
     descriptionFill: NamedColors.empty,
     descriptionText: i18n.translate('xpack.endpoint.resolver.runningProcess', {
       defaultMessage: 'Running Process',
@@ -29,7 +29,7 @@ const nodeAssets = {
   },
   runningTriggerCube: {
     cubeSymbol: `#${SymbolIds.runningTriggerCube}`,
-    labelFill: `url(#${PaintServerIds.runningTrigger})`,
+    labelBackground: NamedColors.fullLabelBackground,
     descriptionFill: NamedColors.empty,
     descriptionText: i18n.translate('xpack.endpoint.resolver.runningTrigger', {
       defaultMessage: 'Running Trigger',
@@ -37,7 +37,7 @@ const nodeAssets = {
   },
   terminatedProcessCube: {
     cubeSymbol: `#${SymbolIds.terminatedProcessCube}`,
-    labelFill: NamedColors.fullLabelBackground,
+    labelBackground: NamedColors.fullLabelBackground,
     descriptionFill: NamedColors.empty,
     descriptionText: i18n.translate('xpack.endpoint.resolver.terminatedProcess', {
       defaultMessage: 'Terminated Process',
@@ -45,7 +45,7 @@ const nodeAssets = {
   },
   terminatedTriggerCube: {
     cubeSymbol: `#${SymbolIds.terminatedTriggerCube}`,
-    labelFill: NamedColors.fullLabelBackground,
+    labelBackground: NamedColors.fullLabelBackground,
     descriptionFill: NamedColors.empty,
     descriptionText: i18n.translate('xpack.endpoint.resolver.terminatedTrigger', {
       defaultMessage: 'Terminated Trigger',
@@ -114,14 +114,21 @@ export const ProcessEventDot = styled(
         [left, magFactorX, top]
       );
 
+      /**
+       * Type in non-SVG components scales as follows:
+       *  (These values were adjusted to match the proportions in the comps provided by UX/Design)
+       *  18.75 : The smallest readable font size at which labels/descriptions can be read. Font size will not scale below this.
+       *  12.5 : A 'slope' at which the font size will scale w.r.t. to zoom level otherwise
+       */
+      const minimumFontSize = 18.75;
+      const slopeOfFontScale = 12.5;
+      const fontSizeAdjustmentForScale = magFactorX > 1 ? slopeOfFontScale * (magFactorX - 1) : 0;
+      const scaledTypeSize = minimumFontSize + fontSizeAdjustmentForScale;
+
       const markerBaseSize = 15;
       const markerSize = markerBaseSize;
       const markerPositionOffset = -markerBaseSize / 2;
 
-      const labelYOffset = markerPositionOffset + 0.25 * markerSize - 0.5;
-
-      const labelYHeight = markerSize / 1.7647;
-
       /**
        * An element that should be animated when the node is clicked.
        */
@@ -136,9 +143,7 @@ export const ProcessEventDot = styled(
             })
           | null;
       } = React.createRef();
-      const { cubeSymbol, labelFill, descriptionFill, descriptionText } = nodeAssets[
-        nodeType(event)
-      ];
+      const { cubeSymbol, labelBackground, descriptionText } = nodeAssets[nodeType(event)];
       const resolverNodeIdGenerator = useMemo(() => htmlIdGenerator('resolverNode'), []);
 
       const nodeId = useMemo(() => resolverNodeIdGenerator(selfId), [
@@ -154,7 +159,7 @@ export const ProcessEventDot = styled(
       const dispatch = useResolverDispatch();
 
       const handleFocus = useCallback(
-        (focusEvent: React.FocusEvent<SVGSVGElement>) => {
+        (focusEvent: React.FocusEvent<HTMLDivElement>) => {
           dispatch({
             type: 'userFocusedOnResolverNode',
             payload: {
@@ -166,7 +171,7 @@ export const ProcessEventDot = styled(
       );
 
       const handleClick = useCallback(
-        (clickEvent: React.MouseEvent<SVGSVGElement, MouseEvent>) => {
+        (clickEvent: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
           if (animationTarget.current !== null) {
             (animationTarget.current as any).beginElement();
           }
@@ -179,14 +184,15 @@ export const ProcessEventDot = styled(
         },
         [animationTarget, dispatch, nodeId]
       );
-
+      /* eslint-disable jsx-a11y/click-events-have-key-events */
+      /**
+       * Key event handling (e.g. 'Enter'/'Space') is provisioned by the `EuiKeyboardAccessible` component
+       */
       return (
         <EuiKeyboardAccessible>
-          <svg
+          <div
             data-test-subj={'resolverNode'}
             className={className + ' kbn-resetFocusState'}
-            viewBox="-15 -15 90 30"
-            preserveAspectRatio="xMidYMid meet"
             role="treeitem"
             aria-level={adjacentNodeMap.level}
             aria-flowto={
@@ -203,81 +209,100 @@ export const ProcessEventDot = styled(
             onFocus={handleFocus}
             tabIndex={-1}
           >
-            <g>
-              <use
-                xlinkHref={`#${SymbolIds.processCubeActiveBacking}`}
-                x={-11.35}
-                y={-11.35}
-                width={markerSize * 1.5}
-                height={markerSize * 1.5}
-                className="backing"
-              />
-              <rect x="7" y="-12.75" width="15" height="10" fill={NamedColors.resolverBackground} />
-              <use
-                role="presentation"
-                xlinkHref={cubeSymbol}
-                x={markerPositionOffset}
-                y={markerPositionOffset}
-                width={markerSize}
-                height={markerSize}
-                opacity="1"
-                className="cube"
-              >
-                <animateTransform
-                  attributeType="XML"
-                  attributeName="transform"
-                  type="scale"
-                  values="1 1; 1 .83; 1 .8; 1 .83; 1 1"
-                  dur="0.2s"
-                  begin="click"
-                  repeatCount="1"
-                  className="squish"
-                  ref={animationTarget}
+            <svg
+              viewBox="-15 -15 90 30"
+              preserveAspectRatio="xMidYMid meet"
+              style={{
+                display: 'block',
+                width: '100%',
+                height: '100%',
+                position: 'absolute',
+                top: '0',
+                left: '0',
+              }}
+            >
+              <g>
+                <use
+                  xlinkHref={`#${SymbolIds.processCubeActiveBacking}`}
+                  x={-11.35}
+                  y={-11.35}
+                  width={markerSize * 1.5}
+                  height={markerSize * 1.5}
+                  className="backing"
                 />
-              </use>
-              <use
-                role="presentation"
-                xlinkHref={`#${SymbolIds.processNodeLabel}`}
-                x={markerPositionOffset + markerSize - 0.5}
-                y={labelYOffset}
-                width={(markerSize / 1.7647) * 5}
-                height={markerSize / 1.7647}
-                opacity="1"
-                fill={labelFill}
-              />
-              <text
-                x={markerPositionOffset + 0.7 * markerSize + 50 / 2}
-                y={labelYOffset + labelYHeight / 2}
-                textAnchor="middle"
-                dominantBaseline="middle"
-                fontSize="3.75"
-                fontWeight="bold"
-                fill={NamedColors.empty}
-                paintOrder="stroke"
-                tabIndex={-1}
-                style={{ letterSpacing: '-0.02px' }}
-                id={labelId}
-              >
-                {eventModel.eventName(event)}
-              </text>
-              <text
-                x={markerPositionOffset + markerSize}
-                y={labelYOffset - 1}
-                textAnchor="start"
-                dominantBaseline="middle"
-                fontSize="2.67"
-                fill={descriptionFill}
+                <use
+                  role="presentation"
+                  xlinkHref={cubeSymbol}
+                  x={markerPositionOffset}
+                  y={markerPositionOffset}
+                  width={markerSize}
+                  height={markerSize}
+                  opacity="1"
+                  className="cube"
+                >
+                  <animateTransform
+                    attributeType="XML"
+                    attributeName="transform"
+                    type="scale"
+                    values="1 1; 1 .83; 1 .8; 1 .83; 1 1"
+                    dur="0.2s"
+                    begin="click"
+                    repeatCount="1"
+                    className="squish"
+                    ref={animationTarget}
+                  />
+                </use>
+              </g>
+            </svg>
+            <div
+              style={{
+                left: '25%',
+                top: '30%',
+                position: 'absolute',
+                width: '50%',
+                color: 'white',
+                fontSize: `${scaledTypeSize}px`,
+                lineHeight: '140%',
+              }}
+            >
+              <div
                 id={descriptionId}
-                paintOrder="stroke"
-                fontWeight="bold"
-                style={{ textTransform: 'uppercase', letterSpacing: '-0.01px' }}
+                style={{
+                  textTransform: 'uppercase',
+                  letterSpacing: '-0.01px',
+                  backgroundColor: NamedColors.resolverBackground,
+                  lineHeight: '1.2',
+                  fontWeight: 'bold',
+                  fontSize: '.5em',
+                  width: '100%',
+                  margin: '0 0 .05em 0',
+                  textAlign: 'left',
+                  padding: '0',
+                }}
               >
                 {descriptionText}
-              </text>
-            </g>
-          </svg>
+              </div>
+              <div
+                data-test-subject="nodeLabel"
+                id={labelId}
+                style={{
+                  backgroundColor: labelBackground,
+                  padding: '.15em 0',
+                  textAlign: 'center',
+                  maxWidth: '100%',
+                  overflow: 'hidden',
+                  whiteSpace: 'nowrap',
+                  textOverflow: 'ellipsis',
+                  contain: 'content',
+                }}
+              >
+                {eventModel.eventName(event)}
+              </div>
+            </div>
+          </div>
         </EuiKeyboardAccessible>
       );
+      /* eslint-enable jsx-a11y/click-events-have-key-events */
     }
   )
 )`

From aed5253b53fdf53781b6220dbe937510cb7ed378 Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Fri, 10 Apr 2020 09:57:59 -0700
Subject: [PATCH 20/36] [Reporting] convert all server unit tests to TypeScript
 (#62873)

* [Reporting] convert all server unit tests to TypeScript

* fix ts

* revert unrelated change
---
 ...{index.test.js.snap => index.test.ts.snap} |   0
 ...xecute_job.test.js => execute_job.test.ts} | 227 ++++++++++--------
 .../{index.test.js => index.test.ts}          |  61 +++--
 .../{index.test.js => index.test.ts}          |  52 ++--
 .../{index.test.js => index.test.ts}          |   2 +-
 .../routes/{jobs.test.js => jobs.test.ts}     |  36 +--
 ...t.js => reporting_usage_collector.test.ts} |  58 +++--
 .../create_mock_browserdriverfactory.ts       |   2 +-
 x-pack/legacy/plugins/reporting/types.d.ts    |   2 +-
 9 files changed, 273 insertions(+), 167 deletions(-)
 rename x-pack/legacy/plugins/reporting/__snapshots__/{index.test.js.snap => index.test.ts.snap} (100%)
 rename x-pack/legacy/plugins/reporting/export_types/csv/server/{execute_job.test.js => execute_job.test.ts} (88%)
 rename x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/{index.test.js => index.test.ts} (58%)
 rename x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/{index.test.js => index.test.ts} (57%)
 rename x-pack/legacy/plugins/reporting/{index.test.js => index.test.ts} (94%)
 rename x-pack/legacy/plugins/reporting/server/routes/{jobs.test.js => jobs.test.ts} (91%)
 rename x-pack/legacy/plugins/reporting/server/usage/{reporting_usage_collector.test.js => reporting_usage_collector.test.ts} (90%)

diff --git a/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap b/x-pack/legacy/plugins/reporting/__snapshots__/index.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap
rename to x-pack/legacy/plugins/reporting/__snapshots__/index.test.ts.snap
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.ts
similarity index 88%
rename from x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
rename to x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.ts
index 4870e1e35cdaf..f0afade8629ab 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/execute_job.test.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// @ts-ignore
 import Puid from 'puid';
 import sinon from 'sinon';
 import nodeCrypto from '@elastic/node-crypto';
@@ -13,36 +14,40 @@ import { createMockReportingCore } from '../../../test_helpers';
 import { LevelLogger } from '../../../server/lib/level_logger';
 import { setFieldFormats } from '../../../server/services';
 import { executeJobFactory } from './execute_job';
+import { JobDocPayloadDiscoverCsv } from '../types';
 import { CSV_BOM_CHARS } from '../../../common/constants';
 
-const delay = ms => new Promise(resolve => setTimeout(() => resolve(), ms));
+const delay = (ms: number) => new Promise(resolve => setTimeout(() => resolve(), ms));
 
 const puid = new Puid();
 const getRandomScrollId = () => {
   return puid.generate();
 };
 
+const getJobDocPayload = (baseObj: any) => baseObj as JobDocPayloadDiscoverCsv;
+
 describe('CSV Execute Job', function() {
   const encryptionKey = 'testEncryptionKey';
   const headers = {
     sid: 'test',
   };
   const mockLogger = new LevelLogger({
-    get: () => ({
-      debug: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-    }),
+    get: () =>
+      ({
+        debug: jest.fn(),
+        warn: jest.fn(),
+        error: jest.fn(),
+      } as any),
   });
-  let defaultElasticsearchResponse;
-  let encryptedHeaders;
+  let defaultElasticsearchResponse: any;
+  let encryptedHeaders: any;
 
-  let clusterStub;
-  let configGetStub;
-  let mockReportingConfig;
-  let mockReportingPlugin;
-  let callAsCurrentUserStub;
-  let cancellationToken;
+  let clusterStub: any;
+  let configGetStub: any;
+  let mockReportingConfig: any;
+  let mockReportingPlugin: any;
+  let callAsCurrentUserStub: any;
+  let cancellationToken: any;
 
   const mockElasticsearch = {
     dataClient: {
@@ -78,7 +83,7 @@ describe('CSV Execute Job', function() {
       _scroll_id: 'defaultScrollId',
     };
     clusterStub = {
-      callAsCurrentUser: function() {},
+      callAsCurrentUser() {},
     };
 
     callAsCurrentUserStub = sinon
@@ -89,17 +94,19 @@ describe('CSV Execute Job', function() {
     mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(true);
 
     setFieldFormats({
-      fieldFormatServiceFactory: function() {
+      fieldFormatServiceFactory() {
         const uiConfigMock = {};
-        uiConfigMock['format:defaultTypeMap'] = {
+        (uiConfigMock as any)['format:defaultTypeMap'] = {
           _default_: { id: 'string', params: {} },
         };
 
         const fieldFormatsRegistry = new fieldFormats.FieldFormatsRegistry();
 
-        fieldFormatsRegistry.init(key => uiConfigMock[key], {}, [fieldFormats.StringFormat]);
+        fieldFormatsRegistry.init(key => (uiConfigMock as any)[key], {}, [
+          fieldFormats.StringFormat,
+        ]);
 
-        return fieldFormatsRegistry;
+        return Promise.resolve(fieldFormatsRegistry);
       },
     });
   });
@@ -109,7 +116,11 @@ describe('CSV Execute Job', function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
-        { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
+        getJobDocPayload({
+          headers: encryptedHeaders,
+          fields: [],
+          searchRequest: { index: null, body: null },
+        }),
         cancellationToken
       );
       expect(callAsCurrentUserStub.called).toBe(true);
@@ -123,14 +134,14 @@ describe('CSV Execute Job', function() {
       };
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const job = {
+      const job = getJobDocPayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: {
           index,
           body,
         },
-      };
+      });
 
       await executeJob('job777', job, cancellationToken);
 
@@ -152,7 +163,11 @@ describe('CSV Execute Job', function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
-        { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
+        getJobDocPayload({
+          headers: encryptedHeaders,
+          fields: [],
+          searchRequest: { index: null, body: null },
+        }),
         cancellationToken
       );
 
@@ -166,7 +181,11 @@ describe('CSV Execute Job', function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
-        { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
+        getJobDocPayload({
+          headers: encryptedHeaders,
+          fields: [],
+          searchRequest: { index: null, body: null },
+        }),
         cancellationToken
       );
 
@@ -196,7 +215,11 @@ describe('CSV Execute Job', function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
-        { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
+        getJobDocPayload({
+          headers: encryptedHeaders,
+          fields: [],
+          searchRequest: { index: null, body: null },
+        }),
         cancellationToken
       );
 
@@ -231,7 +254,11 @@ describe('CSV Execute Job', function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       await executeJob(
         'job456',
-        { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
+        getJobDocPayload({
+          headers: encryptedHeaders,
+          fields: [],
+          searchRequest: { index: null, body: null },
+        }),
         cancellationToken
       );
 
@@ -257,12 +284,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: undefined,
         searchRequest: { index: null, body: null },
-      };
+      });
       await expect(
         executeJob('job123', jobParams, cancellationToken)
       ).rejects.toMatchInlineSnapshot(`[TypeError: Cannot read property 'indexOf' of undefined]`);
@@ -284,12 +311,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { csv_contains_formulas: csvContainsFormulas } = await executeJob(
         'job123',
         jobParams,
@@ -309,12 +336,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['=SUM(A1:A2)', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { csv_contains_formulas: csvContainsFormulas } = await executeJob(
         'job123',
         jobParams,
@@ -334,12 +361,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { csv_contains_formulas: csvContainsFormulas } = await executeJob(
         'job123',
         jobParams,
@@ -359,12 +386,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { csv_contains_formulas: csvContainsFormulas } = await executeJob(
         'job123',
         jobParams,
@@ -386,12 +413,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
 
       expect(content).toEqual(`${CSV_BOM_CHARS}one,two\none,bar\n`);
@@ -407,12 +434,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
 
       expect(content).toEqual('one,two\none,bar\n');
@@ -423,11 +450,11 @@ describe('CSV Execute Job', function() {
     it('should reject Promise if search call errors out', async function() {
       callAsCurrentUserStub.rejects(new Error());
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       await expect(
         executeJob('job123', jobParams, cancellationToken)
       ).rejects.toMatchInlineSnapshot(`[Error]`);
@@ -442,11 +469,11 @@ describe('CSV Execute Job', function() {
       });
       callAsCurrentUserStub.onSecondCall().rejects(new Error());
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       await expect(
         executeJob('job123', jobParams, cancellationToken)
       ).rejects.toMatchInlineSnapshot(`[Error]`);
@@ -463,11 +490,11 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       await expect(
         executeJob('job123', jobParams, cancellationToken)
       ).rejects.toMatchInlineSnapshot(
@@ -484,11 +511,11 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       await expect(
         executeJob('job123', jobParams, cancellationToken)
       ).rejects.toMatchInlineSnapshot(
@@ -512,11 +539,11 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       await expect(
         executeJob('job123', jobParams, cancellationToken)
       ).rejects.toMatchInlineSnapshot(
@@ -540,11 +567,11 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       await expect(
         executeJob('job123', jobParams, cancellationToken)
       ).rejects.toMatchInlineSnapshot(
@@ -578,7 +605,11 @@ describe('CSV Execute Job', function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       executeJob(
         'job345',
-        { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
+        getJobDocPayload({
+          headers: encryptedHeaders,
+          fields: [],
+          searchRequest: { index: null, body: null },
+        }),
         cancellationToken
       );
 
@@ -593,13 +624,17 @@ describe('CSV Execute Job', function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       executeJob(
         'job345',
-        { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
+        getJobDocPayload({
+          headers: encryptedHeaders,
+          fields: [],
+          searchRequest: { index: null, body: null },
+        }),
         cancellationToken
       );
       cancellationToken.cancel();
 
       for (let i = 0; i < callAsCurrentUserStub.callCount; ++i) {
-        expect(callAsCurrentUserStub.getCall(i).args[1]).to.not.be('clearScroll');
+        expect(callAsCurrentUserStub.getCall(i).args[1]).not.toBe('clearScroll'); // dead code?
       }
     });
 
@@ -607,7 +642,11 @@ describe('CSV Execute Job', function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
       executeJob(
         'job345',
-        { headers: encryptedHeaders, fields: [], searchRequest: { index: null, body: null } },
+        getJobDocPayload({
+          headers: encryptedHeaders,
+          fields: [],
+          searchRequest: { index: null, body: null },
+        }),
         cancellationToken
       );
       await delay(100);
@@ -623,11 +662,11 @@ describe('CSV Execute Job', function() {
   describe('csv content', function() {
     it('should write column headers to output, even if there are no results', async function() {
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
       expect(content).toBe(`one,two\n`);
     });
@@ -635,11 +674,11 @@ describe('CSV Execute Job', function() {
     it('should use custom uiSettings csv:separator for header', async function() {
       mockUiSettingsClient.get.withArgs('csv:separator').returns(';');
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
       expect(content).toBe(`one;two\n`);
     });
@@ -647,11 +686,11 @@ describe('CSV Execute Job', function() {
     it('should escape column headers if uiSettings csv:quoteValues is true', async function() {
       mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(true);
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
       expect(content).toBe(`"one and a half",two,"three-and-four","five & six"\n`);
     });
@@ -659,11 +698,11 @@ describe('CSV Execute Job', function() {
     it(`shouldn't escape column headers if uiSettings csv:quoteValues is false`, async function() {
       mockUiSettingsClient.get.withArgs('csv:quoteValues').returns(false);
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one and a half', 'two', 'three-and-four', 'five & six'],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
       expect(content).toBe(`one and a half,two,three-and-four,five & six\n`);
     });
@@ -677,11 +716,11 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
       const lines = content.split('\n');
       const headerLine = lines[0];
@@ -697,12 +736,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
       const lines = content.split('\n');
       const valuesLine = lines[1];
@@ -724,12 +763,12 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
       const lines = content.split('\n');
 
@@ -746,7 +785,7 @@ describe('CSV Execute Job', function() {
         _scroll_id: 'scrollId',
       });
 
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
@@ -760,7 +799,7 @@ describe('CSV Execute Job', function() {
             fieldFormatMap: '{"one":{"id":"string","params":{"transform": "upper"}}}',
           },
         },
-      };
+      });
       const { content } = await executeJob('job123', jobParams, cancellationToken);
       const lines = content.split('\n');
 
@@ -774,18 +813,18 @@ describe('CSV Execute Job', function() {
     // tests use these 'simple' characters to make the math easier
 
     describe('when only the headers exceed the maxSizeBytes', function() {
-      let content;
-      let maxSizeReached;
+      let content: string;
+      let maxSizeReached: boolean;
 
       beforeEach(async function() {
         configGetStub.withArgs('csv', 'maxSizeBytes').returns(1);
 
         const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-        const jobParams = {
+        const jobParams = getJobDocPayload({
           headers: encryptedHeaders,
           fields: ['one', 'two'],
           searchRequest: { index: null, body: null },
-        };
+        });
 
         ({ content, max_size_reached: maxSizeReached } = await executeJob(
           'job123',
@@ -804,18 +843,18 @@ describe('CSV Execute Job', function() {
     });
 
     describe('when headers are equal to maxSizeBytes', function() {
-      let content;
-      let maxSizeReached;
+      let content: string;
+      let maxSizeReached: boolean;
 
       beforeEach(async function() {
         configGetStub.withArgs('csv', 'maxSizeBytes').returns(9);
 
         const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-        const jobParams = {
+        const jobParams = getJobDocPayload({
           headers: encryptedHeaders,
           fields: ['one', 'two'],
           searchRequest: { index: null, body: null },
-        };
+        });
 
         ({ content, max_size_reached: maxSizeReached } = await executeJob(
           'job123',
@@ -834,8 +873,8 @@ describe('CSV Execute Job', function() {
     });
 
     describe('when the data exceeds the maxSizeBytes', function() {
-      let content;
-      let maxSizeReached;
+      let content: string;
+      let maxSizeReached: boolean;
 
       beforeEach(async function() {
         configGetStub.withArgs('csv', 'maxSizeBytes').returns(9);
@@ -848,12 +887,12 @@ describe('CSV Execute Job', function() {
         });
 
         const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-        const jobParams = {
+        const jobParams = getJobDocPayload({
           headers: encryptedHeaders,
           fields: ['one', 'two'],
           conflictedTypesFields: [],
           searchRequest: { index: null, body: null },
-        };
+        });
 
         ({ content, max_size_reached: maxSizeReached } = await executeJob(
           'job123',
@@ -872,8 +911,8 @@ describe('CSV Execute Job', function() {
     });
 
     describe('when headers and data equal the maxSizeBytes', function() {
-      let content;
-      let maxSizeReached;
+      let content: string;
+      let maxSizeReached: boolean;
 
       beforeEach(async function() {
         mockReportingPlugin.getUiSettingsServiceFactory = () => mockUiSettingsClient;
@@ -887,12 +926,12 @@ describe('CSV Execute Job', function() {
         });
 
         const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-        const jobParams = {
+        const jobParams = getJobDocPayload({
           headers: encryptedHeaders,
           fields: ['one', 'two'],
           conflictedTypesFields: [],
           searchRequest: { index: null, body: null },
-        };
+        });
 
         ({ content, max_size_reached: maxSizeReached } = await executeJob(
           'job123',
@@ -924,12 +963,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
 
       await executeJob('job123', jobParams, cancellationToken);
 
@@ -950,12 +989,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
 
       await executeJob('job123', jobParams, cancellationToken);
 
@@ -976,12 +1015,12 @@ describe('CSV Execute Job', function() {
       });
 
       const executeJob = await executeJobFactory(mockReportingPlugin, mockLogger);
-      const jobParams = {
+      const jobParams = getJobDocPayload({
         headers: encryptedHeaders,
         fields: ['one', 'two'],
         conflictedTypesFields: [],
         searchRequest: { index: null, body: null },
-      };
+      });
 
       await executeJob('job123', jobParams, cancellationToken);
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.ts
similarity index 58%
rename from x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
rename to x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.ts
index cb63e7dad2fdf..c9cba64a732b6 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.ts
@@ -5,19 +5,22 @@
  */
 
 import * as Rx from 'rxjs';
-import { createMockReportingCore } from '../../../../test_helpers';
+import { createMockReportingCore, createMockBrowserDriverFactory } from '../../../../test_helpers';
 import { cryptoFactory } from '../../../../server/lib/crypto';
 import { executeJobFactory } from './index';
 import { generatePngObservableFactory } from '../lib/generate_png';
+import { CancellationToken } from '../../../../common/cancellation_token';
 import { LevelLogger } from '../../../../server/lib';
+import { ReportingCore, CaptureConfig } from '../../../../server/types';
+import { JobDocPayloadPNG } from '../../types';
 
 jest.mock('../lib/generate_png', () => ({ generatePngObservableFactory: jest.fn() }));
 
-let mockReporting;
+let mockReporting: ReportingCore;
 
-const cancellationToken = {
+const cancellationToken = ({
   on: jest.fn(),
-};
+} as unknown) as CancellationToken;
 
 const mockLoggerFactory = {
   get: jest.fn().mockImplementation(() => ({
@@ -28,12 +31,16 @@ const mockLoggerFactory = {
 };
 const getMockLogger = () => new LevelLogger(mockLoggerFactory);
 
+const captureConfig = {} as CaptureConfig;
+
 const mockEncryptionKey = 'abcabcsecuresecret';
-const encryptHeaders = async headers => {
+const encryptHeaders = async (headers: Record<string, string>) => {
   const crypto = cryptoFactory(mockEncryptionKey);
   return await crypto.encrypt(headers);
 };
 
+const getJobDocPayload = (baseObj: any) => baseObj as JobDocPayloadPNG;
+
 beforeEach(async () => {
   const kbnConfig = {
     'server.basePath': '/sbp',
@@ -45,8 +52,8 @@ beforeEach(async () => {
     'kibanaServer.protocol': 'http',
   };
   const mockReportingConfig = {
-    get: (...keys) => reportingConfig[keys.join('.')],
-    kbnConfig: { get: (...keys) => kbnConfig[keys.join('.')] },
+    get: (...keys: string[]) => (reportingConfig as any)[keys.join('.')],
+    kbnConfig: { get: (...keys: string[]) => (kbnConfig as any)[keys.join('.')] },
   };
 
   mockReporting = await createMockReportingCore(mockReportingConfig);
@@ -60,22 +67,30 @@ beforeEach(async () => {
   mockGetElasticsearch.mockImplementation(() => Promise.resolve(mockElasticsearch));
   mockReporting.getElasticsearchService = mockGetElasticsearch;
 
-  generatePngObservableFactory.mockReturnValue(jest.fn());
+  (generatePngObservableFactory as jest.Mock).mockReturnValue(jest.fn());
 });
 
-afterEach(() => generatePngObservableFactory.mockReset());
+afterEach(() => (generatePngObservableFactory as jest.Mock).mockReset());
 
 test(`passes browserTimezone to generatePng`, async () => {
   const encryptedHeaders = await encryptHeaders({});
+  const mockBrowserDriverFactory = await createMockBrowserDriverFactory(getMockLogger());
 
-  const generatePngObservable = generatePngObservableFactory();
-  generatePngObservable.mockReturnValue(Rx.of(Buffer.from('')));
+  const generatePngObservable = generatePngObservableFactory(
+    captureConfig,
+    mockBrowserDriverFactory
+  );
+  (generatePngObservable as jest.Mock).mockReturnValue(Rx.of(Buffer.from('')));
 
   const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const browserTimezone = 'UTC';
   await executeJob(
     'pngJobId',
-    { relativeUrl: '/app/kibana#/something', browserTimezone, headers: encryptedHeaders },
+    getJobDocPayload({
+      relativeUrl: '/app/kibana#/something',
+      browserTimezone,
+      headers: encryptedHeaders,
+    }),
     cancellationToken
   );
 
@@ -92,12 +107,17 @@ test(`returns content_type of application/png`, async () => {
   const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const encryptedHeaders = await encryptHeaders({});
 
-  const generatePngObservable = generatePngObservableFactory();
-  generatePngObservable.mockReturnValue(Rx.of(Buffer.from('')));
+  const mockBrowserDriverFactory = await createMockBrowserDriverFactory(getMockLogger());
+
+  const generatePngObservable = generatePngObservableFactory(
+    captureConfig,
+    mockBrowserDriverFactory
+  );
+  (generatePngObservable as jest.Mock).mockReturnValue(Rx.of(Buffer.from('')));
 
   const { content_type: contentType } = await executeJob(
     'pngJobId',
-    { relativeUrl: '/app/kibana#/something', timeRange: {}, headers: encryptedHeaders },
+    getJobDocPayload({ relativeUrl: '/app/kibana#/something', headers: encryptedHeaders }),
     cancellationToken
   );
   expect(contentType).toBe('image/png');
@@ -106,14 +126,19 @@ test(`returns content_type of application/png`, async () => {
 test(`returns content of generatePng getBuffer base64 encoded`, async () => {
   const testContent = 'test content';
 
-  const generatePngObservable = generatePngObservableFactory();
-  generatePngObservable.mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
+  const mockBrowserDriverFactory = await createMockBrowserDriverFactory(getMockLogger());
+
+  const generatePngObservable = generatePngObservableFactory(
+    captureConfig,
+    mockBrowserDriverFactory
+  );
+  (generatePngObservable as jest.Mock).mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
 
   const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pngJobId',
-    { relativeUrl: '/app/kibana#/something', timeRange: {}, headers: encryptedHeaders },
+    getJobDocPayload({ relativeUrl: '/app/kibana#/something', headers: encryptedHeaders }),
     cancellationToken
   );
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.ts
similarity index 57%
rename from x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
rename to x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.ts
index c6f07f8ad2d34..c3c0d38584bc1 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.ts
@@ -5,19 +5,24 @@
  */
 
 import * as Rx from 'rxjs';
-import { createMockReportingCore } from '../../../../test_helpers';
+import { createMockReportingCore, createMockBrowserDriverFactory } from '../../../../test_helpers';
 import { cryptoFactory } from '../../../../server/lib/crypto';
-import { executeJobFactory } from './index';
-import { generatePdfObservableFactory } from '../lib/generate_pdf';
 import { LevelLogger } from '../../../../server/lib';
+import { CancellationToken } from '../../../../types';
+import { ReportingCore, CaptureConfig } from '../../../../server/types';
+import { generatePdfObservableFactory } from '../lib/generate_pdf';
+import { JobDocPayloadPDF } from '../../types';
+import { executeJobFactory } from './index';
 
 jest.mock('../lib/generate_pdf', () => ({ generatePdfObservableFactory: jest.fn() }));
 
-let mockReporting;
+let mockReporting: ReportingCore;
 
-const cancellationToken = {
+const cancellationToken = ({
   on: jest.fn(),
-};
+} as unknown) as CancellationToken;
+
+const captureConfig = {} as CaptureConfig;
 
 const mockLoggerFactory = {
   get: jest.fn().mockImplementation(() => ({
@@ -29,11 +34,13 @@ const mockLoggerFactory = {
 const getMockLogger = () => new LevelLogger(mockLoggerFactory);
 
 const mockEncryptionKey = 'testencryptionkey';
-const encryptHeaders = async headers => {
+const encryptHeaders = async (headers: Record<string, string>) => {
   const crypto = cryptoFactory(mockEncryptionKey);
   return await crypto.encrypt(headers);
 };
 
+const getJobDocPayload = (baseObj: any) => baseObj as JobDocPayloadPDF;
+
 beforeEach(async () => {
   const kbnConfig = {
     'server.basePath': '/sbp',
@@ -45,8 +52,8 @@ beforeEach(async () => {
     'kibanaServer.protocol': 'http',
   };
   const mockReportingConfig = {
-    get: (...keys) => reportingConfig[keys.join('.')],
-    kbnConfig: { get: (...keys) => kbnConfig[keys.join('.')] },
+    get: (...keys: string[]) => (reportingConfig as any)[keys.join('.')],
+    kbnConfig: { get: (...keys: string[]) => (kbnConfig as any)[keys.join('.')] },
   };
 
   mockReporting = await createMockReportingCore(mockReportingConfig);
@@ -60,21 +67,26 @@ beforeEach(async () => {
   mockGetElasticsearch.mockImplementation(() => Promise.resolve(mockElasticsearch));
   mockReporting.getElasticsearchService = mockGetElasticsearch;
 
-  generatePdfObservableFactory.mockReturnValue(jest.fn());
+  (generatePdfObservableFactory as jest.Mock).mockReturnValue(jest.fn());
 });
 
-afterEach(() => generatePdfObservableFactory.mockReset());
+afterEach(() => (generatePdfObservableFactory as jest.Mock).mockReset());
 
 test(`returns content_type of application/pdf`, async () => {
-  const executeJob = await executeJobFactory(mockReporting, getMockLogger());
+  const logger = getMockLogger();
+  const executeJob = await executeJobFactory(mockReporting, logger);
+  const mockBrowserDriverFactory = await createMockBrowserDriverFactory(logger);
   const encryptedHeaders = await encryptHeaders({});
 
-  const generatePdfObservable = generatePdfObservableFactory();
-  generatePdfObservable.mockReturnValue(Rx.of(Buffer.from('')));
+  const generatePdfObservable = generatePdfObservableFactory(
+    captureConfig,
+    mockBrowserDriverFactory
+  );
+  (generatePdfObservable as jest.Mock).mockReturnValue(Rx.of(Buffer.from('')));
 
   const { content_type: contentType } = await executeJob(
     'pdfJobId',
-    { relativeUrls: [], timeRange: {}, headers: encryptedHeaders },
+    getJobDocPayload({ relativeUrls: [], headers: encryptedHeaders }),
     cancellationToken
   );
   expect(contentType).toBe('application/pdf');
@@ -82,15 +94,19 @@ test(`returns content_type of application/pdf`, async () => {
 
 test(`returns content of generatePdf getBuffer base64 encoded`, async () => {
   const testContent = 'test content';
+  const mockBrowserDriverFactory = await createMockBrowserDriverFactory(getMockLogger());
 
-  const generatePdfObservable = generatePdfObservableFactory();
-  generatePdfObservable.mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
+  const generatePdfObservable = generatePdfObservableFactory(
+    captureConfig,
+    mockBrowserDriverFactory
+  );
+  (generatePdfObservable as jest.Mock).mockReturnValue(Rx.of({ buffer: Buffer.from(testContent) }));
 
   const executeJob = await executeJobFactory(mockReporting, getMockLogger());
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pdfJobId',
-    { relativeUrls: [], timeRange: {}, headers: encryptedHeaders },
+    getJobDocPayload({ relativeUrls: [], headers: encryptedHeaders }),
     cancellationToken
   );
 
diff --git a/x-pack/legacy/plugins/reporting/index.test.js b/x-pack/legacy/plugins/reporting/index.test.ts
similarity index 94%
rename from x-pack/legacy/plugins/reporting/index.test.js
rename to x-pack/legacy/plugins/reporting/index.test.ts
index 0d9a717bd7d81..8148adab67874 100644
--- a/x-pack/legacy/plugins/reporting/index.test.js
+++ b/x-pack/legacy/plugins/reporting/index.test.ts
@@ -27,7 +27,7 @@ const describeWithContext = describe.each([
 describeWithContext('config schema with context %j', context => {
   it('produces correct config', async () => {
     const schema = await getConfigSchema(reporting);
-    const value = await schema.validate({}, { context });
+    const value: any = await schema.validate({}, { context });
     value.capture.browser.chromium.disableSandbox = '<platform dependent>';
     await expect(value).toMatchSnapshot();
   });
diff --git a/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js b/x-pack/legacy/plugins/reporting/server/routes/jobs.test.ts
similarity index 91%
rename from x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
rename to x-pack/legacy/plugins/reporting/server/routes/jobs.test.ts
index 9f0de844df369..5c58a7dfa0110 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/jobs.test.js
+++ b/x-pack/legacy/plugins/reporting/server/routes/jobs.test.ts
@@ -6,7 +6,10 @@
 
 import Hapi from 'hapi';
 import { createMockReportingCore } from '../../test_helpers';
+import { ExportTypeDefinition } from '../../types';
 import { ExportTypesRegistry } from '../lib/export_types_registry';
+import { LevelLogger } from '../lib/level_logger';
+import { ReportingConfig, ReportingCore, ReportingSetupDeps } from '../types';
 
 jest.mock('./lib/authorized_user_pre_routing', () => ({
   authorizedUserPreRoutingFactory: () => () => ({}),
@@ -19,14 +22,14 @@ jest.mock('./lib/reporting_feature_pre_routing', () => ({
 
 import { registerJobInfoRoutes } from './jobs';
 
-let mockServer;
-let exportTypesRegistry;
-let mockReportingPlugin;
-let mockReportingConfig;
-const mockLogger = {
+let mockServer: any;
+let exportTypesRegistry: ExportTypesRegistry;
+let mockReportingPlugin: ReportingCore;
+let mockReportingConfig: ReportingConfig;
+const mockLogger = ({
   error: jest.fn(),
   debug: jest.fn(),
-};
+} as unknown) as LevelLogger;
 
 beforeEach(async () => {
   mockServer = new Hapi.Server({ debug: false, port: 8080, routes: { log: { collect: true } } });
@@ -35,38 +38,39 @@ beforeEach(async () => {
     id: 'unencoded',
     jobType: 'unencodedJobType',
     jobContentExtension: 'csv',
-  });
+  } as ExportTypeDefinition<unknown, unknown, unknown, unknown>);
   exportTypesRegistry.register({
     id: 'base64Encoded',
     jobType: 'base64EncodedJobType',
     jobContentEncoding: 'base64',
     jobContentExtension: 'pdf',
-  });
+  } as ExportTypeDefinition<unknown, unknown, unknown, unknown>);
 
   mockReportingConfig = { get: jest.fn(), kbnConfig: { get: jest.fn() } };
   mockReportingPlugin = await createMockReportingCore(mockReportingConfig);
   mockReportingPlugin.getExportTypesRegistry = () => exportTypesRegistry;
 });
 
-const mockPlugins = {
+const mockPlugins = ({
   elasticsearch: {
     adminClient: { callAsInternalUser: jest.fn() },
   },
   security: null,
-};
+} as unknown) as ReportingSetupDeps;
 
-const getHits = (...sources) => {
+const getHits = (...sources: any) => {
   return {
     hits: {
-      hits: sources.map(source => ({ _source: source })),
+      hits: sources.map((source: object) => ({ _source: source })),
     },
   };
 };
 
-const getErrorsFromRequest = request =>
-  request.logs.filter(log => log.tags.includes('error')).map(log => log.error);
+const getErrorsFromRequest = (request: any) =>
+  request.logs.filter((log: any) => log.tags.includes('error')).map((log: any) => log.error);
 
 test(`returns 404 if job not found`, async () => {
+  // @ts-ignore
   mockPlugins.elasticsearch.adminClient = {
     callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(getHits())),
   };
@@ -84,6 +88,7 @@ test(`returns 404 if job not found`, async () => {
 });
 
 test(`returns 401 if not valid job type`, async () => {
+  // @ts-ignore
   mockPlugins.elasticsearch.adminClient = {
     callAsInternalUser: jest
       .fn()
@@ -103,6 +108,7 @@ test(`returns 401 if not valid job type`, async () => {
 
 describe(`when job is incomplete`, () => {
   const getIncompleteResponse = async () => {
+    // @ts-ignore
     mockPlugins.elasticsearch.adminClient = {
       callAsInternalUser: jest
         .fn()
@@ -149,6 +155,7 @@ describe(`when job is failed`, () => {
       status: 'failed',
       output: { content: 'job failure message' },
     });
+    // @ts-ignore
     mockPlugins.elasticsearch.adminClient = {
       callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(hits)),
     };
@@ -194,6 +201,7 @@ describe(`when job is completed`, () => {
         title,
       },
     });
+    // @ts-ignore
     mockPlugins.elasticsearch.adminClient = {
       callAsInternalUser: jest.fn().mockReturnValue(Promise.resolve(hits)),
     };
diff --git a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.ts
similarity index 90%
rename from x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js
rename to x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.ts
index 929109e66914d..dbc674ce36ec8 100644
--- a/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js
+++ b/x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.ts
@@ -11,18 +11,21 @@ import {
   registerReportingUsageCollector,
   getReportingUsageCollector,
 } from './reporting_usage_collector';
+import { ReportingConfig } from '../types';
 
 const exportTypesRegistry = getExportTypesRegistry();
 
 function getMockUsageCollection() {
   class MockUsageCollector {
-    constructor(_server, { fetch }) {
+    // @ts-ignore fetch is not used
+    private fetch: any;
+    constructor(_server: any, { fetch }: any) {
       this.fetch = fetch;
     }
   }
   return {
-    makeUsageCollector: options => {
-      return new MockUsageCollector(this, options);
+    makeUsageCollector: (options: any) => {
+      return new MockUsageCollector(null, options);
     },
     registerCollector: sinon.stub(),
   };
@@ -51,7 +54,7 @@ function getPluginsMock(
         xpack_main: mockXpackMain,
       },
     },
-  };
+  } as any;
 }
 
 const getMockReportingConfig = () => ({
@@ -61,13 +64,13 @@ const getMockReportingConfig = () => ({
 const getResponseMock = (customization = {}) => customization;
 
 describe('license checks', () => {
-  let mockConfig;
+  let mockConfig: ReportingConfig;
   beforeAll(async () => {
     mockConfig = getMockReportingConfig();
   });
 
   describe('with a basic license', () => {
-    let usageStats;
+    let usageStats: any;
     beforeAll(async () => {
       const plugins = getPluginsMock({ license: 'basic' });
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
@@ -75,9 +78,12 @@ describe('license checks', () => {
         mockConfig,
         plugins.usageCollection,
         plugins.__LEGACY.plugins.xpack_main.info,
-        exportTypesRegistry
+        exportTypesRegistry,
+        function isReady() {
+          return Promise.resolve(true);
+        }
       );
-      usageStats = await fetch(callClusterMock, exportTypesRegistry);
+      usageStats = await fetch(callClusterMock as any);
     });
 
     test('sets enables to true', async () => {
@@ -94,7 +100,7 @@ describe('license checks', () => {
   });
 
   describe('with no license', () => {
-    let usageStats;
+    let usageStats: any;
     beforeAll(async () => {
       const plugins = getPluginsMock({ license: 'none' });
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
@@ -102,9 +108,12 @@ describe('license checks', () => {
         mockConfig,
         plugins.usageCollection,
         plugins.__LEGACY.plugins.xpack_main.info,
-        exportTypesRegistry
+        exportTypesRegistry,
+        function isReady() {
+          return Promise.resolve(true);
+        }
       );
-      usageStats = await fetch(callClusterMock, exportTypesRegistry);
+      usageStats = await fetch(callClusterMock as any);
     });
 
     test('sets enables to true', async () => {
@@ -121,7 +130,7 @@ describe('license checks', () => {
   });
 
   describe('with platinum license', () => {
-    let usageStats;
+    let usageStats: any;
     beforeAll(async () => {
       const plugins = getPluginsMock({ license: 'platinum' });
       const callClusterMock = jest.fn(() => Promise.resolve(getResponseMock()));
@@ -129,9 +138,12 @@ describe('license checks', () => {
         mockConfig,
         plugins.usageCollection,
         plugins.__LEGACY.plugins.xpack_main.info,
-        exportTypesRegistry
+        exportTypesRegistry,
+        function isReady() {
+          return Promise.resolve(true);
+        }
       );
-      usageStats = await fetch(callClusterMock, exportTypesRegistry);
+      usageStats = await fetch(callClusterMock as any);
     });
 
     test('sets enables to true', async () => {
@@ -148,7 +160,7 @@ describe('license checks', () => {
   });
 
   describe('with no usage data', () => {
-    let usageStats;
+    let usageStats: any;
     beforeAll(async () => {
       const plugins = getPluginsMock({ license: 'basic' });
       const callClusterMock = jest.fn(() => Promise.resolve({}));
@@ -156,9 +168,12 @@ describe('license checks', () => {
         mockConfig,
         plugins.usageCollection,
         plugins.__LEGACY.plugins.xpack_main.info,
-        exportTypesRegistry
+        exportTypesRegistry,
+        function isReady() {
+          return Promise.resolve(true);
+        }
       );
-      usageStats = await fetch(callClusterMock, exportTypesRegistry);
+      usageStats = await fetch(callClusterMock as any);
     });
 
     test('sets enables to true', async () => {
@@ -179,7 +194,10 @@ describe('data modeling', () => {
       mockConfig,
       plugins.usageCollection,
       plugins.__LEGACY.plugins.xpack_main.info,
-      exportTypesRegistry
+      exportTypesRegistry,
+      function isReady() {
+        return Promise.resolve(true);
+      }
     );
     const callClusterMock = jest.fn(() =>
       Promise.resolve(
@@ -303,7 +321,7 @@ describe('data modeling', () => {
       )
     );
 
-    const usageStats = await fetch(callClusterMock);
+    const usageStats = await fetch(callClusterMock as any);
     expect(usageStats).toMatchInlineSnapshot(`
       Object {
         "PNG": Object {
@@ -406,7 +424,7 @@ describe('Ready for collection observable', () => {
     const makeCollectorSpy = sinon.spy();
     usageCollection.makeUsageCollector = makeCollectorSpy;
 
-    const plugins = getPluginsMock({ usageCollection });
+    const plugins = getPluginsMock({ usageCollection } as any);
     registerReportingUsageCollector(mockReporting, plugins);
 
     const [args] = makeCollectorSpy.firstCall.args;
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
index 930aa7601b8cb..6e95bed2ecf92 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_browserdriverfactory.ts
@@ -92,7 +92,7 @@ const defaultOpts: CreateMockBrowserDriverFactoryOpts = {
 
 export const createMockBrowserDriverFactory = async (
   logger: Logger,
-  opts: Partial<CreateMockBrowserDriverFactoryOpts>
+  opts: Partial<CreateMockBrowserDriverFactoryOpts> = {}
 ): Promise<HeadlessChromiumDriverFactory> => {
   const captureConfig = {
     timeouts: { openUrl: 30000, waitForElements: 30000, renderComplete: 30000 },
diff --git a/x-pack/legacy/plugins/reporting/types.d.ts b/x-pack/legacy/plugins/reporting/types.d.ts
index 7334a859005e0..eec7da7dc6733 100644
--- a/x-pack/legacy/plugins/reporting/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/types.d.ts
@@ -186,7 +186,7 @@ export type ESQueueWorkerExecuteFn<JobDocPayloadType> = (
   jobId: string,
   job: JobDocPayloadType,
   cancellationToken?: CancellationToken
-) => void;
+) => Promise<any>;
 
 /*
  * ImmediateExecuteFn receives the job doc payload because the payload was

From d8a295dcbc272cfb7479169e2f99c4665c811816 Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Fri, 10 Apr 2020 14:00:11 -0500
Subject: [PATCH 21/36] [SIEM] Link ML Rule card CTA to license_management
 (#63210)

* Link ML Rule card CTA to license_management

Taking the user directly to the license management page within kibana
(where they could immediately start a trial subscription) is much more
actionable than taking them to the subscriptions marketing page.

* Revert translation key change

Neither of these is totally accurate, and there've already been
translations written for the old one.
---
 .../components/select_rule_type/index.tsx      | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
index 9d3b37f1788fa..6f3d299da8d45 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx
@@ -19,9 +19,16 @@ import {
 import { isMlRule } from '../../../../../../common/detection_engine/ml_helpers';
 import { RuleType } from '../../../../../../common/detection_engine/types';
 import { FieldHook } from '../../../../../shared_imports';
+import { useKibana } from '../../../../../lib/kibana';
 import * as i18n from './translations';
 
-const MlCardDescription = ({ hasValidLicense = false }: { hasValidLicense?: boolean }) => (
+const MlCardDescription = ({
+  subscriptionUrl,
+  hasValidLicense = false,
+}: {
+  subscriptionUrl: string;
+  hasValidLicense?: boolean;
+}) => (
   <EuiText size="s">
     {hasValidLicense ? (
       i18n.ML_TYPE_DESCRIPTION
@@ -31,7 +38,7 @@ const MlCardDescription = ({ hasValidLicense = false }: { hasValidLicense?: bool
         defaultMessage="Access to ML requires a {subscriptionsLink}."
         values={{
           subscriptionsLink: (
-            <EuiLink href="https://www.elastic.co/subscriptions" target="_blank">
+            <EuiLink href={subscriptionUrl} target="_blank">
               <FormattedMessage
                 id="xpack.siem.components.stepDefineRule.ruleTypeField.subscriptionsLink"
                 defaultMessage="Platinum subscription"
@@ -69,6 +76,9 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
   const setMl = useCallback(() => setType('machine_learning'), [setType]);
   const setQuery = useCallback(() => setType('query'), [setType]);
   const mlCardDisabled = isReadOnly || !hasValidLicense || !isMlAdmin;
+  const licensingUrl = useKibana().services.application.getUrlForApp('kibana', {
+    path: '#/management/elasticsearch/license_management',
+  });
 
   return (
     <EuiFormRow
@@ -95,7 +105,9 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
           <EuiCard
             data-test-subj="machineLearningRuleType"
             title={i18n.ML_TYPE_TITLE}
-            description={<MlCardDescription hasValidLicense={hasValidLicense} />}
+            description={
+              <MlCardDescription subscriptionUrl={licensingUrl} hasValidLicense={hasValidLicense} />
+            }
             icon={<EuiIcon size="l" type="machineLearningApp" />}
             isDisabled={mlCardDisabled}
             selectable={{

From 8a283de3c5884e21c245b1136f39132eeb2d976f Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Fri, 10 Apr 2020 12:05:20 -0700
Subject: [PATCH 22/36] Correctly type ILM's optional dependencies as optional
 (#63255)

And guard against their absence.
---
 .../public/application/services/ui_metric.ts              | 8 +++++---
 x-pack/plugins/index_lifecycle_management/public/types.ts | 2 +-
 .../plugins/index_lifecycle_management/server/plugin.ts   | 2 +-
 x-pack/plugins/index_lifecycle_management/server/types.ts | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
index ca6c0b44d5804..ca987441c7ce9 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
@@ -23,10 +23,12 @@ import {
 
 import { defaultColdPhase, defaultWarmPhase, defaultHotPhase } from '../store/defaults';
 
-export let trackUiMetric: (metricType: UiStatsMetricType, eventName: string) => void;
+export let trackUiMetric = (metricType: UiStatsMetricType, eventName: string) => {};
 
-export function init(usageCollection: UsageCollectionSetup): void {
-  trackUiMetric = usageCollection.reportUiStats.bind(usageCollection, UIM_APP_NAME);
+export function init(usageCollection?: UsageCollectionSetup): void {
+  if (usageCollection) {
+    trackUiMetric = usageCollection.reportUiStats.bind(usageCollection, UIM_APP_NAME);
+  }
 }
 
 export function getUiMetricsForPhases(phases: any): any {
diff --git a/x-pack/plugins/index_lifecycle_management/public/types.ts b/x-pack/plugins/index_lifecycle_management/public/types.ts
index f9e0abae56cb4..178884a7ee679 100644
--- a/x-pack/plugins/index_lifecycle_management/public/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/types.ts
@@ -9,7 +9,7 @@ import { ManagementSetup } from '../../../../src/plugins/management/public';
 import { IndexManagementPluginSetup } from '../../index_management/public';
 
 export interface PluginsDependencies {
-  usageCollection: UsageCollectionSetup;
+  usageCollection?: UsageCollectionSetup;
   management: ManagementSetup;
   indexManagement?: IndexManagementPluginSetup;
 }
diff --git a/x-pack/plugins/index_lifecycle_management/server/plugin.ts b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
index 48c50f9a48ee5..faeac67f62a21 100644
--- a/x-pack/plugins/index_lifecycle_management/server/plugin.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
@@ -75,7 +75,7 @@ export class IndexLifecycleManagementServerPlugin implements Plugin<void, void,
     });
 
     if (config.ui.enabled) {
-      if (indexManagement.indexDataEnricher) {
+      if (indexManagement && indexManagement.indexDataEnricher) {
         indexManagement.indexDataEnricher.add(indexLifecycleDataEnricher);
       }
     }
diff --git a/x-pack/plugins/index_lifecycle_management/server/types.ts b/x-pack/plugins/index_lifecycle_management/server/types.ts
index 7f64c1a47197a..734d05a82000e 100644
--- a/x-pack/plugins/index_lifecycle_management/server/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/types.ts
@@ -14,7 +14,7 @@ import { isEsError } from './lib/is_es_error';
 
 export interface Dependencies {
   licensing: LicensingPluginSetup;
-  indexManagement: IndexManagementPluginSetup;
+  indexManagement?: IndexManagementPluginSetup;
 }
 
 export interface RouteDependencies {

From ed5dd0a32542f9f24656dd3aa9c642362d40801b Mon Sep 17 00:00:00 2001
From: Ahmad Bamieh <ahmadbamieh@gmail.com>
Date: Fri, 10 Apr 2020 22:18:11 +0300
Subject: [PATCH 23/36] [Telemetry] use prod keys (#63263)

---
 package.json                                  |  2 +-
 .../server/encryption/encrypt.test.mocks.ts   | 27 +++++++++++++++++++
 .../server/encryption/encrypt.test.ts         | 27 ++++++++++++-------
 .../server/encryption/encrypt.ts              |  2 +-
 .../server/plugin.ts                          |  5 ++--
 yarn.lock                                     |  8 +++---
 6 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.mocks.ts

diff --git a/package.json b/package.json
index ec72d5b660345..a5d46e7f2bf40 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.4.0",
-    "@elastic/request-crypto": "1.1.2",
+    "@elastic/request-crypto": "1.1.4",
     "@elastic/ui-ace": "0.2.3",
     "@hapi/good-squeeze": "5.2.1",
     "@hapi/wreck": "^15.0.2",
diff --git a/src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.mocks.ts b/src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.mocks.ts
new file mode 100644
index 0000000000000..9a7cb8ba28d04
--- /dev/null
+++ b/src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.mocks.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const mockEncrypt = jest.fn();
+export const createRequestEncryptor = jest.fn().mockResolvedValue({
+  encrypt: mockEncrypt,
+});
+
+jest.doMock('@elastic/request-crypto', () => ({
+  createRequestEncryptor,
+}));
diff --git a/src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.ts b/src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.ts
index 4a4ba7aa1f321..c04625eb1dd42 100644
--- a/src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.ts
+++ b/src/plugins/telemetry_collection_manager/server/encryption/encrypt.test.ts
@@ -16,16 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import { createRequestEncryptor, mockEncrypt } from './encrypt.test.mocks';
 import { telemetryJWKS } from './telemetry_jwks';
 import { encryptTelemetry, getKID } from './encrypt';
-import { createRequestEncryptor } from '@elastic/request-crypto';
-
-jest.mock('@elastic/request-crypto', () => ({
-  createRequestEncryptor: jest.fn().mockResolvedValue({
-    encrypt: jest.fn(),
-  }),
-}));
 
 describe('getKID', () => {
   it(`returns 'kibana_dev' kid for development`, async () => {
@@ -42,9 +35,25 @@ describe('getKID', () => {
 });
 
 describe('encryptTelemetry', () => {
+  afterEach(() => {
+    mockEncrypt.mockReset();
+  });
+
   it('encrypts payload', async () => {
     const payload = { some: 'value' };
-    await encryptTelemetry(payload, true);
+    await encryptTelemetry(payload, { isProd: true });
     expect(createRequestEncryptor).toBeCalledWith(telemetryJWKS);
   });
+
+  it('uses kibana kid on { isProd: true }', async () => {
+    const payload = { some: 'value' };
+    await encryptTelemetry(payload, { isProd: true });
+    expect(mockEncrypt).toBeCalledWith('kibana', payload);
+  });
+
+  it('uses kibana_dev kid on { isProd: false }', async () => {
+    const payload = { some: 'value' };
+    await encryptTelemetry(payload, { isProd: false });
+    expect(mockEncrypt).toBeCalledWith('kibana_dev', payload);
+  });
 });
diff --git a/src/plugins/telemetry_collection_manager/server/encryption/encrypt.ts b/src/plugins/telemetry_collection_manager/server/encryption/encrypt.ts
index c20f4b768b7dc..44f053064cfcb 100644
--- a/src/plugins/telemetry_collection_manager/server/encryption/encrypt.ts
+++ b/src/plugins/telemetry_collection_manager/server/encryption/encrypt.ts
@@ -24,7 +24,7 @@ export function getKID(isProd = false): string {
   return isProd ? 'kibana' : 'kibana_dev';
 }
 
-export async function encryptTelemetry(payload: any, isProd = false): Promise<string[]> {
+export async function encryptTelemetry(payload: any, { isProd = false } = {}): Promise<string[]> {
   const kid = getKID(isProd);
   const encryptor = await createRequestEncryptor(telemetryJWKS);
   const clusters = [].concat(payload);
diff --git a/src/plugins/telemetry_collection_manager/server/plugin.ts b/src/plugins/telemetry_collection_manager/server/plugin.ts
index 7e8dff9e0aec1..f2f20e215c535 100644
--- a/src/plugins/telemetry_collection_manager/server/plugin.ts
+++ b/src/plugins/telemetry_collection_manager/server/plugin.ts
@@ -158,7 +158,7 @@ export class TelemetryCollectionManagerPlugin
           if (config.unencrypted) {
             return optInStats;
           }
-          return encryptTelemetry(optInStats, this.isDev);
+          return encryptTelemetry(optInStats, { isProd: !this.isDev });
         }
       } catch (err) {
         this.logger.debug(`Failed to collect any opt in stats with registered collections.`);
@@ -205,7 +205,8 @@ export class TelemetryCollectionManagerPlugin
           if (config.unencrypted) {
             return usageData;
           }
-          return encryptTelemetry(usageData, this.isDev);
+
+          return encryptTelemetry(usageData, { isProd: !this.isDev });
         }
       } catch (err) {
         this.logger.debug(
diff --git a/yarn.lock b/yarn.lock
index 11abd95498c8d..42f891aa24e25 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1401,10 +1401,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/numeral/-/numeral-2.4.0.tgz#883197b7f4bf3c2dd994f53b274769ddfa2bf79a"
   integrity sha512-uGBKGCNghTgUZPHClji/00v+AKt5nidPTGOIbcT+lbTPVxNB6QPpPLGWtXyrg3QZAxobPM/LAZB1mAqtJeq44Q==
 
-"@elastic/request-crypto@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@elastic/request-crypto/-/request-crypto-1.1.2.tgz#2e323550f546f6286994126d462a9ea480a3bfb1"
-  integrity sha512-i73wjj1Qi8dGJIy170Z8xyJ760mFNjTbdmcp/nEczqWD0miNW6I5wZ5MNrv7M6CXn2m1wMXiT6qzDYd93Hv1Dw==
+"@elastic/request-crypto@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@elastic/request-crypto/-/request-crypto-1.1.4.tgz#2189d5fea65f7afe1de9f5fa3d0dd420e93e3124"
+  integrity sha512-D5CzSGKkM6BdrVB/HRRTheMsNQOcd2FMUup0O/1hIGUBE8zHh2AYbmSNSpD6LyQAgY39mGkARUi/x+SO0ccVvg==
   dependencies:
     "@elastic/node-crypto" "1.1.1"
     "@types/node-jose" "1.1.0"

From eb3fe8eb50be7876128bc592f9ce913259be3ee4 Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko <dzmitry.lemechko@elastic.co>
Date: Fri, 10 Apr 2020 23:05:20 +0300
Subject: [PATCH 24/36] update chromedriver dependency to 81.0.0 (#63266)

---
 package.json |  2 +-
 yarn.lock    | 38 ++++++++++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index a5d46e7f2bf40..2bad3116c9ef2 100644
--- a/package.json
+++ b/package.json
@@ -401,7 +401,7 @@
     "chai": "3.5.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",
-    "chromedriver": "^80.0.1",
+    "chromedriver": "^81.0.0",
     "classnames": "2.2.6",
     "dedent": "^0.7.0",
     "delete-empty": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 42f891aa24e25..8ca25cc18a8a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5061,6 +5061,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yauzl@^2.9.1":
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af"
+  integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/zen-observable@^0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
@@ -8723,16 +8730,16 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-chromedriver@^80.0.1:
-  version "80.0.1"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-80.0.1.tgz#35c1642e2d864b9e8262f291003e455b0e422917"
-  integrity sha512-VfRtZUpBUIjeypS+xM40+VD9g4Drv7L2VibG/4+0zX3mMx4KayN6gfKETycPfO6JwQXTLSxEr58fRcrsa8r5xQ==
+chromedriver@^81.0.0:
+  version "81.0.0"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-81.0.0.tgz#690ba333aedf2b4c4933b6590c3242d3e5f28f3c"
+  integrity sha512-BA++IQ7O1FzHmNpzMlOfLiSBvPZ946uuhtJjZHEIr/Gb+Ha9jiuGbHiT45l6O3XGbQ8BAwvbmdisjl4rTxro4A==
   dependencies:
     "@testim/chrome-version" "^1.0.7"
     axios "^0.19.2"
     del "^5.1.0"
-    extract-zip "^1.6.7"
-    mkdirp "^1.0.3"
+    extract-zip "^2.0.0"
+    mkdirp "^1.0.4"
     tcp-port-used "^1.0.1"
 
 ci-info@^1.0.0:
@@ -13161,6 +13168,17 @@ extract-zip@^1.6.6, extract-zip@^1.6.7, extract-zip@^1.7.0:
     mkdirp "^0.5.4"
     yauzl "^2.10.0"
 
+extract-zip@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz#f53b71d44f4ff5a4527a2259ade000fb8b303492"
+  integrity sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg==
+  dependencies:
+    debug "^4.1.1"
+    get-stream "^5.1.0"
+    yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -20622,10 +20640,10 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkd
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
-  integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 mocha-junit-reporter@^1.23.1:
   version "1.23.1"

From 6393e08ce3ba7cee6f138f2dac6db3a37f6953dc Mon Sep 17 00:00:00 2001
From: Candace Park <56409205+parkiino@users.noreply.github.com>
Date: Fri, 10 Apr 2020 17:20:40 -0400
Subject: [PATCH 25/36] task/mac-eventing-form (#62999)

adds mac events form for endpoint policy details
Co-authored-by: oatkiller <robert.austin@elastic.co>
---
 .../applications/endpoint/models/policy.ts    |   4 +
 .../endpoint/models/policy_details_config.ts  |  30 +++++
 .../store/policy_details/index.test.ts        |  31 ++++-
 .../endpoint/store/policy_details/reducer.ts  |  12 +-
 .../store/policy_details/selectors.ts         |  30 +++--
 .../public/applications/endpoint/types.ts     |  70 ++++++------
 .../endpoint/view/policy/policy_details.tsx   |   6 +-
 .../policy/policy_forms/eventing/checkbox.tsx |  53 ---------
 .../policy/policy_forms/events/checkbox.tsx   |  49 ++++++++
 .../view/policy/policy_forms/events/index.tsx |   8 ++
 .../view/policy/policy_forms/events/mac.tsx   | 106 ++++++++++++++++++
 .../{eventing => events}/windows.tsx          |  59 +++++-----
 12 files changed, 325 insertions(+), 133 deletions(-)
 delete mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/checkbox.tsx
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/checkbox.tsx
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/index.tsx
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/mac.tsx
 rename x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/{eventing => events}/windows.tsx (61%)

diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/models/policy.ts b/x-pack/plugins/endpoint/public/applications/endpoint/models/policy.ts
index 9ac53f9be609f..30f45e54c2005 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/models/policy.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/models/policy.ts
@@ -42,6 +42,8 @@ export const generatePolicy = (): PolicyConfig => {
     mac: {
       events: {
         process: true,
+        file: true,
+        network: true,
       },
       malware: {
         mode: ProtectionModes.detect,
@@ -67,6 +69,8 @@ export const generatePolicy = (): PolicyConfig => {
     linux: {
       events: {
         process: true,
+        file: true,
+        network: true,
       },
       logging: {
         stdout: 'debug',
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/models/policy_details_config.ts b/x-pack/plugins/endpoint/public/applications/endpoint/models/policy_details_config.ts
index 1145d1d19242a..bf96942e83a91 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/models/policy_details_config.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/models/policy_details_config.ts
@@ -43,3 +43,33 @@ export function clone(policyDetailsConfig: UIPolicyConfig): UIPolicyConfig {
    */
   return clonedConfig as UIPolicyConfig;
 }
+
+/**
+ * Returns value from `configuration`
+ */
+export const getIn = (a: UIPolicyConfig) => <Key extends keyof UIPolicyConfig>(key: Key) => <
+  subKey extends keyof UIPolicyConfig[Key]
+>(
+  subKey: subKey
+) => <LeafKey extends keyof UIPolicyConfig[Key][subKey]>(
+  leafKey: LeafKey
+): UIPolicyConfig[Key][subKey][LeafKey] => {
+  return a[key][subKey][leafKey];
+};
+
+/**
+ * Returns cloned `configuration` with `value` set by the `keyPath`.
+ */
+export const setIn = (a: UIPolicyConfig) => <Key extends keyof UIPolicyConfig>(key: Key) => <
+  subKey extends keyof UIPolicyConfig[Key]
+>(
+  subKey: subKey
+) => <LeafKey extends keyof UIPolicyConfig[Key][subKey]>(leafKey: LeafKey) => <
+  V extends UIPolicyConfig[Key][subKey][LeafKey]
+>(
+  v: V
+): UIPolicyConfig => {
+  const c = clone(a);
+  c[key][subKey][leafKey] = v;
+  return c;
+};
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
index cf14092953227..e09a62b235e35 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
@@ -7,7 +7,7 @@
 import { PolicyDetailsState } from '../../types';
 import { createStore, Dispatch, Store } from 'redux';
 import { policyDetailsReducer, PolicyDetailsAction } from './index';
-import { policyConfig, windowsEventing } from './selectors';
+import { policyConfig } from './selectors';
 import { clone } from '../../models/policy_details_config';
 import { generatePolicy } from '../../models/policy';
 
@@ -55,7 +55,7 @@ describe('policy details: ', () => {
     });
   });
 
-  describe('when the user has enabled windows process eventing', () => {
+  describe('when the user has enabled windows process events', () => {
     beforeEach(() => {
       const config = policyConfig(getState());
       if (!config) {
@@ -71,8 +71,31 @@ describe('policy details: ', () => {
       });
     });
 
-    it('windows process eventing is enabled', async () => {
-      expect(windowsEventing(getState())!.process).toEqual(true);
+    it('windows process events is enabled', () => {
+      const config = policyConfig(getState());
+      expect(config!.windows.events.process).toEqual(true);
+    });
+  });
+
+  describe('when the user has enabled mac file events', () => {
+    beforeEach(() => {
+      const config = policyConfig(getState());
+      if (!config) {
+        throw new Error();
+      }
+
+      const newPayload1 = clone(config);
+      newPayload1.mac.events.file = true;
+
+      dispatch({
+        type: 'userChangedPolicyConfig',
+        payload: { policyConfig: newPayload1 },
+      });
+    });
+
+    it('mac file events is enabled', () => {
+      const config = policyConfig(getState());
+      expect(config!.mac.events.file).toEqual(true);
     });
   });
 });
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/reducer.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/reducer.ts
index fb3e26157ef32..fb0f371cdae0d 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/reducer.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/reducer.ts
@@ -5,7 +5,7 @@
  */
 
 import { Reducer } from 'redux';
-import { PolicyData, PolicyDetailsState, UIPolicyConfig } from '../../types';
+import { PolicyDetailsState, UIPolicyConfig } from '../../types';
 import { AppAction } from '../action';
 import { fullPolicy, isOnPolicyDetailsPage } from './selectors';
 
@@ -89,10 +89,12 @@ export const policyDetailsReducer: Reducer<PolicyDetailsState, AppAction> = (
   }
 
   if (action.type === 'userChangedPolicyConfig') {
-    const newState = { ...state, policyItem: { ...(state.policyItem as PolicyData) } };
-    const newPolicy = (newState.policyItem.inputs[0].config.policy.value = {
-      ...fullPolicy(state),
-    });
+    if (!state.policyItem) {
+      return state;
+    }
+    const newState = { ...state, policyItem: { ...state.policyItem } };
+    const newPolicy: any = { ...fullPolicy(state) };
+    newState.policyItem.inputs[0].config.policy.value = newPolicy;
 
     Object.entries(action.payload.policyConfig).forEach(([section, newSettings]) => {
       newPolicy[section as keyof UIPolicyConfig] = {
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
index 0d505931c9ec5..4b4dc9d9bee43 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
@@ -79,14 +79,8 @@ export const policyConfig: (s: PolicyDetailsState) => UIPolicyConfig = createSel
   }
 );
 
-/** Returns an object of all the windows eventing configuration */
-export const windowsEventing = (state: PolicyDetailsState) => {
-  const config = policyConfig(state);
-  return config && config.windows.events;
-};
-
 /** Returns the total number of possible windows eventing configurations */
-export const totalWindowsEventing = (state: PolicyDetailsState): number => {
+export const totalWindowsEvents = (state: PolicyDetailsState): number => {
   const config = policyConfig(state);
   if (config) {
     return Object.keys(config.windows.events).length;
@@ -95,7 +89,7 @@ export const totalWindowsEventing = (state: PolicyDetailsState): number => {
 };
 
 /** Returns the number of selected windows eventing configurations */
-export const selectedWindowsEventing = (state: PolicyDetailsState): number => {
+export const selectedWindowsEvents = (state: PolicyDetailsState): number => {
   const config = policyConfig(state);
   if (config) {
     return Object.values(config.windows.events).reduce((count, event) => {
@@ -105,6 +99,26 @@ export const selectedWindowsEventing = (state: PolicyDetailsState): number => {
   return 0;
 };
 
+/** Returns the total number of possible mac eventing configurations */
+export const totalMacEvents = (state: PolicyDetailsState): number => {
+  const config = policyConfig(state);
+  if (config) {
+    return Object.keys(config.mac.events).length;
+  }
+  return 0;
+};
+
+/** Returns the number of selected mac eventing configurations */
+export const selectedMacEvents = (state: PolicyDetailsState): number => {
+  const config = policyConfig(state);
+  if (config) {
+    return Object.values(config.mac.events).reduce((count, event) => {
+      return event === true ? count + 1 : count;
+    }, 0);
+  }
+  return 0;
+};
+
 /** is there an api call in flight */
 export const isLoading = (state: PolicyDetailsState) => state.isLoading;
 
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
index d4f6d2457254e..dda50847169e7 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
@@ -118,34 +118,21 @@ export interface PolicyDetailsState {
  * Endpoint Policy configuration
  */
 export interface PolicyConfig {
-  windows: {
-    events: {
-      process: boolean;
-      network: boolean;
-    };
-    /** malware mode can be off, detect, prevent or prevent and notify user */
-    malware: MalwareFields;
+  windows: UIPolicyConfig['windows'] & {
     logging: {
       stdout: string;
       file: string;
     };
     advanced: PolicyConfigAdvancedOptions;
   };
-  mac: {
-    events: {
-      process: boolean;
-    };
-    malware: MalwareFields;
+  mac: UIPolicyConfig['mac'] & {
     logging: {
       stdout: string;
       file: string;
     };
     advanced: PolicyConfigAdvancedOptions;
   };
-  linux: {
-    events: {
-      process: boolean;
-    };
+  linux: UIPolicyConfig['linux'] & {
     logging: {
       stdout: string;
       file: string;
@@ -168,29 +155,39 @@ interface PolicyConfigAdvancedOptions {
   };
 }
 
-/**
- * Windows-specific policy configuration that is supported via the UI
- */
-type WindowsPolicyConfig = Pick<PolicyConfig['windows'], 'events' | 'malware'>;
-
-/**
- * Mac-specific policy configuration that is supported via the UI
- */
-type MacPolicyConfig = Pick<PolicyConfig['mac'], 'malware' | 'events'>;
-
-/**
- * Linux-specific policy configuration that is supported via the UI
- */
-type LinuxPolicyConfig = Pick<PolicyConfig['linux'], 'events'>;
-
 /**
  * The set of Policy configuration settings that are show/edited via the UI
  */
-export interface UIPolicyConfig {
-  windows: WindowsPolicyConfig;
-  mac: MacPolicyConfig;
-  linux: LinuxPolicyConfig;
-}
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
+export type UIPolicyConfig = {
+  windows: {
+    events: {
+      process: boolean;
+      network: boolean;
+    };
+    /** malware mode can be off, detect, prevent or prevent and notify user */
+    malware: MalwareFields;
+  };
+  mac: {
+    events: {
+      file: boolean;
+      process: boolean;
+      network: boolean;
+    };
+    malware: MalwareFields;
+  };
+
+  /**
+   * Linux-specific policy configuration that is supported via the UI
+   */
+  linux: {
+    events: {
+      file: boolean;
+      process: boolean;
+      network: boolean;
+    };
+  };
+};
 
 /** OS used in Policy */
 export enum OS {
@@ -203,6 +200,7 @@ export enum OS {
 export enum EventingFields {
   process = 'process',
   network = 'network',
+  file = 'file',
 }
 
 /**
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
index bc56e5e6f6329..1e723e32615eb 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
@@ -29,12 +29,12 @@ import {
   isLoading,
   apiError,
 } from '../../store/policy_details/selectors';
-import { WindowsEventing } from './policy_forms/eventing/windows';
 import { PageView, PageViewHeaderTitle } from '../../components/page_view';
 import { AppAction } from '../../types';
 import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { AgentsSummary } from './agents_summary';
 import { VerticalDivider } from './vertical_divider';
+import { WindowsEvents, MacEvents } from './policy_forms/events';
 import { MalwareProtections } from './policy_forms/protections/malware';
 
 export const PolicyDetails = React.memo(() => {
@@ -206,7 +206,9 @@ export const PolicyDetails = React.memo(() => {
           </h4>
         </EuiText>
         <EuiSpacer size="xs" />
-        <WindowsEventing />
+        <WindowsEvents />
+        <EuiSpacer size="l" />
+        <MacEvents />
       </PageView>
     </>
   );
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/checkbox.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/checkbox.tsx
deleted file mode 100644
index 8b7fb89ed1646..0000000000000
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/checkbox.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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, { useCallback } from 'react';
-import { EuiCheckbox } from '@elastic/eui';
-import { useDispatch } from 'react-redux';
-import { usePolicyDetailsSelector } from '../../policy_hooks';
-import { policyConfig, windowsEventing } from '../../../../store/policy_details/selectors';
-import { PolicyDetailsAction } from '../../../../store/policy_details';
-import { OS, EventingFields } from '../../../../types';
-import { clone } from '../../../../models/policy_details_config';
-
-export const EventingCheckbox: React.FC<{
-  id: string;
-  name: string;
-  os: OS;
-  protectionField: EventingFields;
-}> = React.memo(({ id, name, os, protectionField }) => {
-  const policyDetailsConfig = usePolicyDetailsSelector(policyConfig);
-  const eventing = usePolicyDetailsSelector(windowsEventing);
-  const dispatch = useDispatch<(action: PolicyDetailsAction) => void>();
-
-  const handleRadioChange = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      if (policyDetailsConfig) {
-        const newPayload = clone(policyDetailsConfig);
-        if (os === OS.linux || os === OS.mac) {
-          newPayload[os].events.process = event.target.checked;
-        } else {
-          newPayload[os].events[protectionField] = event.target.checked;
-        }
-
-        dispatch({
-          type: 'userChangedPolicyConfig',
-          payload: { policyConfig: newPayload },
-        });
-      }
-    },
-    [dispatch, os, policyDetailsConfig, protectionField]
-  );
-
-  return (
-    <EuiCheckbox
-      id={id}
-      label={name}
-      checked={eventing && eventing[protectionField]}
-      onChange={handleRadioChange}
-    />
-  );
-});
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/checkbox.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/checkbox.tsx
new file mode 100644
index 0000000000000..bec6b33b85c7f
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/checkbox.tsx
@@ -0,0 +1,49 @@
+/*
+ * 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, { useCallback, useMemo } from 'react';
+import { EuiCheckbox } from '@elastic/eui';
+import { useDispatch } from 'react-redux';
+import { htmlIdGenerator } from '@elastic/eui';
+import { usePolicyDetailsSelector } from '../../policy_hooks';
+import { policyConfig } from '../../../../store/policy_details/selectors';
+import { PolicyDetailsAction } from '../../../../store/policy_details';
+import { UIPolicyConfig } from '../../../../types';
+
+export const EventsCheckbox = React.memo(function({
+  name,
+  setter,
+  getter,
+}: {
+  name: string;
+  setter: (config: UIPolicyConfig, checked: boolean) => UIPolicyConfig;
+  getter: (config: UIPolicyConfig) => boolean;
+}) {
+  const policyDetailsConfig = usePolicyDetailsSelector(policyConfig);
+  const selected = getter(policyDetailsConfig);
+  const dispatch = useDispatch<(action: PolicyDetailsAction) => void>();
+
+  const handleCheckboxChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      if (policyDetailsConfig) {
+        dispatch({
+          type: 'userChangedPolicyConfig',
+          payload: { policyConfig: setter(policyDetailsConfig, event.target.checked) },
+        });
+      }
+    },
+    [dispatch, policyDetailsConfig, setter]
+  );
+
+  return (
+    <EuiCheckbox
+      id={useMemo(() => htmlIdGenerator()(), [])}
+      label={name}
+      checked={selected}
+      onChange={handleCheckboxChange}
+    />
+  );
+});
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/index.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/index.tsx
new file mode 100644
index 0000000000000..44716d8183041
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/index.tsx
@@ -0,0 +1,8 @@
+/*
+ * 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 { WindowsEvents } from './windows';
+export { MacEvents } from './mac';
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/mac.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/mac.tsx
new file mode 100644
index 0000000000000..3b69c21d2b150
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/mac.tsx
@@ -0,0 +1,106 @@
+/*
+ * 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, { useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
+import { EventsCheckbox } from './checkbox';
+import { OS, UIPolicyConfig } from '../../../../types';
+import { usePolicyDetailsSelector } from '../../policy_hooks';
+import { selectedMacEvents, totalMacEvents } from '../../../../store/policy_details/selectors';
+import { ConfigForm } from '../config_form';
+import { getIn, setIn } from '../../../../models/policy_details_config';
+
+export const MacEvents = React.memo(() => {
+  const selected = usePolicyDetailsSelector(selectedMacEvents);
+  const total = usePolicyDetailsSelector(totalMacEvents);
+
+  const checkboxes: Array<{
+    name: string;
+    os: 'mac';
+    protectionField: keyof UIPolicyConfig['mac']['events'];
+  }> = useMemo(
+    () => [
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.mac.events.file', {
+          defaultMessage: 'File',
+        }),
+        os: OS.mac,
+        protectionField: 'file',
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.mac.events.process', {
+          defaultMessage: 'Process',
+        }),
+        os: OS.mac,
+        protectionField: 'process',
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.mac.events.network', {
+          defaultMessage: 'Network',
+        }),
+        os: OS.mac,
+        protectionField: 'network',
+      },
+    ],
+    []
+  );
+
+  const renderCheckboxes = () => {
+    return (
+      <>
+        <EuiTitle size="xxs">
+          <h5>
+            <FormattedMessage
+              id="xpack.endpoint.policyDetailsConfig.eventingEvents"
+              defaultMessage="Events"
+            />
+          </h5>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+        {checkboxes.map((item, index) => {
+          return (
+            <EventsCheckbox
+              name={item.name}
+              key={index}
+              setter={(config, checked) =>
+                setIn(config)(item.os)('events')(item.protectionField)(checked)
+              }
+              getter={config => getIn(config)(item.os)('events')(item.protectionField)}
+            />
+          );
+        })}
+      </>
+    );
+  };
+
+  const collectionsEnabled = () => {
+    return (
+      <EuiText size="s" color="subdued">
+        <FormattedMessage
+          id="xpack.endpoint.policy.details.eventCollectionsEnabled"
+          defaultMessage="{selected} / {total} event collections enabled"
+          values={{ selected, total }}
+        />
+      </EuiText>
+    );
+  };
+
+  return (
+    <ConfigForm
+      type={i18n.translate('xpack.endpoint.policy.details.eventCollection', {
+        defaultMessage: 'Event Collection',
+      })}
+      supportedOss={[
+        i18n.translate('xpack.endpoint.policy.details.mac', { defaultMessage: 'Mac' }),
+      ]}
+      id="macEventingForm"
+      rightCorner={collectionsEnabled()}
+      children={renderCheckboxes()}
+    />
+  );
+});
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/windows.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
similarity index 61%
rename from x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/windows.tsx
rename to x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
index 7bec2c4c742d2..63a140912437d 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/eventing/windows.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
@@ -8,40 +8,45 @@ import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
-import { EventingCheckbox } from './checkbox';
-import { OS, EventingFields } from '../../../../types';
+import { EventsCheckbox } from './checkbox';
+import { OS, UIPolicyConfig } from '../../../../types';
 import { usePolicyDetailsSelector } from '../../policy_hooks';
 import {
-  selectedWindowsEventing,
-  totalWindowsEventing,
+  selectedWindowsEvents,
+  totalWindowsEvents,
 } from '../../../../store/policy_details/selectors';
 import { ConfigForm } from '../config_form';
+import { setIn, getIn } from '../../../../models/policy_details_config';
 
-export const WindowsEventing = React.memo(() => {
-  const selected = usePolicyDetailsSelector(selectedWindowsEventing);
-  const total = usePolicyDetailsSelector(totalWindowsEventing);
+export const WindowsEvents = React.memo(() => {
+  const selected = usePolicyDetailsSelector(selectedWindowsEvents);
+  const total = usePolicyDetailsSelector(totalWindowsEvents);
 
-  const checkboxes = useMemo(
+  const checkboxes: Array<{
+    name: string;
+    os: 'windows';
+    protectionField: keyof UIPolicyConfig['windows']['events'];
+  }> = useMemo(
     () => [
       {
-        name: i18n.translate('xpack.endpoint.policyDetailsConfig.eventingProcess', {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.process', {
           defaultMessage: 'Process',
         }),
         os: OS.windows,
-        protectionField: EventingFields.process,
+        protectionField: 'process',
       },
       {
-        name: i18n.translate('xpack.endpoint.policyDetailsConfig.eventingNetwork', {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.network', {
           defaultMessage: 'Network',
         }),
         os: OS.windows,
-        protectionField: EventingFields.network,
+        protectionField: 'network',
       },
     ],
     []
   );
 
-  const renderCheckboxes = () => {
+  const renderCheckboxes = useMemo(() => {
     return (
       <>
         <EuiTitle size="xxs">
@@ -55,20 +60,21 @@ export const WindowsEventing = React.memo(() => {
         <EuiSpacer size="s" />
         {checkboxes.map((item, index) => {
           return (
-            <EventingCheckbox
-              id={`eventing${item.name}`}
+            <EventsCheckbox
               name={item.name}
               key={index}
-              os={item.os}
-              protectionField={item.protectionField}
+              setter={(config, checked) =>
+                setIn(config)(item.os)('events')(item.protectionField)(checked)
+              }
+              getter={config => getIn(config)(item.os)('events')(item.protectionField)}
             />
           );
         })}
       </>
     );
-  };
+  }, [checkboxes]);
 
-  const collectionsEnabled = () => {
+  const collectionsEnabled = useMemo(() => {
     return (
       <EuiText size="s" color="subdued">
         <FormattedMessage
@@ -78,19 +84,22 @@ export const WindowsEventing = React.memo(() => {
         />
       </EuiText>
     );
-  };
+  }, [selected, total]);
 
   return (
     <ConfigForm
       type={i18n.translate('xpack.endpoint.policy.details.eventCollection', {
         defaultMessage: 'Event Collection',
       })}
-      supportedOss={[
-        i18n.translate('xpack.endpoint.policy.details.windows', { defaultMessage: 'Windows' }),
-      ]}
+      supportedOss={useMemo(
+        () => [
+          i18n.translate('xpack.endpoint.policy.details.windows', { defaultMessage: 'Windows' }),
+        ],
+        []
+      )}
       id="windowsEventingForm"
-      rightCorner={collectionsEnabled()}
-      children={renderCheckboxes()}
+      rightCorner={collectionsEnabled}
+      children={renderCheckboxes}
     />
   );
 });

From 39fbc5e103a50a2d9ef929b05696d478c1090269 Mon Sep 17 00:00:00 2001
From: The SpaceCake Project <randomuserid@users.noreply.github.com>
Date: Fri, 10 Apr 2020 17:50:23 -0400
Subject: [PATCH 26/36] bc6 rule import april 9 (#63152)

* bc6 rule import april 9

Increased the lookback of the ML rules

* re-import

with LF chars

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../prepackaged_rules/linux_anomalous_network_activity.json     | 2 +-
 .../linux_anomalous_network_port_activity.json                  | 2 +-
 .../prepackaged_rules/linux_anomalous_network_service.json      | 2 +-
 .../prepackaged_rules/linux_anomalous_network_url_activity.json | 2 +-
 .../prepackaged_rules/linux_anomalous_process_all_hosts.json    | 2 +-
 .../rules/prepackaged_rules/linux_anomalous_user_name.json      | 2 +-
 .../rules/prepackaged_rules/packetbeat_dns_tunneling.json       | 2 +-
 .../rules/prepackaged_rules/packetbeat_rare_dns_question.json   | 2 +-
 .../rules/prepackaged_rules/packetbeat_rare_server_domain.json  | 2 +-
 .../rules/prepackaged_rules/packetbeat_rare_urls.json           | 2 +-
 .../rules/prepackaged_rules/packetbeat_rare_user_agent.json     | 2 +-
 .../rules/prepackaged_rules/rare_process_by_host_linux.json     | 2 +-
 .../rules/prepackaged_rules/rare_process_by_host_windows.json   | 2 +-
 .../rules/prepackaged_rules/suspicious_login_activity.json      | 2 +-
 .../prepackaged_rules/windows_anomalous_network_activity.json   | 2 +-
 .../prepackaged_rules/windows_anomalous_path_activity.json      | 2 +-
 .../prepackaged_rules/windows_anomalous_process_all_hosts.json  | 2 +-
 .../prepackaged_rules/windows_anomalous_process_creation.json   | 2 +-
 .../rules/prepackaged_rules/windows_anomalous_script.json       | 2 +-
 .../rules/prepackaged_rules/windows_anomalous_service.json      | 2 +-
 .../rules/prepackaged_rules/windows_anomalous_user_name.json    | 2 +-
 .../rules/prepackaged_rules/windows_rare_user_runas_event.json  | 2 +-
 .../windows_rare_user_type10_remote_login.json                  | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_activity.json
index 1123c1161c4ce..fe248a6c1e23e 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_activity.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_activity.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that rarely uses the network could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "linux_anomalous_network_activity_ecs",
   "name": "Unusual Linux Network Activity",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_port_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_port_activity.json
index 19dd643945b17..d435d4c10f05c 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_port_activity.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_port_activity.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that rarely uses the network could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "linux_anomalous_network_port_activity_ecs",
   "name": "Unusual Linux Network Port Activity",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_service.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_service.json
index e2e5803618d06..0b82ce99d0b7f 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_service.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_service.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that rarely uses the network could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "linux_anomalous_network_service",
   "name": "Unusual Linux Network Service",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_url_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_url_activity.json
index 40dd2e76c7214..26af34e18a4c8 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_url_activity.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_network_url_activity.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A new and unusual program or artifact download in the course of software upgrades, debugging, or troubleshooting could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "linux_anomalous_network_url_activity_ecs",
   "name": "Unusual Linux Web Activity",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_process_all_hosts.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_process_all_hosts.json
index 6bac2f25fd7de..d15c4fc794378 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_process_all_hosts.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_process_all_hosts.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that runs rarely as part of a monthly or quarterly workflow could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "linux_anomalous_process_all_hosts_ecs",
   "name": "Anomalous Process For a Linux Population",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_user_name.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_user_name.json
index 8b7e6c89482f7..2f33948b0a93e 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_user_name.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_anomalous_user_name.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Uncommon user activity can be due to an engineer logging onto a server instance in order to perform manual troubleshooting or reconfiguration."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "linux_anomalous_user_name_ecs",
   "name": "Unusual Linux Username",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_dns_tunneling.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_dns_tunneling.json
index c70725dcb645a..765515ffda27c 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_dns_tunneling.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_dns_tunneling.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "DNS domains that use large numbers of child domains, such as software or content distribution networks, can trigger this signal and such parent domains can be excluded."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "packetbeat_dns_tunneling",
   "name": "DNS Tunneling",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_dns_question.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_dns_question.json
index 3ed40ddf27864..79c30c5b38378 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_dns_question.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_dns_question.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that runs rarely as part of a monthly or quarterly workflow could trigger this signal. Network activity that occurs rarely, in small quantities, can trigger this signal. Possible examples are browsing technical support or vendor networks sparsely. A user who visits a new or unique web destination may trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "packetbeat_rare_dns_question",
   "name": "Unusual DNS Activity",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_server_domain.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_server_domain.json
index c49bc95be75d2..7b14ad62f6c93 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_server_domain.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_server_domain.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Web activity that occurs rarely in small quantities can trigger this signal. Possible examples are browsing technical support or vendor URLs that are used very sparsely. A user who visits a new and unique web destination may trigger this signal when the activity is sparse. Web applications that generate URLs unique to a transaction may trigger this when they are used sparsely. Web domains can be excluded in cases such as these."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "packetbeat_rare_server_domain",
   "name": "Unusual Network Destination Domain Name",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_urls.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_urls.json
index 02a4a5f729a16..76767545e794a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_urls.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_urls.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Web activity that occurs rarely in small quantities can trigger this signal. Possible examples are browsing technical support or vendor URLs that are used very sparsely. A user who visits a new and unique web destination may trigger this signal when the activity is sparse. Web applications that generate URLs unique to a transaction may trigger this when they are used sparsely. Web domains can be excluded in cases such as these."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "packetbeat_rare_urls",
   "name": "Unusual Web Request",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_user_agent.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_user_agent.json
index 76ed6b263a704..1dc49203f31c1 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_user_agent.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/packetbeat_rare_user_agent.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Web activity that is uncommon, like security scans, may trigger this signal and may need to be excluded. A new or rarely used program that calls web services may trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "packetbeat_rare_user_agent",
   "name": "Unusual Web User Agent",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/rare_process_by_host_linux.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/rare_process_by_host_linux.json
index 048f93e170656..f071677ae8d33 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/rare_process_by_host_linux.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/rare_process_by_host_linux.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that runs rarely as part of a monthly or quarterly workflow could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "rare_process_by_host_linux_ecs",
   "name": "Unusual Process For a Linux Host",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/rare_process_by_host_windows.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/rare_process_by_host_windows.json
index 7bc46cdc04dd2..5e0050c6c25ec 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/rare_process_by_host_windows.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/rare_process_by_host_windows.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that runs rarely as part of a monthly or quarterly workflow could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "rare_process_by_host_windows_ecs",
   "name": "Unusual Process For a Windows Host",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suspicious_login_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suspicious_login_activity.json
index 915bc1bcfc051..4b94fdc6da147 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suspicious_login_activity.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suspicious_login_activity.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Security audits may trigger this signal. Conditions that generate bursts of failed logins, such as misconfigured applications or account lockouts could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "suspicious_login_activity_ecs",
   "name": "Unusual Login Activity",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_network_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_network_activity.json
index 72671760c9c8d..ca18fe95b1fc1 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_network_activity.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_network_activity.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that rarely uses the network could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_anomalous_network_activity_ecs",
   "name": "Unusual Windows Network Activity",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_path_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_path_activity.json
index 082fce438ca9e..8a88607b9d5c9 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_path_activity.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_path_activity.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A new and unusual program or artifact download in the course of software upgrades, debugging, or troubleshooting could trigger this signal. Users downloading and running programs from unusual locations, such as temporary directories, browser caches, or profile paths could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_anomalous_path_activity_ecs",
   "name": "Unusual Windows Path Activity",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_process_all_hosts.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_process_all_hosts.json
index 93469b5a06223..1229c4a52b97d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_process_all_hosts.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_process_all_hosts.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that runs rarely as part of a monthly or quarterly workflow could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_anomalous_process_all_hosts_ecs",
   "name": "Anomalous Process For a Windows Population",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_process_creation.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_process_creation.json
index 1b80e443baae6..98a078ccea4a4 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_process_creation.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_process_creation.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Users running scripts in the course of technical support operations of software upgrades could trigger this signal. A newly installed program or one that runs rarely as part of a monthly or quarterly workflow could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_anomalous_process_creation",
   "name": "Anomalous Windows Process Creation",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_script.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_script.json
index 4de5443bcaf3f..564ca1782526f 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_script.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_script.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Certain kinds of security testing may trigger this signal. PowerShell scripts that use high levels of obfuscation or have unusual script block payloads may trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_anomalous_script",
   "name": "Suspicious Powershell Script",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_service.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_service.json
index 7e0641fee68c2..afef569f4ebb4 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_service.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_service.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "A newly installed program or one that runs rarely as part of a monthly or quarterly workflow could trigger this signal."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_anomalous_service",
   "name": "Unusual Windows Service",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_user_name.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_user_name.json
index 217404b6eb474..703dc1a1dc633 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_user_name.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_anomalous_user_name.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Uncommon user activity can be due to an administrator or help desk technician logging onto a workstation or server in order to perform manual troubleshooting or reconfiguration."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_anomalous_user_name_ecs",
   "name": "Unusual Windows Username",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_rare_user_runas_event.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_rare_user_runas_event.json
index 3dca119b5a28e..febaa57443f76 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_rare_user_runas_event.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_rare_user_runas_event.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Uncommon user privilege elevation activity can be due to an administrator, help desk technician, or a user performing manual troubleshooting or reconfiguration."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_rare_user_runas_event",
   "name": "Unusual Windows User Privilege Elevation Activity",
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_rare_user_type10_remote_login.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_rare_user_type10_remote_login.json
index 09ff2a0cedf41..946cdb95b8e70 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_rare_user_type10_remote_login.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_rare_user_type10_remote_login.json
@@ -4,7 +4,7 @@
   "false_positives": [
     "Uncommon username activity can be due to an engineer logging onto a server instance in order to perform manual troubleshooting or reconfiguration."
   ],
-  "from": "now-16m",
+  "from": "now-45m",
   "interval": "15m",
   "machine_learning_job_id": "windows_rare_user_type10_remote_login",
   "name": "Unusual Windows Remote User",

From fbd15ec8675029a398381ef063fa8a817e21146c Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Fri, 10 Apr 2020 14:55:03 -0700
Subject: [PATCH 27/36] Added UI for pre-configured connectors. (#63074)

* Added UI for pre-configured connectors.

* fixed due to comments

* Fixed jest tests

* Fixed due to comments and added some functional tests

* test fix

* Fixed failed checks

* Fixed functional tests failing
---
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 .../components/add_message_variables.tsx      |   3 +-
 .../action_connector_form/action_form.tsx     |  15 +-
 .../connector_edit_flyout.test.tsx            |  56 +++++++
 .../connector_edit_flyout.tsx                 | 137 +++++++++++++-----
 .../actions_connectors_list.test.tsx          |  16 +-
 .../components/actions_connectors_list.tsx    |  78 +++++++---
 .../apps/triggers_actions_ui/alerts.ts        |  22 ++-
 .../apps/triggers_actions_ui/connectors.ts    |  25 ++++
 x-pack/test/functional_with_es_ssl/config.ts  |  10 ++
 11 files changed, 286 insertions(+), 78 deletions(-)

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 09903c34e2e5e..fe0c58e83e544 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -16102,7 +16102,6 @@
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel": "ユーザー名",
     "xpack.triggersActionsUI.sections.editConnectorForm.betaBadgeTooltipContent": "{pluginName} はベータ段階で、変更される可能性があります。デザインとコードはオフィシャル GA 機能よりも完成度が低く、現状のまま保証なしで提供されています。ベータ機能にはオフィシャル GA 機能の SLA が適用されません。",
     "xpack.triggersActionsUI.sections.editConnectorForm.cancelButtonLabel": "キャンセル",
-    "xpack.triggersActionsUI.sections.editConnectorForm.flyoutTitle": "コネクターを編集",
     "xpack.triggersActionsUI.sections.editConnectorForm.saveButtonLabel": "保存",
     "xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText": "コネクターを更新できません。",
     "xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText": "「{connectorName}」を更新しました",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index cc1b7d7980a0b..fd2a92c2c402f 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -16107,7 +16107,6 @@
     "xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel": "用户名",
     "xpack.triggersActionsUI.sections.editConnectorForm.betaBadgeTooltipContent": "{pluginName} 为公测版，可能会进行更改。设计和代码相对于正式发行版功能还不够成熟，将按原样提供，且不提供任何保证。公测版功能不受正式发行版功能支持 SLA 的约束。",
     "xpack.triggersActionsUI.sections.editConnectorForm.cancelButtonLabel": "取消",
-    "xpack.triggersActionsUI.sections.editConnectorForm.flyoutTitle": "编辑连接器",
     "xpack.triggersActionsUI.sections.editConnectorForm.saveButtonLabel": "保存",
     "xpack.triggersActionsUI.sections.editConnectorForm.updateErrorNotificationText": "无法更新连接器。",
     "xpack.triggersActionsUI.sections.editConnectorForm.updateSuccessNotificationText": "已更新“{connectorName}”",
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
index ab9b5c2586c17..957c79a5c5123 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
@@ -22,9 +22,10 @@ export const AddMessageVariables: React.FunctionComponent<Props> = ({
   const [isVariablesPopoverOpen, setIsVariablesPopoverOpen] = useState<boolean>(false);
 
   const getMessageVariables = () =>
-    messageVariables?.map((variable: string) => (
+    messageVariables?.map((variable: string, i: number) => (
       <EuiContextMenuItem
         key={variable}
+        data-test-subj={`variableMenuButton-${i}`}
         icon="empty"
         onClick={() => {
           onSelectEventHandler(variable);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
index 6b011ac84bc6f..5890d9fe07f0e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
@@ -141,15 +141,22 @@ export const ActionForm = ({
       });
     }
   }
+  const preconfiguredMessage = i18n.translate(
+    'xpack.triggersActionsUI.sections.actionForm.preconfiguredTitleMessage',
+    {
+      defaultMessage: '(pre-configured)',
+    }
+  );
   const getSelectedOptions = (actionItemId: string) => {
     const val = connectors.find(connector => connector.id === actionItemId);
     if (!val) {
       return [];
     }
+    const optionTitle = `${val.name} ${val.isPreconfigured ? preconfiguredMessage : ''}`;
     return [
       {
-        label: val.name,
-        value: val.name,
+        label: optionTitle,
+        value: optionTitle,
         id: actionItemId,
       },
     ];
@@ -264,7 +271,9 @@ export const ActionForm = ({
                         defaultMessage="{actionConnectorName}"
                         id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
                         values={{
-                          actionConnectorName: actionConnector.name,
+                          actionConnectorName: `${actionConnector.name} ${
+                            actionConnector.isPreconfigured ? preconfiguredMessage : ''
+                          }`,
                         }}
                       />
                     </EuiFlexItem>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
index 2c063ea6b4fa6..6659888797679 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
@@ -95,4 +95,60 @@ describe('connector_edit_flyout', () => {
     expect(connectorNameField.exists()).toBeTruthy();
     expect(connectorNameField.first().prop('value')).toBe('action-connector');
   });
+
+  test('if pre-configured connector rendered correct in the edit form', () => {
+    const connector = {
+      secrets: {},
+      id: 'test',
+      actionTypeId: 'test-action-type-id',
+      actionType: 'test-action-type-name',
+      name: 'pre-configured-connector',
+      isPreconfigured: true,
+      referencedByCount: 0,
+      config: {},
+    };
+
+    const actionType = {
+      id: 'test-action-type-id',
+      iconClass: 'test',
+      selectMessage: 'test',
+      validateConnector: (): ValidationResult => {
+        return { errors: {} };
+      },
+      validateParams: (): ValidationResult => {
+        const validationResult = { errors: {} };
+        return validationResult;
+      },
+      actionConnectorFields: null,
+      actionParamsFields: null,
+    };
+    actionTypeRegistry.get.mockReturnValue(actionType);
+    actionTypeRegistry.has.mockReturnValue(true);
+
+    const wrapper = mountWithIntl(
+      <AppContextProvider appDeps={deps}>
+        <ActionsConnectorsContextProvider
+          value={{
+            http: deps.http,
+            toastNotifications: deps.toastNotifications,
+            capabilities: deps.capabilities,
+            actionTypeRegistry: deps.actionTypeRegistry,
+            reloadConnectors: () => {
+              return new Promise<void>(() => {});
+            },
+          }}
+        >
+          <ConnectorEditFlyout
+            initialConnector={connector}
+            editFlyoutVisible={true}
+            setEditFlyoutVisibility={state => {}}
+          />
+        </ActionsConnectorsContextProvider>
+      </AppContextProvider>
+    );
+
+    const preconfiguredBadge = wrapper.find('[data-test-subj="preconfiguredBadge"]');
+    expect(preconfiguredBadge.exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="saveEditedActionButton"]').exists()).toBeFalsy();
+  });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
index ed8811d26331b..a81d6c285f460 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
@@ -3,7 +3,7 @@
  * 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, { useCallback, useReducer, useState } from 'react';
+import React, { useCallback, useReducer, useState, Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiTitle,
@@ -17,6 +17,8 @@ import {
   EuiButtonEmpty,
   EuiButton,
   EuiBetaBadge,
+  EuiText,
+  EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { ActionConnectorForm, validateBaseProperties } from './action_connector_form';
@@ -91,8 +93,77 @@ export const ConnectorEditFlyout = ({
         return undefined;
       });
 
+  const flyoutTitle = connector.isPreconfigured ? (
+    <Fragment>
+      <EuiTitle size="s">
+        <h3 id="flyoutTitle">
+          <FormattedMessage
+            defaultMessage="{connectorName}"
+            id="xpack.triggersActionsUI.sections.preconfiguredConnectorForm.flyoutTitle"
+            values={{ connectorName: initialConnector.name }}
+          />
+          &emsp;
+          <EuiBetaBadge
+            label="Pre-configured"
+            data-test-subj="preconfiguredBadge"
+            tooltipContent={i18n.translate(
+              'xpack.triggersActionsUI.sections.preconfiguredConnectorForm.tooltipContent',
+              {
+                defaultMessage: 'This connector is preconfigured and cannot be edited',
+              }
+            )}
+          />
+          &emsp;
+          <EuiBetaBadge
+            label="Beta"
+            tooltipContent={i18n.translate(
+              'xpack.triggersActionsUI.sections.preconfiguredConnectorForm.betaBadgeTooltipContent',
+              {
+                defaultMessage:
+                  '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+                values: {
+                  pluginName: PLUGIN.getI18nName(i18n),
+                },
+              }
+            )}
+          />
+        </h3>
+      </EuiTitle>
+      <EuiText size="s">
+        <FormattedMessage
+          defaultMessage="{actionDescription}"
+          id="xpack.triggersActionsUI.sections.editConnectorForm.actionTypeDescription"
+          values={{ actionDescription: actionTypeModel.selectMessage }}
+        />
+      </EuiText>
+    </Fragment>
+  ) : (
+    <EuiTitle size="s">
+      <h3 id="flyoutTitle">
+        <FormattedMessage
+          defaultMessage="Edit connector"
+          id="xpack.triggersActionsUI.sections.editConnectorForm.flyoutPreconfiguredTitle"
+        />
+        &emsp;
+        <EuiBetaBadge
+          label="Beta"
+          tooltipContent={i18n.translate(
+            'xpack.triggersActionsUI.sections.editConnectorForm.betaBadgeTooltipContent',
+            {
+              defaultMessage:
+                '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
+              values: {
+                pluginName: PLUGIN.getI18nName(i18n),
+              },
+            }
+          )}
+        />
+      </h3>
+    </EuiTitle>
+  );
+
   return (
-    <EuiFlyout onClose={closeFlyout} aria-labelledby="flyoutActionAddTitle" size="m">
+    <EuiFlyout onClose={closeFlyout} aria-labelledby="flyoutActionEditTitle" size="m">
       <EuiFlyoutHeader hasBorder>
         <EuiFlexGroup gutterSize="s" alignItems="center">
           {actionTypeModel ? (
@@ -100,41 +171,37 @@ export const ConnectorEditFlyout = ({
               <EuiIcon type={actionTypeModel.iconClass} size="m" />
             </EuiFlexItem>
           ) : null}
-          <EuiFlexItem>
-            <EuiTitle size="s">
-              <h3 id="flyoutTitle">
-                <FormattedMessage
-                  defaultMessage="Edit connector"
-                  id="xpack.triggersActionsUI.sections.editConnectorForm.flyoutTitle"
-                />
-                &emsp;
-                <EuiBetaBadge
-                  label="Beta"
-                  tooltipContent={i18n.translate(
-                    'xpack.triggersActionsUI.sections.editConnectorForm.betaBadgeTooltipContent',
-                    {
-                      defaultMessage:
-                        '{pluginName} is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.',
-                      values: {
-                        pluginName: PLUGIN.getI18nName(i18n),
-                      },
-                    }
-                  )}
-                />
-              </h3>
-            </EuiTitle>
-          </EuiFlexItem>
+          <EuiFlexItem>{flyoutTitle}</EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlyoutHeader>
       <EuiFlyoutBody>
-        <ActionConnectorForm
-          connector={connector}
-          errors={errors}
-          actionTypeName={connector.actionType}
-          dispatch={dispatch}
-          actionTypeRegistry={actionTypeRegistry}
-          http={http}
-        />
+        {!connector.isPreconfigured ? (
+          <ActionConnectorForm
+            connector={connector}
+            errors={errors}
+            actionTypeName={connector.actionType}
+            dispatch={dispatch}
+            actionTypeRegistry={actionTypeRegistry}
+            http={http}
+          />
+        ) : (
+          <Fragment>
+            <EuiText>
+              {i18n.translate(
+                'xpack.triggersActionsUI.sections.editConnectorForm.descriptionText',
+                {
+                  defaultMessage: 'This connector is readonly.',
+                }
+              )}
+            </EuiText>
+            <EuiLink href="https://www.elastic.co/guide" target="_blank">
+              <FormattedMessage
+                id="xpack.triggersActionsUI.sections.editConnectorForm.preconfiguredHelpLabel"
+                defaultMessage="Learn more about pre-configured connectors."
+              />
+            </EuiLink>
+          </Fragment>
+        )}
       </EuiFlyoutBody>
       <EuiFlyoutFooter>
         <EuiFlexGroup justifyContent="spaceBetween">
@@ -148,7 +215,7 @@ export const ConnectorEditFlyout = ({
               )}
             </EuiButtonEmpty>
           </EuiFlexItem>
-          {canSave && actionTypeModel ? (
+          {canSave && actionTypeModel && !connector.isPreconfigured ? (
             <EuiFlexItem grow={false}>
               <EuiButton
                 fill
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
index 4fa1e7e4c6e4d..01d21e954bbf3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
@@ -111,6 +111,7 @@ describe('actions_connectors_list component with items', () => {
         id: '1',
         actionTypeId: 'test',
         description: 'My test',
+        isPreconfigured: false,
         referencedByCount: 1,
         config: {},
       },
@@ -119,6 +120,15 @@ describe('actions_connectors_list component with items', () => {
         actionTypeId: 'test2',
         description: 'My test 2',
         referencedByCount: 1,
+        isPreconfigured: false,
+        config: {},
+      },
+      {
+        id: '3',
+        actionTypeId: 'test2',
+        description: 'My preconfigured test 2',
+        referencedByCount: 1,
+        isPreconfigured: true,
         config: {},
       },
     ]);
@@ -185,7 +195,11 @@ describe('actions_connectors_list component with items', () => {
 
   it('renders table of connectors', () => {
     expect(wrapper.find('EuiInMemoryTable')).toHaveLength(1);
-    expect(wrapper.find('EuiTableRow')).toHaveLength(2);
+    expect(wrapper.find('EuiTableRow')).toHaveLength(3);
+  });
+
+  it('renders table with preconfigured connectors', () => {
+    expect(wrapper.find('[data-test-subj="preConfiguredTitleMessage"]')).toHaveLength(2);
   });
 
   test('if select item for edit should render ConnectorEditFlyout', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
index 47e058f473946..043a644489d82 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
@@ -15,6 +15,9 @@ import {
   EuiIconTip,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiBetaBadge,
+  EuiToolTip,
+  EuiButtonIcon,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -200,31 +203,58 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
       },
     },
     {
-      field: '',
+      field: 'isPreconfigured',
       name: '',
-      actions: [
-        {
-          enabled: () => canDelete,
-          'data-test-subj': 'deleteConnector',
-          name: i18n.translate(
-            'xpack.triggersActionsUI.sections.actionsConnectorsList.connectorsListTable.columns.actions.deleteActionName',
-            { defaultMessage: 'Delete' }
-          ),
-          description: canDelete
-            ? i18n.translate(
-                'xpack.triggersActionsUI.sections.actionsConnectorsList.connectorsListTable.columns.actions.deleteActionDescription',
-                { defaultMessage: 'Delete this connector' }
-              )
-            : i18n.translate(
-                'xpack.triggersActionsUI.sections.actionsConnectorsList.connectorsListTable.columns.actions.deleteActionDisabledDescription',
-                { defaultMessage: 'Unable to delete connectors' }
-              ),
-          type: 'icon',
-          icon: 'trash',
-          color: 'danger',
-          onClick: (item: ActionConnectorTableItem) => setConnectorsToDelete([item.id]),
-        },
-      ],
+      render: (value: number, item: ActionConnectorTableItem) => {
+        if (item.isPreconfigured) {
+          return (
+            <EuiFlexGroup justifyContent="flexEnd" alignItems="flexEnd">
+              <EuiFlexItem grow={false}>
+                <EuiBetaBadge
+                  data-test-subj="preConfiguredTitleMessage"
+                  label={i18n.translate(
+                    'xpack.triggersActionsUI.sections.alertForm.preconfiguredTitleMessage',
+                    {
+                      defaultMessage: 'Pre-configured',
+                    }
+                  )}
+                  tooltipContent="This connector can't be deleted."
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          );
+        }
+        return (
+          <EuiFlexGroup justifyContent="flexEnd" alignItems="flexEnd">
+            <EuiFlexItem grow={false}>
+              <EuiToolTip
+                content={
+                  canDelete
+                    ? i18n.translate(
+                        'xpack.triggersActionsUI.sections.actionsConnectorsList.connectorsListTable.columns.actions.deleteActionDescription',
+                        { defaultMessage: 'Delete this connector' }
+                      )
+                    : i18n.translate(
+                        'xpack.triggersActionsUI.sections.actionsConnectorsList.connectorsListTable.columns.actions.deleteActionDisabledDescription',
+                        { defaultMessage: 'Unable to delete connectors' }
+                      )
+                }
+              >
+                <EuiButtonIcon
+                  isDisabled={!canDelete}
+                  data-test-subj="deleteConnector"
+                  aria-label={i18n.translate(
+                    'xpack.triggersActionsUI.sections.actionsConnectorsList.connectorsListTable.columns.actions.deleteActionName',
+                    { defaultMessage: 'Delete' }
+                  )}
+                  onClick={() => setConnectorsToDelete([item.id])}
+                  iconType={'trash'}
+                />
+              </EuiToolTip>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        );
+      },
     },
   ];
 
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
index 029af1ea06e4f..c94e7116c5cea 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
@@ -65,23 +65,21 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       // need this two out of popup clicks to close them
       await nameInput.click();
 
+      // test for normal connector
+      await testSubjects.click('.webhook-ActionTypeSelectOption');
+      const webhookBodyInput = await find.byCssSelector('.ace_text-input');
+      await webhookBodyInput.focus();
+      await webhookBodyInput.type('{\\"test\\":1}');
+
+      await testSubjects.click('addAlertActionButton');
+      // pre-configured connector is loaded an displayed correctly
       await testSubjects.click('.slack-ActionTypeSelectOption');
-      await testSubjects.click('createActionConnectorButton');
-      const connectorNameInput = await testSubjects.find('nameInput');
-      await connectorNameInput.click();
-      await connectorNameInput.clearValue();
-      const connectorName = generateUniqueKey();
-      await connectorNameInput.type(connectorName);
-      const slackWebhookUrlInput = await testSubjects.find('slackWebhookUrlInput');
-      await slackWebhookUrlInput.click();
-      await slackWebhookUrlInput.clearValue();
-      await slackWebhookUrlInput.type('https://test');
-      await find.clickByCssSelector('[data-test-subj="saveActionButtonModal"]:not(disabled)');
+      expect(await (await find.byCssSelector('#my-slack1')).isDisplayed()).to.be(true);
       const loggingMessageInput = await testSubjects.find('slackMessageTextArea');
       await loggingMessageInput.click();
       await loggingMessageInput.clearValue();
       await loggingMessageInput.type('test message');
-      await testSubjects.click('slackAddVariableButton');
+      await testSubjects.click('messageAddVariableButton');
       const variableMenuButton = await testSubjects.find('variableMenuButton-0');
       await variableMenuButton.click();
       await testSubjects.click('saveAlertButton');
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors.ts
index b5bcd33c3b9ab..0e6f991be24d0 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors.ts
@@ -184,5 +184,30 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       const searchResultsAfterDelete = await pageObjects.triggersActionsUI.getConnectorsList();
       expect(searchResultsAfterDelete.length).to.eql(0);
     });
+
+    it('should not be able to delete a pre-configured connector', async () => {
+      const preconfiguredConnectorName = 'xyz';
+      await pageObjects.triggersActionsUI.searchConnectors(preconfiguredConnectorName);
+
+      const searchResults = await pageObjects.triggersActionsUI.getConnectorsList();
+      expect(searchResults.length).to.eql(1);
+
+      expect(await testSubjects.exists('deleteConnector')).to.be(false);
+      expect(await testSubjects.exists('preConfiguredTitleMessage')).to.be(true);
+    });
+
+    it('should not be able to edit a pre-configured connector', async () => {
+      const preconfiguredConnectorName = 'xyz';
+
+      await pageObjects.triggersActionsUI.searchConnectors(preconfiguredConnectorName);
+
+      const searchResultsBeforeEdit = await pageObjects.triggersActionsUI.getConnectorsList();
+      expect(searchResultsBeforeEdit.length).to.eql(1);
+
+      await find.clickByCssSelector('[data-test-subj="connectorsTableCell-name"] button');
+
+      expect(await testSubjects.exists('preconfiguredBadge')).to.be(true);
+      expect(await testSubjects.exists('saveEditedActionButton')).to.be(false);
+    });
   });
 };
diff --git a/x-pack/test/functional_with_es_ssl/config.ts b/x-pack/test/functional_with_es_ssl/config.ts
index 538817bd9d14c..a620b1d953376 100644
--- a/x-pack/test/functional_with_es_ssl/config.ts
+++ b/x-pack/test/functional_with_es_ssl/config.ts
@@ -52,6 +52,16 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
         `--plugin-path=${join(__dirname, 'fixtures', 'plugins', 'alerts')}`,
         '--xpack.actions.enabled=true',
         '--xpack.alerting.enabled=true',
+        `--xpack.actions.preconfigured=${JSON.stringify([
+          {
+            id: 'my-slack1',
+            actionTypeId: '.slack',
+            name: 'Slack#xyz',
+            config: {
+              webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz',
+            },
+          },
+        ])}`,
       ],
     },
   };

From cc85573c8adec5ad5f3828688136c190b8d79e8b Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@elastic.co>
Date: Fri, 10 Apr 2020 16:01:30 -0700
Subject: [PATCH 28/36] TaskManager tasks scheduled without attempting to run
 (#62078)

* TaskManager tasks scheduled without attempting to run

* Removing unused import

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/plugins/task_manager/server/task_manager.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/task_manager/server/task_manager.ts b/x-pack/plugins/task_manager/server/task_manager.ts
index c3f24a4aae88a..a7c67d190e72e 100644
--- a/x-pack/plugins/task_manager/server/task_manager.ts
+++ b/x-pack/plugins/task_manager/server/task_manager.ts
@@ -9,7 +9,7 @@ import { filter } from 'rxjs/operators';
 import { performance } from 'perf_hooks';
 
 import { pipe } from 'fp-ts/lib/pipeable';
-import { Option, none, some, map as mapOptional } from 'fp-ts/lib/Option';
+import { Option, some, map as mapOptional } from 'fp-ts/lib/Option';
 import {
   SavedObjectsSerializer,
   IScopedClusterClient,
@@ -156,8 +156,8 @@ export class TaskManager {
     this.events$.next(event);
   };
 
-  private attemptToRun(task: Option<string> = none) {
-    this.claimRequests$.next(task);
+  private attemptToRun(task: string) {
+    this.claimRequests$.next(some(task));
   }
 
   private createTaskRunnerForTask = (instance: ConcreteTaskInstance) => {
@@ -280,9 +280,7 @@ export class TaskManager {
       ...options,
       taskInstance: ensureDeprecatedFieldsAreCorrected(taskInstance, this.logger),
     });
-    const result = await this.store.schedule(modifiedTask);
-    this.attemptToRun();
-    return result;
+    return await this.store.schedule(modifiedTask);
   }
 
   /**
@@ -298,7 +296,7 @@ export class TaskManager {
         .then(resolve)
         .catch(reject);
 
-      this.attemptToRun(some(taskId));
+      this.attemptToRun(taskId);
     });
   }
 

From 53ee20b306556b9cecc7f94533481c43eed25b35 Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Fri, 10 Apr 2020 19:18:19 -0700
Subject: [PATCH 29/36] Changed alerting wrong param name for help
 xpack.encrypted_saved_objects.encryptionKey to
 xpack.encryptedSavedObjects.encryptionKey (#63307)

---
 docs/settings/alert-action-settings.asciidoc                  | 4 ++--
 docs/user/alerting/index.asciidoc                             | 2 +-
 rfcs/text/0002_encrypted_attributes.md                        | 2 +-
 .../public/application/components/health_check.test.tsx       | 2 +-
 .../public/application/components/health_check.tsx            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
index d7f1ec637d1df..d4dbe9407b7a9 100644
--- a/docs/settings/alert-action-settings.asciidoc
+++ b/docs/settings/alert-action-settings.asciidoc
@@ -9,7 +9,7 @@ Alerts and actions are enabled by default in {kib}, but require you configure th
 
 . <<using-kibana-with-security,Set up {kib} to work with {stack} {security-features}>>.
 . <<configuring-tls-kib-es,Set up TLS encryption between {kib} and {es}>>.
-. <<general-alert-action-settings,Specify a value for `xpack.encrypted_saved_objects.encryptionKey`>>.
+. <<general-alert-action-settings,Specify a value for `xpack.encryptedSavedObjects.encryptionKey`>>.
 
 You can configure the following settings in the `kibana.yml` file.
 
@@ -18,7 +18,7 @@ You can configure the following settings in the `kibana.yml` file.
 [[general-alert-action-settings]]
 ==== General settings
 
-`xpack.encrypted_saved_objects.encryptionKey`::
+`xpack.encryptedSavedObjects.encryptionKey`::
 
 A string of 32 or more characters used to encrypt sensitive properties on alerts and actions before they're stored in {es}. Third party credentials &mdash; such as the username and password used to connect to an SMTP service &mdash; are an example of encrypted properties.  
 +
diff --git a/docs/user/alerting/index.asciidoc b/docs/user/alerting/index.asciidoc
index c7cf1186a44be..f556cf71bf06c 100644
--- a/docs/user/alerting/index.asciidoc
+++ b/docs/user/alerting/index.asciidoc
@@ -157,7 +157,7 @@ Pre-packaged *alert types* simplify setup, hide the details complex domain-speci
 If you are using an *on-premises* Elastic Stack deployment with <<using-kibana-with-security, *security*>>:
 
 * TLS must be configured for communication <<configuring-tls-kib-es, between {es} and {kib}>>. {kib} alerting uses <<api-keys, API keys>> to secure background alert checks and actions, and API keys require {ref}/configuring-tls.html#tls-http[TLS on the HTTP interface].
-* In the kibana.yml configuration file, add the <<alert-action-settings-kb,`xpack.encrypted_saved_objects.encryptionKey` setting>> 
+* In the kibana.yml configuration file, add the <<alert-action-settings-kb,`xpack.encryptedSavedObjects.encryptionKey` setting>> 
 
 [float]
 [[alerting-security]]
diff --git a/rfcs/text/0002_encrypted_attributes.md b/rfcs/text/0002_encrypted_attributes.md
index aa7307edb66bd..c6553c177d995 100644
--- a/rfcs/text/0002_encrypted_attributes.md
+++ b/rfcs/text/0002_encrypted_attributes.md
@@ -166,7 +166,7 @@ take a look at the source code of this library to know how encryption is perform
 parameters are used, but in short it's AES Encryption with AES-256-GCM that uses random initialization vector and salt.
 
 As with encryption key for Kibana's session cookie, master encryption key used by `encrypted_saved_objects` plugin can be
-defined as a configuration value (`xpack.encrypted_saved_objects.encryptionKey`) via `kibana.yml`, but it's **highly 
+defined as a configuration value (`xpack.encryptedSavedObjects.encryptionKey`) via `kibana.yml`, but it's **highly 
 recommended** to define this key in the [Kibana Keystore](https://www.elastic.co/guide/en/kibana/current/secure-settings.html)
 instead. The master key should be cryptographically safe and be equal or greater than 32 bytes.
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx
index 9c51139993b3f..3fbcd13e98f5d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx
@@ -92,7 +92,7 @@ describe('health check', () => {
 
     const description = queryByRole(/banner/i);
     expect(description!.textContent).toMatchInlineSnapshot(
-      `"To create an alert, set a value for xpack.encrypted_saved_objects.encryptionKey in your kibana.yml file. Learn how."`
+      `"To create an alert, set a value for xpack.encryptedSavedObjects.encryptionKey in your kibana.yml file. Learn how."`
     );
 
     const action = queryByText(/Learn/i);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
index c967cf5de0771..afd5e08f52f25 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
@@ -132,7 +132,7 @@ const EncryptionError = ({
               defaultMessage: 'To create an alert, set a value for ',
             }
           )}
-          <EuiCode>{'xpack.encrypted_saved_objects.encryptionKey'}</EuiCode>
+          <EuiCode>{'xpack.encryptedSavedObjects.encryptionKey'}</EuiCode>
           {i18n.translate(
             'xpack.triggersActionsUI.components.healthCheck.encryptionErrorAfterKey',
             {

From bd159c7d59979d66c09c94402daf2c30373ee9f9 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Sat, 11 Apr 2020 09:27:45 +0200
Subject: [PATCH 30/36] fix ScopedHistory.createHref to prepend location with
 scoped history basePath (#62407)

* fix createHref to prepend with scoped history basePath + add option to exclude it.

* fix prependBasePath behavior

* fix test plugins urls

* add pathname to endpoint url builder methods

* Revert "add pathname to endpoint url builder methods"

This reverts commit 7604932b

* adapt createHref instead of prependBasePath

* use object options for createHref

* update generated doc
---
 ...in-core-public.scopedhistory.createhref.md |  6 +++--
 ...kibana-plugin-core-public.scopedhistory.md |  2 +-
 .../public/application/scoped_history.test.ts | 25 +++++++++++++++++--
 src/core/public/application/scoped_history.ts | 20 ++++++++++++---
 src/core/public/public.api.md                 |  4 ++-
 .../core_plugin_a/public/application.tsx      |  2 +-
 .../core_plugin_b/public/application.tsx      |  2 +-
 7 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/docs/development/core/public/kibana-plugin-core-public.scopedhistory.createhref.md b/docs/development/core/public/kibana-plugin-core-public.scopedhistory.createhref.md
index 7058656d09947..6bbab43ff6ffc 100644
--- a/docs/development/core/public/kibana-plugin-core-public.scopedhistory.createhref.md
+++ b/docs/development/core/public/kibana-plugin-core-public.scopedhistory.createhref.md
@@ -4,10 +4,12 @@
 
 ## ScopedHistory.createHref property
 
-Creates an href (string) to the location.
+Creates an href (string) to the location. If `prependBasePath` is true (default), it will prepend the location's path with the scoped history basePath.
 
 <b>Signature:</b>
 
 ```typescript
-createHref: (location: LocationDescriptorObject<HistoryLocationState>) => string;
+createHref: (location: LocationDescriptorObject<HistoryLocationState>, { prependBasePath }?: {
+        prependBasePath?: boolean | undefined;
+    }) => string;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.scopedhistory.md b/docs/development/core/public/kibana-plugin-core-public.scopedhistory.md
index 5ea47d2090d71..fa29b32c0bafc 100644
--- a/docs/development/core/public/kibana-plugin-core-public.scopedhistory.md
+++ b/docs/development/core/public/kibana-plugin-core-public.scopedhistory.md
@@ -28,7 +28,7 @@ export declare class ScopedHistory<HistoryLocationState = unknown> implements Hi
 |  --- | --- | --- | --- |
 |  [action](./kibana-plugin-core-public.scopedhistory.action.md) |  | <code>Action</code> | The last action dispatched on the history stack. |
 |  [block](./kibana-plugin-core-public.scopedhistory.block.md) |  | <code>(prompt?: string &#124; boolean &#124; History.TransitionPromptHook&lt;HistoryLocationState&gt; &#124; undefined) =&gt; UnregisterCallback</code> | Not supported. Use [AppMountParameters.onAppLeave](./kibana-plugin-core-public.appmountparameters.onappleave.md)<!-- -->. |
-|  [createHref](./kibana-plugin-core-public.scopedhistory.createhref.md) |  | <code>(location: LocationDescriptorObject&lt;HistoryLocationState&gt;) =&gt; string</code> | Creates an href (string) to the location. |
+|  [createHref](./kibana-plugin-core-public.scopedhistory.createhref.md) |  | <code>(location: LocationDescriptorObject&lt;HistoryLocationState&gt;, { prependBasePath }?: {</code><br/><code>        prependBasePath?: boolean &#124; undefined;</code><br/><code>    }) =&gt; string</code> | Creates an href (string) to the location. If <code>prependBasePath</code> is true (default), it will prepend the location's path with the scoped history basePath. |
 |  [createSubHistory](./kibana-plugin-core-public.scopedhistory.createsubhistory.md) |  | <code>&lt;SubHistoryLocationState = unknown&gt;(basePath: string) =&gt; ScopedHistory&lt;SubHistoryLocationState&gt;</code> | Creates a <code>ScopedHistory</code> for a subpath of this <code>ScopedHistory</code>. Useful for applications that may have sub-apps that do not need access to the containing application's history. |
 |  [go](./kibana-plugin-core-public.scopedhistory.go.md) |  | <code>(n: number) =&gt; void</code> | Send the user forward or backwards in the history stack. |
 |  [goBack](./kibana-plugin-core-public.scopedhistory.goback.md) |  | <code>() =&gt; void</code> | Send the user one location back in the history stack. Equivalent to calling [ScopedHistory.go(-1)](./kibana-plugin-core-public.scopedhistory.go.md)<!-- -->. If no more entries are available backwards, this is a no-op. |
diff --git a/src/core/public/application/scoped_history.test.ts b/src/core/public/application/scoped_history.test.ts
index c01eb50830516..a56cffef1e2f2 100644
--- a/src/core/public/application/scoped_history.test.ts
+++ b/src/core/public/application/scoped_history.test.ts
@@ -268,11 +268,32 @@ describe('ScopedHistory', () => {
       const gh = createMemoryHistory();
       gh.push('/app/wow');
       const h = new ScopedHistory(gh, '/app/wow');
-      expect(h.createHref({ pathname: '' })).toEqual(`/`);
+      expect(h.createHref({ pathname: '' })).toEqual(`/app/wow`);
+      expect(h.createHref({})).toEqual(`/app/wow`);
       expect(h.createHref({ pathname: '/new-page', search: '?alpha=true' })).toEqual(
-        `/new-page?alpha=true`
+        `/app/wow/new-page?alpha=true`
       );
     });
+
+    it('behave correctly with slash-ending basePath', () => {
+      const gh = createMemoryHistory();
+      gh.push('/app/wow/');
+      const h = new ScopedHistory(gh, '/app/wow/');
+      expect(h.createHref({ pathname: '' })).toEqual(`/app/wow/`);
+      expect(h.createHref({ pathname: '/new-page', search: '?alpha=true' })).toEqual(
+        `/app/wow/new-page?alpha=true`
+      );
+    });
+
+    it('skips the scoped history path when `prependBasePath` is false', () => {
+      const gh = createMemoryHistory();
+      gh.push('/app/wow');
+      const h = new ScopedHistory(gh, '/app/wow');
+      expect(h.createHref({ pathname: '' }, { prependBasePath: false })).toEqual(`/`);
+      expect(
+        h.createHref({ pathname: '/new-page', search: '?alpha=true' }, { prependBasePath: false })
+      ).toEqual(`/new-page?alpha=true`);
+    });
   });
 
   describe('action', () => {
diff --git a/src/core/public/application/scoped_history.ts b/src/core/public/application/scoped_history.ts
index c5febc7604feb..9fa8f0b7f8148 100644
--- a/src/core/public/application/scoped_history.ts
+++ b/src/core/public/application/scoped_history.ts
@@ -219,11 +219,26 @@ export class ScopedHistory<HistoryLocationState = unknown>
 
   /**
    * Creates an href (string) to the location.
+   * If `prependBasePath` is true (default), it will prepend the location's path with the scoped history basePath.
    *
    * @param location
+   * @param prependBasePath
    */
-  public createHref = (location: LocationDescriptorObject<HistoryLocationState>): Href => {
+  public createHref = (
+    location: LocationDescriptorObject<HistoryLocationState>,
+    { prependBasePath = true }: { prependBasePath?: boolean } = {}
+  ): Href => {
     this.verifyActive();
+    if (prependBasePath) {
+      location = this.prependBasePath(location);
+      if (location.pathname === undefined) {
+        // we always want to create an url relative to the basePath
+        // so if pathname is not present, we use the history's basePath as default
+        // we are doing that here because `prependBasePath` should not
+        // alter pathname for other method calls
+        location.pathname = this.basePath;
+      }
+    }
     return this.parentHistory.createHref(location);
   };
 
@@ -254,8 +269,7 @@ export class ScopedHistory<HistoryLocationState = unknown>
    * Prepends the base path to string.
    */
   private prependBasePathToString(path: string): string {
-    path = path.startsWith('/') ? path.slice(1) : path;
-    return path.length ? `${this.basePath}/${path}` : this.basePath;
+    return path.length ? `${this.basePath}/${path}`.replace(/\/{2,}/g, '/') : this.basePath;
   }
 
   /**
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index a5aa37becabc2..6d95d1bc7069c 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -1196,7 +1196,9 @@ export class ScopedHistory<HistoryLocationState = unknown> implements History<Hi
     constructor(parentHistory: History, basePath: string);
     get action(): Action;
     block: (prompt?: string | boolean | History.TransitionPromptHook<HistoryLocationState> | undefined) => UnregisterCallback;
-    createHref: (location: LocationDescriptorObject<HistoryLocationState>) => string;
+    createHref: (location: LocationDescriptorObject<HistoryLocationState>, { prependBasePath }?: {
+        prependBasePath?: boolean | undefined;
+    }) => string;
     createSubHistory: <SubHistoryLocationState = unknown>(basePath: string) => ScopedHistory<SubHistoryLocationState>;
     go: (n: number) => void;
     goBack: () => void;
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
index abea970749cbc..159bb54f50903 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
@@ -95,7 +95,7 @@ const Nav = withRouter(({ history, navigateToApp }: NavProps) => (
           {
             id: 'home',
             name: 'Home',
-            onClick: () => history.push('/'),
+            onClick: () => history.push(''),
             'data-test-subj': 'fooNavHome',
           },
           {
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
index 447307920c04c..01a63f9782563 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
@@ -102,7 +102,7 @@ const Nav = withRouter(({ history, navigateToApp }: NavProps) => (
           {
             id: 'home',
             name: 'Home',
-            onClick: () => navigateToApp('bar', { path: '/' }),
+            onClick: () => navigateToApp('bar', { path: '' }),
             'data-test-subj': 'barNavHome',
           },
           {

From 2be6b7fdcecbe2848cc1da23eb98af756f513d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Sat, 11 Apr 2020 10:06:39 +0100
Subject: [PATCH 31/36] fixing custom link popover size and hiding scroll
 (#63240)

---
 .../TransactionActionMenu/CustomLink/CustomLinkPopover.tsx      | 1 +
 .../shared/TransactionActionMenu/TransactionActionMenu.tsx      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx
index a20bc7e21cfc5..3aed1b7ac2953 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx
@@ -19,6 +19,7 @@ import { ManageCustomLink } from './ManageCustomLink';
 import { px } from '../../../../style/variables';
 
 const ScrollableContainer = styled.div`
+  -ms-overflow-style: none;
   max-height: ${px(535)};
   overflow: scroll;
 `;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
index e3fbcf8485d54..7ebfe26b83630 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
@@ -124,7 +124,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = ({
           <ActionMenuButton onClick={() => setIsActionPopoverOpen(true)} />
         }
       >
-        <div style={{ maxHeight: px(600) }}>
+        <div style={{ maxHeight: px(600), width: px(335) }}>
           {isCustomLinksPopoverOpen ? (
             <CustomLinkPopover
               customLinks={customLinks.slice(3, customLinks.length)}

From 1199c8c8b0c988d9013149b586bb9a5c941f1072 Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Sun, 12 Apr 2020 17:06:03 +0200
Subject: [PATCH 32/36] Bugfix dashboard unpins filters (#62301)

Fixes following cases:

Saving dashboard with pinned filter unpins it. Do not save pinned filters with dashboard see #62301 (comment)
When navigating with global filter to dashboard with same saved filter, filter becomes unpinned
When navigating from listing to dashboard with saved filter, back button didn't work

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../application/dashboard_app_controller.tsx  | 14 +++++--
 .../application/dashboard_state_manager.ts    |  7 ++--
 .../public/application/lib/filter_utils.ts    |  2 +-
 .../application/lib/update_saved_dashboard.ts |  7 ++++
 .../filter_manager/filter_manager.test.ts     | 11 +++---
 .../query/filter_manager/filter_manager.ts    | 17 ++-------
 .../data/public/ui/filter_bar/filter_item.tsx |  3 +-
 .../apps/dashboard/dashboard_filter_bar.js    | 38 +++++++++++++++++++
 test/functional/services/filter_bar.ts        | 15 +++++++-
 9 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
index d1c7d2d9eba3e..babd1fac274eb 100644
--- a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
+++ b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
@@ -143,6 +143,7 @@ export class DashboardAppController {
     });
 
     // sync initial app filters from state to filterManager
+    // if there is an existing similar global filter, then leave it as global
     filterManager.setAppFilters(_.cloneDeep(dashboardStateManager.appState.filters));
     // setup syncing of app filters between appState and filterManager
     const stopSyncingAppFilters = connectToQueryState(
@@ -150,7 +151,11 @@ export class DashboardAppController {
       {
         set: ({ filters }) => dashboardStateManager.setFilters(filters || []),
         get: () => ({ filters: dashboardStateManager.appState.filters }),
-        state$: dashboardStateManager.appState$.pipe(map(state => ({ filters: state.filters }))),
+        state$: dashboardStateManager.appState$.pipe(
+          map(state => ({
+            filters: state.filters,
+          }))
+        ),
       },
       {
         filters: esFilters.FilterStateStore.APP_STATE,
@@ -170,13 +175,16 @@ export class DashboardAppController {
     }
 
     // starts syncing `_g` portion of url with query services
-    // note: dashboard_state_manager.ts syncs `_a` portion of url
     // it is important to start this syncing after `dashboardStateManager.syncTimefilterWithDashboard(timefilter);` above is run,
-    // otherwise it will case redundant browser history record
+    // otherwise it will case redundant browser history records
     const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl(
       queryService,
       kbnUrlStateStorage
     );
+
+    // starts syncing `_a` portion of url
+    dashboardStateManager.startStateSyncing();
+
     $scope.showSaveQuery = dashboardCapabilities.saveQuery as boolean;
 
     const getShouldShowEditHelp = () =>
diff --git a/src/plugins/dashboard/public/application/dashboard_state_manager.ts b/src/plugins/dashboard/public/application/dashboard_state_manager.ts
index 6025f535ae761..13ba3c6d0b60d 100644
--- a/src/plugins/dashboard/public/application/dashboard_state_manager.ts
+++ b/src/plugins/dashboard/public/application/dashboard_state_manager.ts
@@ -164,9 +164,6 @@ export class DashboardStateManager {
       this.changeListeners.forEach(listener => listener({ dirty: this.isDirty }));
     });
 
-    // make sure url ('_a') matches initial state
-    this.kbnUrlStateStorage.set(this.STATE_STORAGE_KEY, initialState, { replace: true });
-
     // setup state syncing utils. state container will be synced with url into `this.STATE_STORAGE_KEY` query param
     this.stateSyncRef = syncState<DashboardAppState>({
       storageKey: this.STATE_STORAGE_KEY,
@@ -201,8 +198,10 @@ export class DashboardStateManager {
       },
       stateStorage: this.kbnUrlStateStorage,
     });
+  }
 
-    // actually start syncing state with container
+  public startStateSyncing() {
+    this.saveState({ replace: true });
     this.stateSyncRef.start();
   }
 
diff --git a/src/plugins/dashboard/public/application/lib/filter_utils.ts b/src/plugins/dashboard/public/application/lib/filter_utils.ts
index 1ec231db0c3d2..775bf90643a21 100644
--- a/src/plugins/dashboard/public/application/lib/filter_utils.ts
+++ b/src/plugins/dashboard/public/application/lib/filter_utils.ts
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import moment, { Moment } from 'moment';
-import { Filter } from 'src/plugins/data/public';
+import { Filter } from '../../../../data/public';
 
 /**
  * @typedef {Object} QueryFilter
diff --git a/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts b/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts
index 53dc7d9b460de..fc519327b41ee 100644
--- a/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts
+++ b/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts
@@ -22,6 +22,7 @@ import { RefreshInterval, TimefilterContract } from 'src/plugins/data/public';
 import { FilterUtils } from './filter_utils';
 import { SavedObjectDashboard } from '../../saved_dashboards';
 import { DashboardAppState } from '../../types';
+import { esFilters } from '../../../../data/public';
 
 export function updateSavedDashboard(
   savedDashboard: SavedObjectDashboard,
@@ -48,4 +49,10 @@ export function updateSavedDashboard(
     'value',
   ]);
   savedDashboard.refreshInterval = savedDashboard.timeRestore ? timeRestoreObj : undefined;
+
+  // save only unpinned filters
+  const unpinnedFilters = savedDashboard
+    .getFilters()
+    .filter(filter => !esFilters.isFilterPinned(filter));
+  savedDashboard.searchSource.setField('filter', unpinnedFilters);
 }
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
index ce574ace45705..3b4ca08cbbf14 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -204,18 +204,19 @@ describe('filter_manager', () => {
       ).toBe(3);
     });
 
-    test('should set app filters and remove any duplicated global filters', async function() {
-      filterManager.addFilters(readyFilters, true);
+    test('should set app filters and merge them with duplicate global filters', async function() {
+      const [filter, ...otherFilters] = readyFilters;
+      filterManager.addFilters(otherFilters, true);
       const appFilter1 = _.cloneDeep(readyFilters[1]);
       const appFilter2 = _.cloneDeep(readyFilters[2]);
 
-      filterManager.setAppFilters([appFilter1, appFilter2]);
+      filterManager.setAppFilters([filter, appFilter1, appFilter2]);
 
       const newGlobalFilters = filterManager.getGlobalFilters();
       const newAppFilters = filterManager.getAppFilters();
 
-      expect(newGlobalFilters).toHaveLength(1);
-      expect(newAppFilters).toHaveLength(2);
+      expect(newGlobalFilters).toHaveLength(2);
+      expect(newAppFilters).toHaveLength(1);
     });
 
     test('should set global filters and remove any duplicated app filters', async function() {
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
index fba1866ebd615..e206286bce147 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -177,13 +177,9 @@ export class FilterManager {
   public setGlobalFilters(newGlobalFilters: Filter[]) {
     newGlobalFilters = mapAndFlattenFilters(newGlobalFilters);
     FilterManager.setFiltersStore(newGlobalFilters, FilterStateStore.GLOBAL_STATE, true);
-    const { appFilters: currentAppFilters } = this.getPartitionedFilters();
-    // remove duplicates from current app filters, to make sure global will take precedence
-    const filteredAppFilters = currentAppFilters.filter(
-      appFilter => !newGlobalFilters.find(globalFilter => compareFilters(globalFilter, appFilter))
-    );
+    const { appFilters } = this.getPartitionedFilters();
     const newFilters = this.mergeIncomingFilters({
-      appFilters: filteredAppFilters,
+      appFilters,
       globalFilters: newGlobalFilters,
     });
 
@@ -198,14 +194,9 @@ export class FilterManager {
   public setAppFilters(newAppFilters: Filter[]) {
     newAppFilters = mapAndFlattenFilters(newAppFilters);
     FilterManager.setFiltersStore(newAppFilters, FilterStateStore.APP_STATE, true);
-    const { globalFilters: currentGlobalFilters } = this.getPartitionedFilters();
-    // remove duplicates from current global filters, to make sure app will take precedence
-    const filteredGlobalFilters = currentGlobalFilters.filter(
-      globalFilter => !newAppFilters.find(appFilter => compareFilters(appFilter, globalFilter))
-    );
-
+    const { globalFilters } = this.getPartitionedFilters();
     const newFilters = this.mergeIncomingFilters({
-      globalFilters: filteredGlobalFilters,
+      globalFilters,
       appFilters: newAppFilters,
     });
     this.handleStateUpdate(newFilters);
diff --git a/src/plugins/data/public/ui/filter_bar/filter_item.tsx b/src/plugins/data/public/ui/filter_bar/filter_item.tsx
index 6b5fd41dc06ea..528ec4800e7b9 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_item.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_item.tsx
@@ -88,6 +88,7 @@ class FilterItemUI extends Component<Props, State> {
     const dataTestSubjDisabled = `filter-${
       this.props.filter.meta.disabled ? 'disabled' : 'enabled'
     }`;
+    const dataTestSubjPinned = `filter-${isFilterPinned(filter) ? 'pinned' : 'unpinned'}`;
 
     const classes = classNames(
       'globalFilterItem',
@@ -107,7 +108,7 @@ class FilterItemUI extends Component<Props, State> {
         className={classes}
         iconOnClick={() => this.props.onRemove()}
         onClick={this.handleBadgeClick}
-        data-test-subj={`filter ${dataTestSubjDisabled} ${dataTestSubjKey} ${dataTestSubjValue}`}
+        data-test-subj={`filter ${dataTestSubjDisabled} ${dataTestSubjKey} ${dataTestSubjValue} ${dataTestSubjPinned}`}
       />
     );
 
diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.js b/test/functional/apps/dashboard/dashboard_filter_bar.js
index 6d2a30fa85325..f6089871010c3 100644
--- a/test/functional/apps/dashboard/dashboard_filter_bar.js
+++ b/test/functional/apps/dashboard/dashboard_filter_bar.js
@@ -27,6 +27,7 @@ export default function({ getService, getPageObjects }) {
   const pieChart = getService('pieChart');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
+  const browser = getService('browser');
   const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']);
 
   describe('dashboard filter bar', () => {
@@ -126,9 +127,46 @@ export default function({ getService, getPageObjects }) {
 
         const filterCount = await filterBar.getFilterCount();
         expect(filterCount).to.equal(1);
+        await pieChart.expectPieSliceCount(1);
+      });
 
+      it("restoring filters doesn't break back button", async () => {
+        await browser.goBack();
+        await PageObjects.dashboard.expectExistsDashboardLandingPage();
+        await browser.goForward();
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.dashboard.waitForRenderComplete();
         await pieChart.expectPieSliceCount(1);
       });
+
+      it("saving with pinned filter doesn't unpin them", async () => {
+        const filterKey = 'bytes';
+        await filterBar.toggleFilterPinned(filterKey);
+        await PageObjects.dashboard.switchToEditMode();
+        await PageObjects.dashboard.saveDashboard('saved with pinned filters', {
+          saveAsNew: true,
+        });
+        expect(await filterBar.isFilterPinned(filterKey)).to.be(true);
+        await pieChart.expectPieSliceCount(1);
+      });
+
+      it("navigating to a dashboard with global filter doesn't unpin it if same filter is saved with dashboard", async () => {
+        await PageObjects.dashboard.preserveCrossAppState();
+        await PageObjects.dashboard.gotoDashboardLandingPage();
+        await PageObjects.dashboard.loadSavedDashboard('with filters');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        expect(await filterBar.isFilterPinned('bytes')).to.be(true);
+        await pieChart.expectPieSliceCount(1);
+      });
+
+      it("pinned filters aren't saved", async () => {
+        await filterBar.removeFilter('bytes');
+        await PageObjects.dashboard.gotoDashboardLandingPage();
+        await PageObjects.dashboard.loadSavedDashboard('saved with pinned filters');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        expect(await filterBar.getFilterCount()).to.be(0);
+        await pieChart.expectPieSliceCount(5);
+      });
     });
 
     describe('saved search filtering', function() {
diff --git a/test/functional/services/filter_bar.ts b/test/functional/services/filter_bar.ts
index 9d494b1e6d950..a463a593e9e04 100644
--- a/test/functional/services/filter_bar.ts
+++ b/test/functional/services/filter_bar.ts
@@ -32,10 +32,16 @@ export function FilterBarProvider({ getService, getPageObjects }: FtrProviderCon
      * @param value filter value
      * @param enabled filter status
      */
-    public async hasFilter(key: string, value: string, enabled: boolean = true): Promise<boolean> {
+    public async hasFilter(
+      key: string,
+      value: string,
+      enabled: boolean = true,
+      pinned: boolean = false
+    ): Promise<boolean> {
       const filterActivationState = enabled ? 'enabled' : 'disabled';
+      const filterPinnedState = pinned ? 'pinned' : 'unpinned';
       return testSubjects.exists(
-        `filter filter-${filterActivationState} filter-key-${key} filter-value-${value}`,
+        `filter filter-${filterActivationState} filter-key-${key} filter-value-${value} filter-${filterPinnedState}`,
         {
           allowHidden: true,
         }
@@ -80,6 +86,11 @@ export function FilterBarProvider({ getService, getPageObjects }: FtrProviderCon
       await PageObjects.header.awaitGlobalLoadingIndicatorHidden();
     }
 
+    public async isFilterPinned(key: string): Promise<boolean> {
+      const filter = await testSubjects.find(`~filter & ~filter-key-${key}`);
+      return (await filter.getAttribute('data-test-subj')).includes('filter-pinned');
+    }
+
     public async getFilterCount(): Promise<number> {
       const filters = await testSubjects.findAll('~filter');
       return filters.length;

From 358d13919bc597d13e6a98ec97fae2615093027e Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Mon, 13 Apr 2020 13:28:09 +0200
Subject: [PATCH 33/36] Migrate SO management section to NP (#61700)

* move libs to new plugin

* adapt libs to use NP apis

* add required plugins

* add get_allowed_types route

* move object_view components

* add service registry

* migrate table header component

* migrate table component

* migrate saved_objects_table component

* remove migrated legacy files

* fix re-export from legacy management + section label

* migrate services registration

* adapt management section mock

* fix imports

* migrate flyout component

* migrate relationships component

* migrate saved_objects_table tests

* migrate breadcrumb

* add redirect if unauthorized check

* migrate translations to new savedObjectsManagement prefix

* remove obsolete translations

* convert action registry to service pattern

* wire extra actions

* remove importAndExportableTypes from injected vars

* handle newIndexPatternUrl

* remove duplicate dashboard dependency

* remove old TODO

* remove old TODO

* properly mock lodash in tests

* add async management section loading

* expose createSavedSearchesLoader from discover plugin contract

* address most review comments

* fix merge conflicts
---
 src/core/public/mocks.ts                      |   6 +-
 .../server/saved_objects/service/index.ts     |   1 -
 src/core/server/server.api.md                 |   2 -
 src/legacy/core_plugins/kibana/inject_vars.js |   3 -
 .../core_plugins/kibana/public/index.ts       |   2 +-
 .../management/saved_object_registry.ts       |  64 +--
 .../public/management/sections/index.js       |   1 -
 .../management/sections/objects/_objects.html |   5 -
 .../management/sections/objects/_objects.js   | 104 -----
 .../management/sections/objects/_view.html    |   5 -
 .../management/sections/objects/_view.js      |  85 ----
 .../sections/objects/breadcrumbs.js           |  50 ---
 .../objects/components/objects_table/index.js |  20 -
 .../saved_objects/saved_objects_mixin.js      |   5 -
 src/plugins/data/public/mocks.ts              |   1 +
 src/plugins/discover/public/mocks.ts          |   3 +
 src/plugins/discover/public/plugin.ts         |  12 +
 src/plugins/management/public/mocks/index.ts  |  13 +-
 .../saved_objects_management/common/index.ts} |   2 +-
 .../saved_objects_management/common}/types.ts |  30 +-
 .../saved_objects_management/kibana.json      |   3 +-
 .../saved_objects_management/public/index.ts  |   6 +-
 .../public}/lib/case_conversion.test.ts       |   0
 .../public}/lib/case_conversion.ts            |   0
 .../public}/lib/create_field_list.test.ts     |   4 +-
 .../public}/lib/create_field_list.ts          |   8 +-
 .../lib/extract_export_details.test.ts        |   0
 .../public}/lib/extract_export_details.ts     |   0
 .../lib/fetch_export_by_type_and_search.ts    |   7 +-
 .../public}/lib/fetch_export_objects.ts       |   7 +-
 .../public}/lib/find_objects.ts               |  29 +-
 .../public/lib/get_allowed_types.ts           |  31 ++
 .../public}/lib/get_default_title.ts          |   0
 .../public}/lib/get_relationships.test.ts     |  37 +-
 .../public}/lib/get_relationships.ts          |  32 +-
 .../public}/lib/get_saved_object_counts.ts    |  17 +-
 .../public}/lib/get_saved_object_label.ts     |   0
 .../public}/lib/import_file.ts                |  14 +-
 .../public}/lib/import_legacy_file.test.ts    |   0
 .../public}/lib/import_legacy_file.ts         |   0
 .../public}/lib/in_app_url.test.ts            |   2 +-
 .../public}/lib/in_app_url.ts                 |   0
 .../public}/lib/index.ts                      |   2 +
 .../public}/lib/log_legacy_import.ts          |   9 +-
 .../public}/lib/numeric.ts                    |   0
 .../public}/lib/parse_query.test.ts           |   2 +-
 .../public}/lib/parse_query.ts                |  15 +-
 .../lib/process_import_response.test.ts       |   0
 .../public}/lib/process_import_response.ts    |   0
 .../public}/lib/resolve_import_errors.test.ts |  35 +-
 .../public}/lib/resolve_import_errors.ts      |  12 +-
 .../public}/lib/resolve_saved_objects.test.ts |   7 +-
 .../public}/lib/resolve_saved_objects.ts      |  26 +-
 .../public/management_section/index.ts}       |   2 +-
 .../management_section/mount_section.tsx      | 211 +++++++++
 .../__snapshots__/header.test.tsx.snap        |   6 +-
 .../__snapshots__/intro.test.tsx.snap         |   6 +-
 .../not_found_errors.test.tsx.snap            |  30 +-
 .../object_view/components}/field.test.tsx    |   0
 .../object_view/components}/field.tsx         |   4 +-
 .../object_view/components}/form.tsx          |  18 +-
 .../object_view/components}/header.test.tsx   |   0
 .../object_view/components}/header.tsx        |   8 +-
 .../object_view/components}/index.ts          |   0
 .../object_view/components}/intro.test.tsx    |   0
 .../object_view/components}/intro.tsx         |   4 +-
 .../components}/not_found_errors.test.tsx     |   0
 .../components}/not_found_errors.tsx          |  10 +-
 .../management_section/object_view/index.ts}  |   2 +-
 .../object_view}/saved_object_view.tsx        |  18 +-
 .../saved_objects_table.test.tsx.snap}        | 116 ++++-
 .../__snapshots__/flyout.test.tsx.snap}       |  84 ++--
 .../__snapshots__/header.test.tsx.snap}       |  10 +-
 .../relationships.test.tsx.snap}              |   2 +-
 .../__snapshots__/table.test.tsx.snap}        |  24 +-
 .../components/flyout.test.mocks.ts           |  44 ++
 .../objects_table/components/flyout.test.tsx} | 183 ++++----
 .../objects_table/components/flyout.tsx}      | 260 ++++++-----
 .../objects_table/components/header.test.tsx} |   3 +-
 .../objects_table/components/header.tsx}      |  31 +-
 .../objects_table/components/index.ts         |  23 +
 .../components/relationships.test.tsx}        |  44 +-
 .../components/relationships.tsx}             |  89 ++--
 .../objects_table/components/table.test.tsx}  |  31 +-
 .../objects_table/components/table.tsx}       | 154 ++++---
 .../objects_table/index.ts}                   |   2 +-
 .../saved_objects_table.test.mocks.ts         |  67 +++
 .../saved_objects_table.test.tsx}             | 419 ++++++++----------
 .../objects_table/saved_objects_table.tsx}    | 260 ++++++-----
 .../public/management_section/types.ts        |  38 ++
 .../saved_objects_management/public/mocks.ts  |  12 +-
 .../public/plugin.test.ts                     |  10 +-
 .../saved_objects_management/public/plugin.ts |  71 ++-
 .../public/register_services.ts               |  59 +++
 .../public/services/action_service.mock.ts    |  57 +++
 ...egistry.test.ts => action_service.test.ts} |  30 +-
 .../{action_registry.ts => action_service.ts} |  48 +-
 .../public/services/index.ts                  |  14 +-
 ...istry.mock.ts => service_registry.mock.ts} |  13 +-
 .../public/services/service_registry.ts       |  49 ++
 .../services/{action_types.ts => types.ts}    |   0
 .../saved_objects_management/public/types.ts  |  20 +
 .../server/routes/get_allowed_types.ts}       |  34 +-
 .../server/routes/index.test.ts               |   8 +-
 .../server/routes/index.ts                    |   2 +
 .../saved_objects_management/server/types.ts  |  30 +-
 ...opy_saved_objects_to_space_service.test.ts |   4 +-
 .../copy_saved_objects_to_space_service.ts    |   2 +-
 .../translations/translations/ja-JP.json      | 245 +++++-----
 .../translations/translations/zh-CN.json      | 243 +++++-----
 110 files changed, 2184 insertions(+), 1689 deletions(-)
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.html
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/objects/_view.html
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/objects/breadcrumbs.js
 delete mode 100644 src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/index.js
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/index.js => plugins/saved_objects_management/common/index.ts} (89%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/common}/types.ts (74%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/case_conversion.test.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/case_conversion.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/create_field_list.test.ts (96%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/create_field_list.ts (92%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/extract_export_details.test.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/extract_export_details.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/fetch_export_by_type_and_search.ts (89%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/fetch_export_objects.ts (89%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/find_objects.ts (57%)
 create mode 100644 src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/get_default_title.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/get_relationships.test.ts (67%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/get_relationships.ts (67%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/get_saved_object_counts.ts (72%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/get_saved_object_label.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/import_file.ts (75%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/import_legacy_file.test.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/import_legacy_file.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/in_app_url.test.ts (98%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/in_app_url.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/index.ts (94%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/log_legacy_import.ts (81%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/numeric.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/parse_query.test.ts (92%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/parse_query.ts (77%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/process_import_response.test.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/process_import_response.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/resolve_import_errors.test.ts (90%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/resolve_import_errors.ts (95%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/resolve_saved_objects.test.ts (98%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public}/lib/resolve_saved_objects.ts (94%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/index.js => plugins/saved_objects_management/public/management_section/index.ts} (93%)
 create mode 100644 src/plugins/saved_objects_management/public/management_section/mount_section.tsx
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/__snapshots__/header.test.tsx.snap (96%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/__snapshots__/intro.test.tsx.snap (90%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/__snapshots__/not_found_errors.test.tsx.snap (89%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/field.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/field.tsx (97%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/form.tsx (89%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/header.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/header.tsx (92%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/index.ts (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/intro.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/intro.tsx (92%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/not_found_errors.test.tsx (100%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/object_view => plugins/saved_objects_management/public/management_section/object_view/components}/not_found_errors.tsx (87%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/index.js => plugins/saved_objects_management/public/management_section/object_view/index.ts} (93%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects => plugins/saved_objects_management/public/management_section/object_view}/saved_object_view.tsx (89%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap => plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap} (73%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap => plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap} (85%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap => plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap} (88%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap => plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap} (99%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap => plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap} (93%)
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.mocks.ts
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js => plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx} (75%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/flyout.js => plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx} (77%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/header.test.js => plugins/saved_objects_management/public/management_section/objects_table/components/header.test.tsx} (96%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/header.js => plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx} (83%)
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/index.ts
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js => plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx} (88%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js => plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx} (75%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js => plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx} (87%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js => plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx} (71%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/index.js => plugins/saved_objects_management/public/management_section/objects_table/index.ts} (93%)
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js => plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx} (58%)
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js => plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx} (73%)
 create mode 100644 src/plugins/saved_objects_management/public/management_section/types.ts
 create mode 100644 src/plugins/saved_objects_management/public/register_services.ts
 create mode 100644 src/plugins/saved_objects_management/public/services/action_service.mock.ts
 rename src/plugins/saved_objects_management/public/services/{action_registry.test.ts => action_service.test.ts} (69%)
 rename src/plugins/saved_objects_management/public/services/{action_registry.ts => action_service.ts} (56%)
 rename src/plugins/saved_objects_management/public/services/{action_registry.mock.ts => service_registry.mock.ts} (79%)
 create mode 100644 src/plugins/saved_objects_management/public/services/service_registry.ts
 rename src/plugins/saved_objects_management/public/services/{action_types.ts => types.ts} (100%)
 create mode 100644 src/plugins/saved_objects_management/public/types.ts
 rename src/{legacy/core_plugins/kibana/public/management/sections/objects/index.js => plugins/saved_objects_management/server/routes/get_allowed_types.ts} (61%)

diff --git a/src/core/public/mocks.ts b/src/core/public/mocks.ts
index 0c4930592b233..959ffaa7e7e08 100644
--- a/src/core/public/mocks.ts
+++ b/src/core/public/mocks.ts
@@ -48,6 +48,7 @@ export { overlayServiceMock } from './overlays/overlay_service.mock';
 export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 export { savedObjectsServiceMock } from './saved_objects/saved_objects_service.mock';
 export { scopedHistoryMock } from './application/scoped_history.mock';
+export { applicationServiceMock } from './application/application_service.mock';
 
 function createCoreSetupMock({
   basePath = '',
@@ -62,9 +63,8 @@ function createCoreSetupMock({
     application: applicationServiceMock.createSetupContract(),
     context: contextServiceMock.createSetupContract(),
     fatalErrors: fatalErrorsServiceMock.createSetupContract(),
-    getStartServices: jest.fn<Promise<[ReturnType<typeof createCoreStartMock>, object, any]>, []>(
-      () =>
-        Promise.resolve([createCoreStartMock({ basePath }), pluginStartDeps, pluginStartContract])
+    getStartServices: jest.fn<Promise<[ReturnType<typeof createCoreStartMock>, any, any]>, []>(() =>
+      Promise.resolve([createCoreStartMock({ basePath }), pluginStartDeps, pluginStartContract])
     ),
     http: httpServiceMock.createSetupContract({ basePath }),
     notifications: notificationServiceMock.createSetupContract(),
diff --git a/src/core/server/saved_objects/service/index.ts b/src/core/server/saved_objects/service/index.ts
index f44824238aa21..9f625b4732e26 100644
--- a/src/core/server/saved_objects/service/index.ts
+++ b/src/core/server/saved_objects/service/index.ts
@@ -36,7 +36,6 @@ export interface SavedObjectsLegacyService {
   getScopedSavedObjectsClient: SavedObjectsClientProvider['getClient'];
   SavedObjectsClient: typeof SavedObjectsClient;
   types: string[];
-  importAndExportableTypes: string[];
   schema: SavedObjectsSchema;
   getSavedObjectsRepository(...rest: any[]): any;
   importExport: {
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index a35bca7375286..37051da4b17da 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -2084,8 +2084,6 @@ export interface SavedObjectsLegacyService {
     // (undocumented)
     getScopedSavedObjectsClient: SavedObjectsClientProvider['getClient'];
     // (undocumented)
-    importAndExportableTypes: string[];
-    // (undocumented)
     importExport: {
         objectLimit: number;
         importSavedObjects(options: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
diff --git a/src/legacy/core_plugins/kibana/inject_vars.js b/src/legacy/core_plugins/kibana/inject_vars.js
index 76d1704907ab5..c3b906ee842e3 100644
--- a/src/legacy/core_plugins/kibana/inject_vars.js
+++ b/src/legacy/core_plugins/kibana/inject_vars.js
@@ -20,10 +20,7 @@
 export function injectVars(server) {
   const serverConfig = server.config();
 
-  const { importAndExportableTypes } = server.savedObjects;
-
   return {
-    importAndExportableTypes,
     autocompleteTerminateAfter: serverConfig.get('kibana.autocompleteTerminateAfter'),
     autocompleteTimeout: serverConfig.get('kibana.autocompleteTimeout'),
   };
diff --git a/src/legacy/core_plugins/kibana/public/index.ts b/src/legacy/core_plugins/kibana/public/index.ts
index a4fffc6eec26d..be22652ab2c1c 100644
--- a/src/legacy/core_plugins/kibana/public/index.ts
+++ b/src/legacy/core_plugins/kibana/public/index.ts
@@ -20,4 +20,4 @@
 export {
   ProcessedImportResponse,
   processImportResponse,
-} from './management/sections/objects/lib/process_import_response';
+} from '../../../../plugins/saved_objects_management/public/lib';
diff --git a/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts b/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
index 705be68a141e7..587a372f91555 100644
--- a/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
+++ b/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
@@ -17,66 +17,8 @@
  * under the License.
  */
 
-import _ from 'lodash';
-import { i18n } from '@kbn/i18n';
-import { npStart } from 'ui/new_platform';
-import { SavedObjectLoader } from '../../../../../plugins/saved_objects/public';
-import { createSavedSearchesLoader } from '../../../../../plugins/discover/public';
+import { npSetup } from 'ui/new_platform';
 
-/**
- * This registry is used for the editing mode of Saved Searches, Visualizations,
- * Dashboard and Time Lion saved objects.
- */
-interface SavedObjectRegistryEntry {
-  id: string;
-  service: SavedObjectLoader;
-  title: string;
-}
-
-export interface ISavedObjectsManagementRegistry {
-  register(service: SavedObjectRegistryEntry): void;
-  all(): SavedObjectRegistryEntry[];
-  get(id: string): SavedObjectRegistryEntry | undefined;
-}
-
-const registry: SavedObjectRegistryEntry[] = [];
-
-export const savedObjectManagementRegistry: ISavedObjectsManagementRegistry = {
-  register: (service: SavedObjectRegistryEntry) => {
-    registry.push(service);
-  },
-  all: () => {
-    return registry;
-  },
-  get: (id: string) => {
-    return _.find(registry, { id });
-  },
-};
-
-const services = {
-  savedObjectsClient: npStart.core.savedObjects.client,
-  indexPatterns: npStart.plugins.data.indexPatterns,
-  search: npStart.plugins.data.search,
-  chrome: npStart.core.chrome,
-  overlays: npStart.core.overlays,
-};
-
-savedObjectManagementRegistry.register({
-  id: 'savedVisualizations',
-  service: npStart.plugins.visualizations.savedVisualizationsLoader,
-  title: 'visualizations',
-});
-
-savedObjectManagementRegistry.register({
-  id: 'savedDashboards',
-  service: npStart.plugins.dashboard.getSavedDashboardLoader(),
-  title: i18n.translate('kbn.dashboard.savedDashboardsTitle', {
-    defaultMessage: 'dashboards',
-  }),
-});
+const registry = npSetup.plugins.savedObjectsManagement?.serviceRegistry;
 
-savedObjectManagementRegistry.register({
-  id: 'savedSearches',
-  service: createSavedSearchesLoader(services),
-  title: 'searches',
-});
+export const savedObjectManagementRegistry = registry!;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index.js b/src/legacy/core_plugins/kibana/public/management/sections/index.js
index 54717ad003ade..adc1741f57263 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index.js
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-import './objects';
 import './index_patterns';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.html b/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.html
deleted file mode 100644
index 090fb7b636685..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<kbn-management-app section="kibana/objects">
-  <kbn-management-objects>
-    <div id="reactSavedObjectsTable"></div>
-  </kbn-management-objects>
-</kbn-management-app>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js
deleted file mode 100644
index c5901ca6ee6bf..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js
+++ /dev/null
@@ -1,104 +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 { savedObjectManagementRegistry } from '../../saved_object_registry';
-import objectIndexHTML from './_objects.html';
-import uiRoutes from 'ui/routes';
-import chrome from 'ui/chrome';
-import { uiModules } from 'ui/modules';
-import React from 'react';
-import { render, unmountComponentAtNode } from 'react-dom';
-import { ObjectsTable } from './components/objects_table';
-import { I18nContext } from 'ui/i18n';
-import { get } from 'lodash';
-import { npStart } from 'ui/new_platform';
-import { getIndexBreadcrumbs } from './breadcrumbs';
-
-const REACT_OBJECTS_TABLE_DOM_ELEMENT_ID = 'reactSavedObjectsTable';
-
-function updateObjectsTable($scope, $injector) {
-  const indexPatterns = npStart.plugins.data.indexPatterns;
-  const $http = $injector.get('$http');
-  const kbnUrl = $injector.get('kbnUrl');
-  const config = $injector.get('config');
-
-  const savedObjectsClient = npStart.core.savedObjects.client;
-  const services = savedObjectManagementRegistry.all().map(obj => obj.service);
-  const uiCapabilites = npStart.core.application.capabilities;
-
-  $scope.$$postDigest(() => {
-    const node = document.getElementById(REACT_OBJECTS_TABLE_DOM_ELEMENT_ID);
-    if (!node) {
-      return;
-    }
-
-    render(
-      <I18nContext>
-        <ObjectsTable
-          savedObjectsClient={savedObjectsClient}
-          confirmModalPromise={npStart.core.overlays.openConfirm}
-          services={services}
-          indexPatterns={indexPatterns}
-          $http={$http}
-          perPageConfig={config.get('savedObjects:perPage')}
-          basePath={chrome.getBasePath()}
-          newIndexPatternUrl={kbnUrl.eval('#/management/kibana/index_pattern')}
-          uiCapabilities={uiCapabilites}
-          goInspectObject={object => {
-            if (object.meta.editUrl) {
-              kbnUrl.change(object.meta.editUrl);
-              $scope.$apply();
-            }
-          }}
-          canGoInApp={object => {
-            const { inAppUrl } = object.meta;
-            return inAppUrl && get(uiCapabilites, inAppUrl.uiCapabilitiesPath);
-          }}
-        />
-      </I18nContext>,
-      node
-    );
-  });
-}
-
-function destroyObjectsTable() {
-  const node = document.getElementById(REACT_OBJECTS_TABLE_DOM_ELEMENT_ID);
-  node && unmountComponentAtNode(node);
-}
-
-uiRoutes
-  .when('/management/kibana/objects', {
-    template: objectIndexHTML,
-    k7Breadcrumbs: getIndexBreadcrumbs,
-    requireUICapability: 'management.kibana.objects',
-  })
-  .when('/management/kibana/objects/:service', {
-    redirectTo: '/management/kibana/objects',
-  });
-
-uiModules.get('apps/management').directive('kbnManagementObjects', function() {
-  return {
-    restrict: 'E',
-    controllerAs: 'managementObjectsController',
-    controller: function($scope, $injector) {
-      updateObjectsTable($scope, $injector);
-      $scope.$on('$destroy', destroyObjectsTable);
-    },
-  };
-});
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.html b/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.html
deleted file mode 100644
index 8bce0aabcd64a..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<kbn-management-app section="kibana/objects" data-test-subj="savedObjectsEdit">
-  <kbn-management-objects-view>
-    <div id="reactSavedObjectsView"></div>
-  </kbn-management-objects-view>
-</kbn-management-app>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
deleted file mode 100644
index a847055b40015..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
+++ /dev/null
@@ -1,85 +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 React from 'react';
-import { render, unmountComponentAtNode } from 'react-dom';
-import 'angular';
-import 'angular-elastic/elastic';
-import uiRoutes from 'ui/routes';
-import { uiModules } from 'ui/modules';
-import { I18nContext } from 'ui/i18n';
-import { npStart } from 'ui/new_platform';
-import objectViewHTML from './_view.html';
-import { getViewBreadcrumbs } from './breadcrumbs';
-import { savedObjectManagementRegistry } from '../../saved_object_registry';
-import { SavedObjectEdition } from './saved_object_view';
-
-const REACT_OBJECTS_VIEW_DOM_ELEMENT_ID = 'reactSavedObjectsView';
-
-uiRoutes.when('/management/kibana/objects/:service/:id', {
-  template: objectViewHTML,
-  k7Breadcrumbs: getViewBreadcrumbs,
-  requireUICapability: 'management.kibana.objects',
-});
-
-function createReactView($scope, $routeParams) {
-  const { service: serviceName, id: objectId, notFound } = $routeParams;
-
-  const { savedObjects, overlays, notifications, application } = npStart.core;
-
-  $scope.$$postDigest(() => {
-    const node = document.getElementById(REACT_OBJECTS_VIEW_DOM_ELEMENT_ID);
-    if (!node) {
-      return;
-    }
-
-    render(
-      <I18nContext>
-        <SavedObjectEdition
-          id={objectId}
-          serviceName={serviceName}
-          serviceRegistry={savedObjectManagementRegistry}
-          savedObjectsClient={savedObjects.client}
-          overlays={overlays}
-          notifications={notifications}
-          capabilities={application.capabilities}
-          notFoundType={notFound}
-        />
-      </I18nContext>,
-      node
-    );
-  });
-}
-
-function destroyReactView() {
-  const node = document.getElementById(REACT_OBJECTS_VIEW_DOM_ELEMENT_ID);
-  node && unmountComponentAtNode(node);
-}
-
-uiModules
-  .get('apps/management', ['monospaced.elastic'])
-  .directive('kbnManagementObjectsView', function() {
-    return {
-      restrict: 'E',
-      controller: function($scope, $routeParams) {
-        createReactView($scope, $routeParams);
-        $scope.$on('$destroy', destroyReactView);
-      },
-    };
-  });
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/breadcrumbs.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/breadcrumbs.js
deleted file mode 100644
index e9082bfeb680d..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/breadcrumbs.js
+++ /dev/null
@@ -1,50 +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 { MANAGEMENT_BREADCRUMB } from 'ui/management';
-import { i18n } from '@kbn/i18n';
-
-import { savedObjectManagementRegistry } from '../../saved_object_registry';
-
-export function getIndexBreadcrumbs() {
-  return [
-    MANAGEMENT_BREADCRUMB,
-    {
-      text: i18n.translate('kbn.management.savedObjects.indexBreadcrumb', {
-        defaultMessage: 'Saved objects',
-      }),
-      href: '#/management/kibana/objects',
-    },
-  ];
-}
-
-export function getViewBreadcrumbs($routeParams) {
-  const serviceObj = savedObjectManagementRegistry.get($routeParams.service);
-  const { service } = serviceObj;
-
-  return [
-    ...getIndexBreadcrumbs(),
-    {
-      text: i18n.translate('kbn.management.savedObjects.editBreadcrumb', {
-        defaultMessage: 'Edit {savedObjectType}',
-        values: { savedObjectType: service.type },
-      }),
-    },
-  ];
-}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/index.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/index.js
deleted file mode 100644
index 601dea544361c..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/index.js
+++ /dev/null
@@ -1,20 +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.
- */
-
-export { ObjectsTable } from './objects_table';
diff --git a/src/legacy/server/saved_objects/saved_objects_mixin.js b/src/legacy/server/saved_objects/saved_objects_mixin.js
index bcf766231dc9c..3e71e1989ae7a 100644
--- a/src/legacy/server/saved_objects/saved_objects_mixin.js
+++ b/src/legacy/server/saved_objects/saved_objects_mixin.js
@@ -78,13 +78,8 @@ export function savedObjectsMixin(kbnServer, server) {
 
   const provider = kbnServer.newPlatform.__internals.savedObjectsClientProvider;
 
-  const importAndExportableTypes = typeRegistry
-    .getImportableAndExportableTypes()
-    .map(type => type.name);
-
   const service = {
     types: visibleTypes,
-    importAndExportableTypes,
     SavedObjectsClient,
     SavedObjectsRepository,
     getSavedObjectsRepository: createRepository,
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index ea1c27550867e..2d43cae79ac98 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -62,6 +62,7 @@ const createStartContract = (): Start => {
         },
       }),
       get: jest.fn().mockReturnValue(Promise.resolve({})),
+      clearCache: jest.fn(),
     } as unknown) as IndexPatternsContract,
   };
 };
diff --git a/src/plugins/discover/public/mocks.ts b/src/plugins/discover/public/mocks.ts
index bb05e3d412001..218c59b5db07b 100644
--- a/src/plugins/discover/public/mocks.ts
+++ b/src/plugins/discover/public/mocks.ts
@@ -37,6 +37,9 @@ const createStartContract = (): Start => {
     docViews: {
       DocViewer: jest.fn(() => null),
     },
+    savedSearches: {
+      createLoader: jest.fn(),
+    },
   };
   return startContract;
 };
diff --git a/src/plugins/discover/public/plugin.ts b/src/plugins/discover/public/plugin.ts
index d2797586bfdfb..aa54823e6ec4d 100644
--- a/src/plugins/discover/public/plugin.ts
+++ b/src/plugins/discover/public/plugin.ts
@@ -21,12 +21,14 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { auto } from 'angular';
 import { CoreSetup, Plugin } from 'kibana/public';
+import { SavedObjectLoader, SavedObjectKibanaServices } from '../../saved_objects/public';
 import { DocViewInput, DocViewInputFn, DocViewRenderProps } from './doc_views/doc_views_types';
 import { DocViewsRegistry } from './doc_views/doc_views_registry';
 import { DocViewTable } from './components/table/table';
 import { JsonCodeBlock } from './components/json_code_block/json_code_block';
 import { DocViewer } from './components/doc_viewer/doc_viewer';
 import { setDocViewsRegistry } from './services';
+import { createSavedSearchesLoader } from './saved_searches';
 
 import './index.scss';
 
@@ -62,6 +64,13 @@ export interface DiscoverStart {
      */
     DocViewer: React.ComponentType<DocViewRenderProps>;
   };
+  savedSearches: {
+    /**
+     * Create a {@link SavedObjectLoader | loader} to handle the saved searches type.
+     * @param services
+     */
+    createLoader(services: SavedObjectKibanaServices): SavedObjectLoader;
+  };
 }
 
 /**
@@ -105,6 +114,9 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
       docViews: {
         DocViewer,
       },
+      savedSearches: {
+        createLoader: createSavedSearchesLoader,
+      },
     };
   }
 }
diff --git a/src/plugins/management/public/mocks/index.ts b/src/plugins/management/public/mocks/index.ts
index 6099a2cc32afc..82789d3c3f55f 100644
--- a/src/plugins/management/public/mocks/index.ts
+++ b/src/plugins/management/public/mocks/index.ts
@@ -18,12 +18,21 @@
  */
 
 import { ManagementSetup, ManagementStart } from '../types';
+import { ManagementSection } from '../management_section';
+
+const createManagementSectionMock = (): jest.Mocked<PublicMethodsOf<ManagementSection>> => {
+  return {
+    registerApp: jest.fn(),
+    getApp: jest.fn(),
+    getAppsEnabled: jest.fn().mockReturnValue([]),
+  };
+};
 
 const createSetupContract = (): DeeplyMockedKeys<ManagementSetup> => ({
   sections: {
     register: jest.fn(),
-    getSection: jest.fn(),
-    getAllSections: jest.fn(),
+    getSection: jest.fn().mockReturnValue(createManagementSectionMock()),
+    getAllSections: jest.fn().mockReturnValue([]),
   },
 });
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/index.js b/src/plugins/saved_objects_management/common/index.ts
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/index.js
rename to src/plugins/saved_objects_management/common/index.ts
index ac1e7bac06c87..67c3ae6d934ab 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/index.js
+++ b/src/plugins/saved_objects_management/common/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { Header } from './header';
+export { SavedObjectRelation, SavedObjectWithMetadata, SavedObjectMetadata } from './types';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/types.ts b/src/plugins/saved_objects_management/common/types.ts
similarity index 74%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/types.ts
rename to src/plugins/saved_objects_management/common/types.ts
index 6a89142bc9798..be52d8e6486e2 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/types.ts
+++ b/src/plugins/saved_objects_management/common/types.ts
@@ -17,8 +17,12 @@
  * under the License.
  */
 
-import { SavedObject, SavedObjectReference } from 'src/core/public';
+import { SavedObject } from 'src/core/types';
 
+/**
+ * The metadata injected into a {@link SavedObject | saved object} when returning
+ * {@link SavedObjectWithMetadata | enhanced objects} from the plugin API endpoints.
+ */
 export interface SavedObjectMetadata {
   icon?: string;
   title?: string;
@@ -26,31 +30,19 @@ export interface SavedObjectMetadata {
   inAppUrl?: { path: string; uiCapabilitiesPath: string };
 }
 
+/**
+ * A {@link SavedObject | saved object} enhanced with meta properties used by the client-side plugin.
+ */
 export type SavedObjectWithMetadata<T = unknown> = SavedObject<T> & {
   meta: SavedObjectMetadata;
 };
 
+/**
+ * Represents a relation between two {@link SavedObject | saved object}
+ */
 export interface SavedObjectRelation {
   id: string;
   type: string;
   relationship: 'child' | 'parent';
   meta: SavedObjectMetadata;
 }
-
-export interface ObjectField {
-  type: FieldType;
-  name: string;
-  value: any;
-}
-
-export type FieldType = 'text' | 'number' | 'boolean' | 'array' | 'json';
-
-export interface FieldState {
-  value?: any;
-  invalid?: boolean;
-}
-
-export interface SubmittedFormData {
-  attributes: any;
-  references: SavedObjectReference[];
-}
diff --git a/src/plugins/saved_objects_management/kibana.json b/src/plugins/saved_objects_management/kibana.json
index e1f14b0e3c59d..22135ce4558ae 100644
--- a/src/plugins/saved_objects_management/kibana.json
+++ b/src/plugins/saved_objects_management/kibana.json
@@ -3,5 +3,6 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["home"]
+  "requiredPlugins": ["home", "management", "data"],
+  "optionalPlugins": ["dashboard", "visualizations", "discover"]
 }
diff --git a/src/plugins/saved_objects_management/public/index.ts b/src/plugins/saved_objects_management/public/index.ts
index 7fb2f137d7d84..b20b320bc6645 100644
--- a/src/plugins/saved_objects_management/public/index.ts
+++ b/src/plugins/saved_objects_management/public/index.ts
@@ -22,10 +22,14 @@ import { SavedObjectsManagementPlugin } from './plugin';
 
 export { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './plugin';
 export {
-  ISavedObjectsManagementActionRegistry,
+  SavedObjectsManagementActionServiceSetup,
+  SavedObjectsManagementActionServiceStart,
   SavedObjectsManagementAction,
   SavedObjectsManagementRecord,
+  ISavedObjectsManagementServiceRegistry,
+  SavedObjectsManagementServiceRegistryEntry,
 } from './services';
+export { SavedObjectRelation, SavedObjectWithMetadata, SavedObjectMetadata } from './types';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new SavedObjectsManagementPlugin();
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.ts b/src/plugins/saved_objects_management/public/lib/case_conversion.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.ts
rename to src/plugins/saved_objects_management/public/lib/case_conversion.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts b/src/plugins/saved_objects_management/public/lib/case_conversion.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts
rename to src/plugins/saved_objects_management/public/lib/case_conversion.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/create_field_list.test.ts b/src/plugins/saved_objects_management/public/lib/create_field_list.test.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/create_field_list.test.ts
rename to src/plugins/saved_objects_management/public/lib/create_field_list.test.ts
index 345716f91ea88..e7d6754ac4d05 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/create_field_list.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/create_field_list.test.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { SimpleSavedObject, SavedObjectReference } from '../../../../../../../../core/public';
-import { savedObjectsServiceMock } from '../../../../../../../../core/public/mocks';
+import { SimpleSavedObject, SavedObjectReference } from '../../../../core/public';
+import { savedObjectsServiceMock } from '../../../../core/public/mocks';
 import { createFieldList } from './create_field_list';
 
 const savedObjectClientMock = savedObjectsServiceMock.createStartContract().client;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/create_field_list.ts b/src/plugins/saved_objects_management/public/lib/create_field_list.ts
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/create_field_list.ts
rename to src/plugins/saved_objects_management/public/lib/create_field_list.ts
index 88a1184d5d70f..5d87c11a87198 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/create_field_list.ts
+++ b/src/plugins/saved_objects_management/public/lib/create_field_list.ts
@@ -18,10 +18,10 @@
  */
 
 import { forOwn, indexBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash';
-import { SimpleSavedObject } from '../../../../../../../../core/public';
-import { castEsToKbnFieldTypeName } from '../../../../../../../../plugins/data/public';
-import { ObjectField } from '../types';
-import { SavedObjectLoader } from '../../../../../../../../plugins/saved_objects/public';
+import { SimpleSavedObject } from '../../../../core/public';
+import { castEsToKbnFieldTypeName } from '../../../data/public';
+import { ObjectField } from '../management_section/types';
+import { SavedObjectLoader } from '../../../saved_objects/public';
 
 const maxRecursiveIterations = 20;
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/extract_export_details.test.ts b/src/plugins/saved_objects_management/public/lib/extract_export_details.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/extract_export_details.test.ts
rename to src/plugins/saved_objects_management/public/lib/extract_export_details.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/extract_export_details.ts b/src/plugins/saved_objects_management/public/lib/extract_export_details.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/extract_export_details.ts
rename to src/plugins/saved_objects_management/public/lib/extract_export_details.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/fetch_export_by_type_and_search.ts b/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/fetch_export_by_type_and_search.ts
rename to src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
index d3e527b9f96b7..e0f005fab2a3b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/fetch_export_by_type_and_search.ts
+++ b/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
@@ -17,16 +17,15 @@
  * under the License.
  */
 
-import { kfetch } from 'ui/kfetch';
+import { HttpStart } from 'src/core/public';
 
 export async function fetchExportByTypeAndSearch(
+  http: HttpStart,
   types: string[],
   search: string | undefined,
   includeReferencesDeep: boolean = false
 ): Promise<Blob> {
-  return await kfetch({
-    method: 'POST',
-    pathname: '/api/saved_objects/_export',
+  return http.post('/api/saved_objects/_export', {
     body: JSON.stringify({
       type: types,
       search,
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/fetch_export_objects.ts b/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/fetch_export_objects.ts
rename to src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
index 744f8ef38af47..745d3758371a3 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/fetch_export_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
@@ -17,15 +17,14 @@
  * under the License.
  */
 
-import { kfetch } from 'ui/kfetch';
+import { HttpStart } from 'src/core/public';
 
 export async function fetchExportObjects(
+  http: HttpStart,
   objects: any[],
   includeReferencesDeep: boolean = false
 ): Promise<Blob> {
-  return await kfetch({
-    method: 'POST',
-    pathname: '/api/saved_objects/_export',
+  return http.post('/api/saved_objects/_export', {
     body: JSON.stringify({
       objects,
       includeReferencesDeep,
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.ts b/src/plugins/saved_objects_management/public/lib/find_objects.ts
similarity index 57%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.ts
rename to src/plugins/saved_objects_management/public/lib/find_objects.ts
index 24e08f0524f62..5a77d3ae2f663 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/find_objects.ts
@@ -17,16 +17,27 @@
  * under the License.
  */
 
-import { kfetch } from 'ui/kfetch';
-import { SavedObjectsFindOptions } from 'src/core/public';
+import { HttpStart, SavedObjectsFindOptions } from 'src/core/public';
 import { keysToCamelCaseShallow } from './case_conversion';
+import { SavedObjectWithMetadata } from '../types';
 
-export async function findObjects(findOptions: SavedObjectsFindOptions) {
-  const response = await kfetch({
-    method: 'GET',
-    pathname: '/api/kibana/management/saved_objects/_find',
-    query: findOptions as Record<string, any>,
-  });
+interface SavedObjectsFindResponse {
+  total: number;
+  page: number;
+  perPage: number;
+  savedObjects: SavedObjectWithMetadata[];
+}
+
+export async function findObjects(
+  http: HttpStart,
+  findOptions: SavedObjectsFindOptions
+): Promise<SavedObjectsFindResponse> {
+  const response = await http.get<Record<string, any>>(
+    '/api/kibana/management/saved_objects/_find',
+    {
+      query: findOptions as Record<string, any>,
+    }
+  );
 
-  return keysToCamelCaseShallow(response);
+  return keysToCamelCaseShallow(response) as SavedObjectsFindResponse;
 }
diff --git a/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts b/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
new file mode 100644
index 0000000000000..7d952ebf2ca14
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
@@ -0,0 +1,31 @@
+/*
+ * 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 { HttpStart } from 'src/core/public';
+
+interface GetAllowedTypesResponse {
+  types: string[];
+}
+
+export async function getAllowedTypes(http: HttpStart) {
+  const response = await http.get<GetAllowedTypesResponse>(
+    '/api/kibana/management/saved_objects/_allowed_types'
+  );
+  return response.types;
+}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_default_title.ts b/src/plugins/saved_objects_management/public/lib/get_default_title.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_default_title.ts
rename to src/plugins/saved_objects_management/public/lib/get_default_title.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_relationships.test.ts b/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
similarity index 67%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_relationships.test.ts
rename to src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
index b45b51b4de293..d79447378dde5 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_relationships.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
@@ -17,44 +17,43 @@
  * under the License.
  */
 
+import { httpServiceMock } from '../../../../core/public/mocks';
 import { getRelationships } from './get_relationships';
 
 describe('getRelationships', () => {
-  it('should make an http request', async () => {
-    const $http = jest.fn() as any;
-    const basePath = 'test';
+  let httpMock: ReturnType<typeof httpServiceMock.createSetupContract>;
 
-    await getRelationships('dashboard', '1', ['search', 'index-pattern'], $http, basePath);
-    expect($http.mock.calls.length).toBe(1);
+  beforeEach(() => {
+    httpMock = httpServiceMock.createSetupContract();
+  });
+
+  it('should make an http request', async () => {
+    await getRelationships(httpMock, 'dashboard', '1', ['search', 'index-pattern']);
+    expect(httpMock.get).toHaveBeenCalledTimes(1);
   });
 
   it('should handle successful responses', async () => {
-    const $http = jest.fn().mockImplementation(() => ({ data: [1, 2] })) as any;
-    const basePath = 'test';
-
-    const response = await getRelationships(
-      'dashboard',
-      '1',
-      ['search', 'index-pattern'],
-      $http,
-      basePath
-    );
+    httpMock.get.mockResolvedValue([1, 2]);
+
+    const response = await getRelationships(httpMock, 'dashboard', '1', [
+      'search',
+      'index-pattern',
+    ]);
     expect(response).toEqual([1, 2]);
   });
 
   it('should handle errors', async () => {
-    const $http = jest.fn().mockImplementation(() => {
+    httpMock.get.mockImplementation(() => {
       const err = new Error();
       (err as any).data = {
         error: 'Test error',
         statusCode: 500,
       };
       throw err;
-    }) as any;
-    const basePath = 'test';
+    });
 
     await expect(
-      getRelationships('dashboard', '1', ['search', 'index-pattern'], $http, basePath)
+      getRelationships(httpMock, 'dashboard', '1', ['search', 'index-pattern'])
     ).rejects.toThrowErrorMatchingInlineSnapshot(`"Test error"`);
   });
 });
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_relationships.ts b/src/plugins/saved_objects_management/public/lib/get_relationships.ts
similarity index 67%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_relationships.ts
rename to src/plugins/saved_objects_management/public/lib/get_relationships.ts
index 07bdf2db68fa2..bf2e651aa6593 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_relationships.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_relationships.ts
@@ -17,36 +17,30 @@
  * under the License.
  */
 
-import { IHttpService } from 'angular';
+import { HttpStart } from 'src/core/public';
 import { get } from 'lodash';
 import { SavedObjectRelation } from '../types';
 
 export async function getRelationships(
+  http: HttpStart,
   type: string,
   id: string,
-  savedObjectTypes: string[],
-  $http: IHttpService,
-  basePath: string
+  savedObjectTypes: string[]
 ): Promise<SavedObjectRelation[]> {
-  const url = `${basePath}/api/kibana/management/saved_objects/relationships/${encodeURIComponent(
+  const url = `/api/kibana/management/saved_objects/relationships/${encodeURIComponent(
     type
   )}/${encodeURIComponent(id)}`;
-  const options = {
-    method: 'GET',
-    url,
-    params: {
-      savedObjectTypes,
-    },
-  };
-
   try {
-    const response = await $http<SavedObjectRelation[]>(options);
-    return response?.data;
-  } catch (resp) {
-    const respBody = get(resp, 'data', {}) as any;
-    const err = new Error(respBody.message || respBody.error || `${resp.status} Response`);
+    return await http.get<SavedObjectRelation[]>(url, {
+      query: {
+        savedObjectTypes,
+      },
+    });
+  } catch (respError) {
+    const respBody = get(respError, 'data', {}) as any;
+    const err = new Error(respBody.message || respBody.error || `${respError.status} Response`);
 
-    (err as any).statusCode = respBody.statusCode || resp.status;
+    (err as any).statusCode = respBody.statusCode || respError.status;
     (err as any).body = respBody;
 
     throw err;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_saved_object_counts.ts b/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
similarity index 72%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_saved_object_counts.ts
rename to src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
index d4dda1190bc43..dcf59142e73e3 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_saved_object_counts.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
@@ -17,18 +17,15 @@
  * under the License.
  */
 
-import { IHttpService } from 'angular';
-import chrome from 'ui/chrome';
+import { HttpStart } from 'src/core/public';
 
-const apiBase = chrome.addBasePath('/api/kibana/management/saved_objects/scroll');
 export async function getSavedObjectCounts(
-  $http: IHttpService,
+  http: HttpStart,
   typesToInclude: string[],
-  searchString: string
+  searchString?: string
 ): Promise<Record<string, number>> {
-  const results = await $http.post<Record<string, number>>(`${apiBase}/counts`, {
-    typesToInclude,
-    searchString,
-  });
-  return results.data;
+  return await http.post<Record<string, number>>(
+    `/api/kibana/management/saved_objects/scroll/counts`,
+    { body: JSON.stringify({ typesToInclude, searchString }) }
+  );
 }
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_saved_object_label.ts b/src/plugins/saved_objects_management/public/lib/get_saved_object_label.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/get_saved_object_label.ts
rename to src/plugins/saved_objects_management/public/lib/get_saved_object_label.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/import_file.ts b/src/plugins/saved_objects_management/public/lib/import_file.ts
similarity index 75%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/import_file.ts
rename to src/plugins/saved_objects_management/public/lib/import_file.ts
index 9bd5fbeed3a4c..96263452253ba 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/import_file.ts
+++ b/src/plugins/saved_objects_management/public/lib/import_file.ts
@@ -17,14 +17,18 @@
  * under the License.
  */
 
-import { kfetch } from 'ui/kfetch';
+import { HttpStart, SavedObjectsImportError } from 'src/core/public';
 
-export async function importFile(file: Blob, overwriteAll: boolean = false) {
+interface ImportResponse {
+  success: boolean;
+  successCount: number;
+  errors?: SavedObjectsImportError[];
+}
+
+export async function importFile(http: HttpStart, file: File, overwriteAll: boolean = false) {
   const formData = new FormData();
   formData.append('file', file);
-  return await kfetch({
-    method: 'POST',
-    pathname: '/api/saved_objects/_import',
+  return await http.post<ImportResponse>('/api/saved_objects/_import', {
     body: formData,
     headers: {
       // Important to be undefined, it forces proper headers to be set for FormData
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/import_legacy_file.test.ts b/src/plugins/saved_objects_management/public/lib/import_legacy_file.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/import_legacy_file.test.ts
rename to src/plugins/saved_objects_management/public/lib/import_legacy_file.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/import_legacy_file.ts b/src/plugins/saved_objects_management/public/lib/import_legacy_file.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/import_legacy_file.ts
rename to src/plugins/saved_objects_management/public/lib/import_legacy_file.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/in_app_url.test.ts b/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/in_app_url.test.ts
rename to src/plugins/saved_objects_management/public/lib/in_app_url.test.ts
index c0d6716391a1f..09e08e6ec333b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/in_app_url.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Capabilities } from '../../../../../../../../core/public';
+import { Capabilities } from '../../../../core/public';
 import { canViewInApp } from './in_app_url';
 
 const createCapabilities = (sections: Record<string, any>): Capabilities => {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/in_app_url.ts b/src/plugins/saved_objects_management/public/lib/in_app_url.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/in_app_url.ts
rename to src/plugins/saved_objects_management/public/lib/in_app_url.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/index.ts b/src/plugins/saved_objects_management/public/lib/index.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/index.ts
rename to src/plugins/saved_objects_management/public/lib/index.ts
index ecdfa6549a54e..7021744095651 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/index.ts
+++ b/src/plugins/saved_objects_management/public/lib/index.ts
@@ -43,3 +43,5 @@ export {
 export { getDefaultTitle } from './get_default_title';
 export { findObjects } from './find_objects';
 export { extractExportDetails, SavedObjectsExportResultDetails } from './extract_export_details';
+export { createFieldList } from './create_field_list';
+export { getAllowedTypes } from './get_allowed_types';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/log_legacy_import.ts b/src/plugins/saved_objects_management/public/lib/log_legacy_import.ts
similarity index 81%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/log_legacy_import.ts
rename to src/plugins/saved_objects_management/public/lib/log_legacy_import.ts
index 9bbafe3e69c98..9ec3c85b91c22 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/log_legacy_import.ts
+++ b/src/plugins/saved_objects_management/public/lib/log_legacy_import.ts
@@ -17,11 +17,8 @@
  * under the License.
  */
 
-import { kfetch } from 'ui/kfetch';
+import { HttpStart } from 'src/core/public';
 
-export async function logLegacyImport() {
-  return await kfetch({
-    method: 'POST',
-    pathname: '/api/saved_objects/_log_legacy_import',
-  });
+export async function logLegacyImport(http: HttpStart) {
+  return http.post('/api/saved_objects/_log_legacy_import');
 }
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/numeric.ts b/src/plugins/saved_objects_management/public/lib/numeric.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/numeric.ts
rename to src/plugins/saved_objects_management/public/lib/numeric.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/parse_query.test.ts b/src/plugins/saved_objects_management/public/lib/parse_query.test.ts
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/parse_query.test.ts
rename to src/plugins/saved_objects_management/public/lib/parse_query.test.ts
index 77b34eccd9c6f..f62234eaf4e94 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/parse_query.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/parse_query.test.ts
@@ -25,6 +25,6 @@ describe('getQueryText', () => {
       getTermClauses: () => [{ value: 'foo' }, { value: 'bar' }],
       getFieldClauses: () => [{ value: 'lala' }, { value: 'lolo' }],
     };
-    expect(parseQuery({ ast })).toEqual({ queryText: 'foo bar', visibleTypes: 'lala' });
+    expect(parseQuery({ ast } as any)).toEqual({ queryText: 'foo bar', visibleTypes: 'lala' });
   });
 });
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/parse_query.ts b/src/plugins/saved_objects_management/public/lib/parse_query.ts
similarity index 77%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/parse_query.ts
rename to src/plugins/saved_objects_management/public/lib/parse_query.ts
index 9b33deedafd95..f5b7b69ea049c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/parse_query.ts
+++ b/src/plugins/saved_objects_management/public/lib/parse_query.ts
@@ -17,9 +17,16 @@
  * under the License.
  */
 
-export function parseQuery(query: any) {
-  let queryText;
-  let visibleTypes;
+import { Query } from '@elastic/eui';
+
+interface ParsedQuery {
+  queryText?: string;
+  visibleTypes?: string[];
+}
+
+export function parseQuery(query: Query): ParsedQuery {
+  let queryText: string | undefined;
+  let visibleTypes: string[] | undefined;
 
   if (query) {
     if (query.ast.getTermClauses().length) {
@@ -29,7 +36,7 @@ export function parseQuery(query: any) {
         .join(' ');
     }
     if (query.ast.getFieldClauses('type')) {
-      visibleTypes = query.ast.getFieldClauses('type')[0].value;
+      visibleTypes = query.ast.getFieldClauses('type')[0].value as string[];
     }
   }
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/process_import_response.test.ts b/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/process_import_response.test.ts
rename to src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/process_import_response.ts b/src/plugins/saved_objects_management/public/lib/process_import_response.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/process_import_response.ts
rename to src/plugins/saved_objects_management/public/lib/process_import_response.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_import_errors.test.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_import_errors.test.ts
rename to src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
index b94b0a9d1291f..86eebad7ae787 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_import_errors.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
@@ -17,14 +17,10 @@
  * under the License.
  */
 
-jest.mock('ui/kfetch', () => ({ kfetch: jest.fn() }));
-
 import { SavedObjectsImportUnknownError } from 'src/core/public';
-import { kfetch } from 'ui/kfetch';
+import { httpServiceMock } from '../../../../core/public/mocks';
 import { resolveImportErrors } from './resolve_import_errors';
 
-const kfetchMock = kfetch as jest.Mock;
-
 function getFormData(form: Map<string, any>) {
   const formData: Record<string, any> = {};
   for (const [key, val] of form.entries()) {
@@ -39,13 +35,20 @@ function getFormData(form: Map<string, any>) {
 
 describe('resolveImportErrors', () => {
   const getConflictResolutions = jest.fn();
+  let httpMock: ReturnType<typeof httpServiceMock.createSetupContract>;
 
   beforeEach(() => {
+    httpMock = httpServiceMock.createSetupContract();
     jest.resetAllMocks();
   });
 
+  const extractBodyFromCall = (index: number): Map<string, any> => {
+    return (httpMock.post.mock.calls[index] as any)[1].body;
+  };
+
   test('works with empty import failures', async () => {
     const result = await resolveImportErrors({
+      http: httpMock,
       getConflictResolutions,
       state: {
         importCount: 0,
@@ -62,6 +65,7 @@ Object {
 
   test(`doesn't retry if only unknown failures are passed in`, async () => {
     const result = await resolveImportErrors({
+      http: httpMock,
       getConflictResolutions,
       state: {
         importCount: 0,
@@ -98,7 +102,7 @@ Object {
   });
 
   test('resolves conflicts', async () => {
-    kfetchMock.mockResolvedValueOnce({
+    httpMock.post.mockResolvedValueOnce({
       success: true,
       successCount: 1,
     });
@@ -107,6 +111,7 @@ Object {
       'a:2': false,
     });
     const result = await resolveImportErrors({
+      http: httpMock,
       getConflictResolutions,
       state: {
         importCount: 0,
@@ -139,7 +144,8 @@ Object {
   "status": "success",
 }
 `);
-    const formData = getFormData(kfetchMock.mock.calls[0][0].body);
+
+    const formData = getFormData(extractBodyFromCall(0));
     expect(formData).toMatchInlineSnapshot(`
 Object {
   "file": "undefined",
@@ -156,12 +162,13 @@ Object {
   });
 
   test('resolves missing references', async () => {
-    kfetchMock.mockResolvedValueOnce({
+    httpMock.post.mockResolvedValueOnce({
       success: true,
       successCount: 2,
     });
     getConflictResolutions.mockResolvedValueOnce({});
     const result = await resolveImportErrors({
+      http: httpMock,
       getConflictResolutions,
       state: {
         importCount: 0,
@@ -203,7 +210,7 @@ Object {
   "status": "success",
 }
 `);
-    const formData = getFormData(kfetchMock.mock.calls[0][0].body);
+    const formData = getFormData(extractBodyFromCall(0));
     expect(formData).toMatchInlineSnapshot(`
 Object {
   "file": "undefined",
@@ -232,6 +239,7 @@ Object {
   test(`doesn't resolve missing references if newIndexPatternId isn't defined`, async () => {
     getConflictResolutions.mockResolvedValueOnce({});
     const result = await resolveImportErrors({
+      http: httpMock,
       getConflictResolutions,
       state: {
         importCount: 0,
@@ -276,7 +284,7 @@ Object {
   });
 
   test('handles missing references then conflicts on the same errored objects', async () => {
-    kfetchMock.mockResolvedValueOnce({
+    httpMock.post.mockResolvedValueOnce({
       success: false,
       successCount: 0,
       errors: [
@@ -289,7 +297,7 @@ Object {
         },
       ],
     });
-    kfetchMock.mockResolvedValueOnce({
+    httpMock.post.mockResolvedValueOnce({
       success: true,
       successCount: 1,
     });
@@ -298,6 +306,7 @@ Object {
       'a:1': true,
     });
     const result = await resolveImportErrors({
+      http: httpMock,
       getConflictResolutions,
       state: {
         importCount: 0,
@@ -334,7 +343,7 @@ Object {
   "status": "success",
 }
 `);
-    const formData1 = getFormData(kfetchMock.mock.calls[0][0].body);
+    const formData1 = getFormData(extractBodyFromCall(0));
     expect(formData1).toMatchInlineSnapshot(`
 Object {
   "file": "undefined",
@@ -354,7 +363,7 @@ Object {
   ],
 }
 `);
-    const formData2 = getFormData(kfetchMock.mock.calls[1][0].body);
+    const formData2 = getFormData(extractBodyFromCall(1));
     expect(formData2).toMatchInlineSnapshot(`
 Object {
   "file": "undefined",
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_import_errors.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_import_errors.ts
rename to src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
index dcc282402147d..0aea7114bad1c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_import_errors.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { kfetch } from 'ui/kfetch';
+import { HttpStart } from 'src/core/public';
 import { FailedImport } from './process_import_response';
 
 interface RetryObject {
@@ -27,13 +27,11 @@ interface RetryObject {
   replaceReferences?: any[];
 }
 
-async function callResolveImportErrorsApi(file: File, retries: any) {
+async function callResolveImportErrorsApi(http: HttpStart, file: File, retries: any) {
   const formData = new FormData();
   formData.append('file', file);
   formData.append('retries', JSON.stringify(retries));
-  return await kfetch({
-    method: 'POST',
-    pathname: '/api/saved_objects/_resolve_import_errors',
+  return http.post<any>('/api/saved_objects/_resolve_import_errors', {
     headers: {
       // Important to be undefined, it forces proper headers to be set for FormData
       'Content-Type': undefined,
@@ -100,9 +98,11 @@ function mapImportFailureToRetryObject({
 }
 
 export async function resolveImportErrors({
+  http,
   getConflictResolutions,
   state,
 }: {
+  http: HttpStart;
   getConflictResolutions: (objects: any[]) => Promise<Record<string, boolean>>;
   state: { importCount: number; failedImports?: FailedImport[] } & Record<string, any>;
 }) {
@@ -170,7 +170,7 @@ export async function resolveImportErrors({
     }
 
     // Call API
-    const response = await callResolveImportErrorsApi(file, retries);
+    const response = await callResolveImportErrorsApi(http, file, retries);
     successImportCount += response.successCount;
     importFailures = [];
     for (const { error, ...obj } of response.errors || []) {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.test.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.test.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.test.ts
rename to src/plugins/saved_objects_management/public/lib/resolve_saved_objects.test.ts
index dc6d2643145ff..23c2b75169555 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.test.ts
@@ -23,11 +23,8 @@ import {
   saveObjects,
   saveObject,
 } from './resolve_saved_objects';
-import {
-  SavedObject,
-  SavedObjectLoader,
-} from '../../../../../../../../plugins/saved_objects/public';
-import { IndexPatternsContract } from '../../../../../../../../plugins/data/public';
+import { SavedObject, SavedObjectLoader } from '../../../saved_objects/public';
+import { IndexPatternsContract } from '../../../data/public';
 
 class SavedObjectNotFound extends Error {
   constructor(options: Record<string, any>) {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.ts
rename to src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
index d9473367f7502..15e03ed39d88c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
@@ -20,15 +20,8 @@
 import { i18n } from '@kbn/i18n';
 import { cloneDeep } from 'lodash';
 import { OverlayStart, SavedObjectReference } from 'src/core/public';
-import {
-  SavedObject,
-  SavedObjectLoader,
-} from '../../../../../../../../plugins/saved_objects/public';
-import {
-  IndexPatternsContract,
-  IIndexPattern,
-  createSearchSource,
-} from '../../../../../../../../plugins/data/public';
+import { SavedObject, SavedObjectLoader } from '../../../saved_objects/public';
+import { IndexPatternsContract, IIndexPattern, createSearchSource } from '../../../data/public';
 
 type SavedObjectsRawDoc = Record<string, any>;
 
@@ -55,7 +48,7 @@ function addJsonFieldToIndexPattern(
       target[fieldName] = JSON.parse(sourceString);
     } catch (error) {
       throw new Error(
-        i18n.translate('kbn.management.objects.parsingFieldErrorMessage', {
+        i18n.translate('savedObjectsManagement.parsingFieldErrorMessage', {
           defaultMessage:
             'Error encountered parsing {fieldName} for index pattern {indexName}: {errorMessage}',
           values: {
@@ -103,18 +96,21 @@ async function importIndexPattern(
   if (!newId) {
     // We can override and we want to prompt for confirmation
     const isConfirmed = await openConfirm(
-      i18n.translate('kbn.management.indexPattern.confirmOverwriteLabel', {
+      i18n.translate('savedObjectsManagement.indexPattern.confirmOverwriteLabel', {
         values: { title },
         defaultMessage: "Are you sure you want to overwrite '{title}'?",
       }),
       {
-        title: i18n.translate('kbn.management.indexPattern.confirmOverwriteTitle', {
+        title: i18n.translate('savedObjectsManagement.indexPattern.confirmOverwriteTitle', {
           defaultMessage: 'Overwrite {type}?',
           values: { type },
         }),
-        confirmButtonText: i18n.translate('kbn.management.indexPattern.confirmOverwriteButton', {
-          defaultMessage: 'Overwrite',
-        }),
+        confirmButtonText: i18n.translate(
+          'savedObjectsManagement.indexPattern.confirmOverwriteButton',
+          {
+            defaultMessage: 'Overwrite',
+          }
+        ),
       }
     );
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/index.js b/src/plugins/saved_objects_management/public/management_section/index.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/index.js
rename to src/plugins/saved_objects_management/public/management_section/index.ts
index 522b1ce83a6b6..1bccb2102f3b4 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/index.js
+++ b/src/plugins/saved_objects_management/public/management_section/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { Relationships } from './relationships';
+export { mountManagementSection } from './mount_section';
diff --git a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
new file mode 100644
index 0000000000000..6f03f97079bb6
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
@@ -0,0 +1,211 @@
+/*
+ * 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 React, { useEffect } from 'react';
+import ReactDOM from 'react-dom';
+import { HashRouter, Switch, Route, useParams, useLocation } from 'react-router-dom';
+import { parse } from 'query-string';
+import { get } from 'lodash';
+import { i18n } from '@kbn/i18n';
+import { I18nProvider } from '@kbn/i18n/react';
+import { CoreSetup, CoreStart, ChromeBreadcrumb, Capabilities } from 'src/core/public';
+import { ManagementAppMountParams } from '../../../management/public';
+import { DataPublicPluginStart } from '../../../data/public';
+import { StartDependencies, SavedObjectsManagementPluginStart } from '../plugin';
+import {
+  ISavedObjectsManagementServiceRegistry,
+  SavedObjectsManagementActionServiceStart,
+} from '../services';
+import { SavedObjectsTable } from './objects_table';
+import { SavedObjectEdition } from './object_view';
+import { getAllowedTypes } from './../lib';
+
+interface MountParams {
+  core: CoreSetup<StartDependencies, SavedObjectsManagementPluginStart>;
+  serviceRegistry: ISavedObjectsManagementServiceRegistry;
+  mountParams: ManagementAppMountParams;
+}
+
+let allowedObjectTypes: string[] | undefined;
+
+export const mountManagementSection = async ({
+  core,
+  mountParams,
+  serviceRegistry,
+}: MountParams) => {
+  const [coreStart, { data }, pluginStart] = await core.getStartServices();
+  const { element, basePath, setBreadcrumbs } = mountParams;
+  if (allowedObjectTypes === undefined) {
+    allowedObjectTypes = await getAllowedTypes(coreStart.http);
+  }
+
+  const capabilities = coreStart.application.capabilities;
+
+  ReactDOM.render(
+    <I18nProvider>
+      <HashRouter basename={basePath}>
+        <Switch>
+          <Route path={'/:service/:id'} exact={true}>
+            <RedirectToHomeIfUnauthorized capabilities={capabilities}>
+              <SavedObjectsEditionPage
+                coreStart={coreStart}
+                serviceRegistry={serviceRegistry}
+                setBreadcrumbs={setBreadcrumbs}
+              />
+            </RedirectToHomeIfUnauthorized>
+          </Route>
+          <Route path={'/'} exact={false}>
+            <RedirectToHomeIfUnauthorized capabilities={capabilities}>
+              <SavedObjectsTablePage
+                coreStart={coreStart}
+                dataStart={data}
+                serviceRegistry={serviceRegistry}
+                actionRegistry={pluginStart.actions}
+                allowedTypes={allowedObjectTypes}
+                setBreadcrumbs={setBreadcrumbs}
+              />
+            </RedirectToHomeIfUnauthorized>
+          </Route>
+        </Switch>
+      </HashRouter>
+    </I18nProvider>,
+    element
+  );
+
+  return () => {
+    ReactDOM.unmountComponentAtNode(element);
+  };
+};
+
+const RedirectToHomeIfUnauthorized: React.FunctionComponent<{
+  capabilities: Capabilities;
+}> = ({ children, capabilities }) => {
+  const allowed = capabilities?.management?.kibana?.objects ?? false;
+  if (!allowed) {
+    window.location.hash = '/home';
+    return null;
+  }
+  return children! as React.ReactElement;
+};
+
+const SavedObjectsEditionPage = ({
+  coreStart,
+  serviceRegistry,
+  setBreadcrumbs,
+}: {
+  coreStart: CoreStart;
+  serviceRegistry: ISavedObjectsManagementServiceRegistry;
+  setBreadcrumbs: (crumbs: ChromeBreadcrumb[]) => void;
+}) => {
+  const { service: serviceName, id } = useParams<{ service: string; id: string }>();
+  const capabilities = coreStart.application.capabilities;
+
+  const { search } = useLocation();
+  const query = parse(search);
+  const service = serviceRegistry.get(serviceName);
+
+  useEffect(() => {
+    setBreadcrumbs([
+      {
+        text: i18n.translate('savedObjectsManagement.breadcrumb.index', {
+          defaultMessage: 'Saved objects',
+        }),
+        href: '#/management/kibana/objects',
+      },
+      {
+        text: i18n.translate('savedObjectsManagement.breadcrumb.edit', {
+          defaultMessage: 'Edit {savedObjectType}',
+          values: { savedObjectType: service?.service.type ?? 'object' },
+        }),
+      },
+    ]);
+  }, [setBreadcrumbs, service]);
+
+  return (
+    <SavedObjectEdition
+      id={id}
+      serviceName={serviceName}
+      serviceRegistry={serviceRegistry}
+      savedObjectsClient={coreStart.savedObjects.client}
+      overlays={coreStart.overlays}
+      notifications={coreStart.notifications}
+      capabilities={capabilities}
+      notFoundType={query.notFound as string}
+    />
+  );
+};
+
+const SavedObjectsTablePage = ({
+  coreStart,
+  dataStart,
+  allowedTypes,
+  serviceRegistry,
+  actionRegistry,
+  setBreadcrumbs,
+}: {
+  coreStart: CoreStart;
+  dataStart: DataPublicPluginStart;
+  allowedTypes: string[];
+  serviceRegistry: ISavedObjectsManagementServiceRegistry;
+  actionRegistry: SavedObjectsManagementActionServiceStart;
+  setBreadcrumbs: (crumbs: ChromeBreadcrumb[]) => void;
+}) => {
+  const capabilities = coreStart.application.capabilities;
+  const itemsPerPage = coreStart.uiSettings.get<number>('savedObjects:perPage', 50);
+
+  useEffect(() => {
+    setBreadcrumbs([
+      {
+        text: i18n.translate('savedObjectsManagement.breadcrumb.index', {
+          defaultMessage: 'Saved objects',
+        }),
+        href: '#/management/kibana/objects',
+      },
+    ]);
+  }, [setBreadcrumbs]);
+
+  return (
+    <SavedObjectsTable
+      allowedTypes={allowedTypes}
+      serviceRegistry={serviceRegistry}
+      actionRegistry={actionRegistry}
+      savedObjectsClient={coreStart.savedObjects.client}
+      indexPatterns={dataStart.indexPatterns}
+      http={coreStart.http}
+      overlays={coreStart.overlays}
+      notifications={coreStart.notifications}
+      applications={coreStart.application}
+      perPageConfig={itemsPerPage}
+      goInspectObject={savedObject => {
+        const { editUrl } = savedObject.meta;
+        if (editUrl) {
+          // previously, kbnUrl.change(object.meta.editUrl); was used.
+          // using direct access to location.hash seems the only option for now,
+          // as using react-router-dom will prefix the url with the router's basename
+          // which should be ignored there.
+          window.location.hash = editUrl;
+        }
+      }}
+      canGoInApp={savedObject => {
+        const { inAppUrl } = savedObject.meta;
+        return inAppUrl ? get(capabilities, inAppUrl.uiCapabilitiesPath) : false;
+      }}
+    />
+  );
+};
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/header.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/header.test.tsx.snap
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
index 7e1f7ea12b014..d56776c2be9d7 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/header.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
@@ -23,7 +23,7 @@ exports[`Intro component renders correctly 1`] = `
             >
               <FormattedMessage
                 defaultMessage="Edit {title}"
-                id="kbn.management.objects.view.editItemTitle"
+                id="savedObjectsManagement.view.editItemTitle"
                 values={
                   Object {
                     "title": "search",
@@ -85,7 +85,7 @@ exports[`Intro component renders correctly 1`] = `
                         >
                           <FormattedMessage
                             defaultMessage="View {title}"
-                            id="kbn.management.objects.view.viewItemButtonLabel"
+                            id="savedObjectsManagement.view.viewItemButtonLabel"
                             values={
                               Object {
                                 "title": "search",
@@ -140,7 +140,7 @@ exports[`Intro component renders correctly 1`] = `
                         >
                           <FormattedMessage
                             defaultMessage="Delete {title}"
-                            id="kbn.management.objects.view.deleteItemButtonLabel"
+                            id="savedObjectsManagement.view.deleteItemButtonLabel"
                             values={
                               Object {
                                 "title": "search",
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/intro.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/intro.test.tsx.snap
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
index 812031b4b363c..ff179401e6f71 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/intro.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`Intro component renders correctly 1`] = `
     title={
       <FormattedMessage
         defaultMessage="Proceed with caution!"
-        id="kbn.management.objects.view.howToModifyObjectTitle"
+        id="savedObjectsManagement.view.howToModifyObjectTitle"
         values={Object {}}
       />
     }
@@ -37,7 +37,7 @@ exports[`Intro component renders correctly 1`] = `
         >
           <FormattedMessage
             defaultMessage="Proceed with caution!"
-            id="kbn.management.objects.view.howToModifyObjectTitle"
+            id="savedObjectsManagement.view.howToModifyObjectTitle"
             values={Object {}}
           >
             Proceed with caution!
@@ -53,7 +53,7 @@ exports[`Intro component renders correctly 1`] = `
           <div>
             <FormattedMessage
               defaultMessage="Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be."
-              id="kbn.management.objects.view.howToModifyObjectDescription"
+              id="savedObjectsManagement.view.howToModifyObjectDescription"
               values={Object {}}
             >
               Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be.
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/not_found_errors.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/not_found_errors.test.tsx.snap
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
index ac565a000813e..d5372fd5b18d9 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/__snapshots__/not_found_errors.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
     title={
       <FormattedMessage
         defaultMessage="There is a problem with this saved object"
-        id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+        id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
         values={Object {}}
       />
     }
@@ -39,7 +39,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
         >
           <FormattedMessage
             defaultMessage="There is a problem with this saved object"
-            id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+            id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
             values={Object {}}
           >
             There is a problem with this saved object
@@ -55,7 +55,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
           <div>
             <FormattedMessage
               defaultMessage="The index pattern associated with this object no longer exists."
-              id="kbn.management.objects.view.indexPatternDoesNotExistErrorMessage"
+              id="savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage"
               values={Object {}}
             >
               The index pattern associated with this object no longer exists.
@@ -64,7 +64,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
           <div>
             <FormattedMessage
               defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
-              id="kbn.management.objects.view.howToFixErrorDescription"
+              id="savedObjectsManagement.view.howToFixErrorDescription"
               values={Object {}}
             >
               If you know what this error means, go ahead and fix it — otherwise click the delete button above.
@@ -87,7 +87,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
     title={
       <FormattedMessage
         defaultMessage="There is a problem with this saved object"
-        id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+        id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
         values={Object {}}
       />
     }
@@ -116,7 +116,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
         >
           <FormattedMessage
             defaultMessage="There is a problem with this saved object"
-            id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+            id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
             values={Object {}}
           >
             There is a problem with this saved object
@@ -132,7 +132,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
           <div>
             <FormattedMessage
               defaultMessage="A field associated with this object no longer exists in the index pattern."
-              id="kbn.management.objects.view.fieldDoesNotExistErrorMessage"
+              id="savedObjectsManagement.view.fieldDoesNotExistErrorMessage"
               values={Object {}}
             >
               A field associated with this object no longer exists in the index pattern.
@@ -141,7 +141,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
           <div>
             <FormattedMessage
               defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
-              id="kbn.management.objects.view.howToFixErrorDescription"
+              id="savedObjectsManagement.view.howToFixErrorDescription"
               values={Object {}}
             >
               If you know what this error means, go ahead and fix it — otherwise click the delete button above.
@@ -164,7 +164,7 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
     title={
       <FormattedMessage
         defaultMessage="There is a problem with this saved object"
-        id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+        id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
         values={Object {}}
       />
     }
@@ -193,7 +193,7 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
         >
           <FormattedMessage
             defaultMessage="There is a problem with this saved object"
-            id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+            id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
             values={Object {}}
           >
             There is a problem with this saved object
@@ -209,7 +209,7 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
           <div>
             <FormattedMessage
               defaultMessage="The saved search associated with this object no longer exists."
-              id="kbn.management.objects.view.savedSearchDoesNotExistErrorMessage"
+              id="savedObjectsManagement.view.savedSearchDoesNotExistErrorMessage"
               values={Object {}}
             >
               The saved search associated with this object no longer exists.
@@ -218,7 +218,7 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
           <div>
             <FormattedMessage
               defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
-              id="kbn.management.objects.view.howToFixErrorDescription"
+              id="savedObjectsManagement.view.howToFixErrorDescription"
               values={Object {}}
             >
               If you know what this error means, go ahead and fix it — otherwise click the delete button above.
@@ -241,7 +241,7 @@ exports[`NotFoundErrors component renders correctly for unknown type 1`] = `
     title={
       <FormattedMessage
         defaultMessage="There is a problem with this saved object"
-        id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+        id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
         values={Object {}}
       />
     }
@@ -270,7 +270,7 @@ exports[`NotFoundErrors component renders correctly for unknown type 1`] = `
         >
           <FormattedMessage
             defaultMessage="There is a problem with this saved object"
-            id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+            id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
             values={Object {}}
           >
             There is a problem with this saved object
@@ -287,7 +287,7 @@ exports[`NotFoundErrors component renders correctly for unknown type 1`] = `
           <div>
             <FormattedMessage
               defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
-              id="kbn.management.objects.view.howToFixErrorDescription"
+              id="savedObjectsManagement.view.howToFixErrorDescription"
               values={Object {}}
             >
               If you know what this error means, go ahead and fix it — otherwise click the delete button above.
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/field.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/field.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/field.test.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/field.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/field.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/field.tsx
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/field.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/field.tsx
index 1ed0b57e400b8..1b69eb4240d68 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/field.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/field.tsx
@@ -104,9 +104,9 @@ export class Field extends PureComponent<FieldProps> {
             id={this.fieldId}
             label={
               !!currentValue ? (
-                <FormattedMessage id="kbn.management.objects.field.onLabel" defaultMessage="On" />
+                <FormattedMessage id="savedObjectsManagement.field.onLabel" defaultMessage="On" />
               ) : (
-                <FormattedMessage id="kbn.management.objects.field.offLabel" defaultMessage="Off" />
+                <FormattedMessage id="savedObjectsManagement.field.offLabel" defaultMessage="Off" />
               )
             }
             checked={!!currentValue}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/form.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/form.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx
index 7270d41eef529..04be7ee3ce207 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/form.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx
@@ -29,15 +29,11 @@ import {
 import { cloneDeep, set } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  SimpleSavedObject,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../core/public';
-
-import { SavedObjectLoader } from '../../../../../../../../../plugins/saved_objects/public';
+import { SimpleSavedObject, SavedObjectsClientContract } from '../../../../../../core/public';
+import { SavedObjectLoader } from '../../../../../saved_objects/public';
 import { Field } from './field';
 import { ObjectField, FieldState, SubmittedFormData } from '../../types';
-import { createFieldList } from '../../lib/create_field_list';
+import { createFieldList } from '../../../lib';
 
 interface FormProps {
   object: SimpleSavedObject;
@@ -96,7 +92,7 @@ export class Form extends Component<FormProps, FormState> {
             <EuiFlexItem grow={false}>
               <EuiButton
                 fill={true}
-                aria-label={i18n.translate('kbn.management.objects.view.saveButtonAriaLabel', {
+                aria-label={i18n.translate('savedObjectsManagement.view.saveButtonAriaLabel', {
                   defaultMessage: 'Save { title } object',
                   values: {
                     title: service.type,
@@ -107,7 +103,7 @@ export class Form extends Component<FormProps, FormState> {
                 data-test-subj="savedObjectEditSave"
               >
                 <FormattedMessage
-                  id="kbn.management.objects.view.saveButtonLabel"
+                  id="savedObjectsManagement.view.saveButtonLabel"
                   defaultMessage="Save { title } object"
                   values={{ title: service.type }}
                 />
@@ -117,14 +113,14 @@ export class Form extends Component<FormProps, FormState> {
 
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty
-              aria-label={i18n.translate('kbn.management.objects.view.cancelButtonAriaLabel', {
+              aria-label={i18n.translate('savedObjectsManagement.view.cancelButtonAriaLabel', {
                 defaultMessage: 'Cancel',
               })}
               onClick={this.onCancel}
               data-test-subj="savedObjectEditCancel"
             >
               <FormattedMessage
-                id="kbn.management.objects.view.cancelButtonLabel"
+                id="savedObjectsManagement.view.cancelButtonLabel"
                 defaultMessage="Cancel"
               />
             </EuiButtonEmpty>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/header.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/header.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/header.test.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/header.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/header.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/header.tsx
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/header.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/header.tsx
index 641493e0cbaa8..305d953c4990b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/header.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/header.tsx
@@ -52,7 +52,7 @@ export const Header = ({
           {canEdit ? (
             <h1>
               <FormattedMessage
-                id="kbn.management.objects.view.editItemTitle"
+                id="savedObjectsManagement.view.editItemTitle"
                 defaultMessage="Edit {title}"
                 values={{ title: type }}
               />
@@ -60,7 +60,7 @@ export const Header = ({
           ) : (
             <h1>
               <FormattedMessage
-                id="kbn.management.objects.view.viewItemTitle"
+                id="savedObjectsManagement.view.viewItemTitle"
                 defaultMessage="View {title}"
                 values={{ title: type }}
               />
@@ -79,7 +79,7 @@ export const Header = ({
                 data-test-subj="savedObjectEditViewInApp"
               >
                 <FormattedMessage
-                  id="kbn.management.objects.view.viewItemButtonLabel"
+                  id="savedObjectsManagement.view.viewItemButtonLabel"
                   defaultMessage="View {title}"
                   values={{ title: type }}
                 />
@@ -96,7 +96,7 @@ export const Header = ({
                 data-test-subj="savedObjectEditDelete"
               >
                 <FormattedMessage
-                  id="kbn.management.objects.view.deleteItemButtonLabel"
+                  id="savedObjectsManagement.view.deleteItemButtonLabel"
                   defaultMessage="Delete {title}"
                   values={{ title: type }}
                 />
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/index.ts b/src/plugins/saved_objects_management/public/management_section/object_view/components/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/index.ts
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/intro.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/intro.test.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/intro.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/intro.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/intro.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx
index 098ad71345d49..920a5fcbcb02e 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/intro.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx
@@ -26,7 +26,7 @@ export const Intro = () => {
     <EuiCallOut
       title={
         <FormattedMessage
-          id="kbn.management.objects.view.howToModifyObjectTitle"
+          id="savedObjectsManagement.view.howToModifyObjectTitle"
           defaultMessage="Proceed with caution!"
         />
       }
@@ -35,7 +35,7 @@ export const Intro = () => {
     >
       <div>
         <FormattedMessage
-          id="kbn.management.objects.view.howToModifyObjectDescription"
+          id="savedObjectsManagement.view.howToModifyObjectDescription"
           defaultMessage="Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn&rsquo;t be."
         />
       </div>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/not_found_errors.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/not_found_errors.test.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/not_found_errors.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
similarity index 87%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/not_found_errors.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
index c3d18855f6c9a..1a63f7eaf4819 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/object_view/not_found_errors.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
@@ -31,21 +31,21 @@ export const NotFoundErrors = ({ type }: NotFoundErrors) => {
       case 'search':
         return (
           <FormattedMessage
-            id="kbn.management.objects.view.savedSearchDoesNotExistErrorMessage"
+            id="savedObjectsManagement.view.savedSearchDoesNotExistErrorMessage"
             defaultMessage="The saved search associated with this object no longer exists."
           />
         );
       case 'index-pattern':
         return (
           <FormattedMessage
-            id="kbn.management.objects.view.indexPatternDoesNotExistErrorMessage"
+            id="savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage"
             defaultMessage="The index pattern associated with this object no longer exists."
           />
         );
       case 'index-pattern-field':
         return (
           <FormattedMessage
-            id="kbn.management.objects.view.fieldDoesNotExistErrorMessage"
+            id="savedObjectsManagement.view.fieldDoesNotExistErrorMessage"
             defaultMessage="A field associated with this object no longer exists in the index pattern."
           />
         );
@@ -58,7 +58,7 @@ export const NotFoundErrors = ({ type }: NotFoundErrors) => {
     <EuiCallOut
       title={
         <FormattedMessage
-          id="kbn.management.objects.view.savedObjectProblemErrorMessage"
+          id="savedObjectsManagement.view.savedObjectProblemErrorMessage"
           defaultMessage="There is a problem with this saved object"
         />
       }
@@ -68,7 +68,7 @@ export const NotFoundErrors = ({ type }: NotFoundErrors) => {
       <div>{getMessage()}</div>
       <div>
         <FormattedMessage
-          id="kbn.management.objects.view.howToFixErrorDescription"
+          id="savedObjectsManagement.view.howToFixErrorDescription"
           defaultMessage="If you know what this error means, go ahead and fix it &mdash; otherwise click the delete button above."
         />
       </div>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/index.js b/src/plugins/saved_objects_management/public/management_section/object_view/index.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/index.js
rename to src/plugins/saved_objects_management/public/management_section/object_view/index.ts
index cdeebdbf7b63a..a823923536d31 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/index.js
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { Flyout } from './flyout';
+export { SavedObjectEdition } from './saved_object_view';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/saved_object_view.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/saved_object_view.tsx
rename to src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
index 4984fe3e6d6b8..f714970a5cac3 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/saved_object_view.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
@@ -26,16 +26,16 @@ import {
   OverlayStart,
   NotificationsStart,
   SimpleSavedObject,
-} from '../../../../../../../core/public';
-import { ISavedObjectsManagementRegistry } from '../../saved_object_registry';
-import { Header, NotFoundErrors, Intro, Form } from './components/object_view';
-import { canViewInApp } from './lib/in_app_url';
-import { SubmittedFormData } from './types';
+} from '../../../../../core/public';
+import { ISavedObjectsManagementServiceRegistry } from '../../services';
+import { Header, NotFoundErrors, Intro, Form } from './components';
+import { canViewInApp } from '../../lib';
+import { SubmittedFormData } from '../types';
 
 interface SavedObjectEditionProps {
   id: string;
   serviceName: string;
-  serviceRegistry: ISavedObjectsManagementRegistry;
+  serviceRegistry: ISavedObjectsManagementServiceRegistry;
   capabilities: Capabilities;
   overlays: OverlayStart;
   notifications: NotificationsStart;
@@ -135,17 +135,17 @@ export class SavedObjectEdition extends Component<
     const { type, object } = this.state;
 
     const confirmed = await overlays.openConfirm(
-      i18n.translate('kbn.management.objects.confirmModalOptions.modalDescription', {
+      i18n.translate('savedObjectsManagement.deleteConfirm.modalDescription', {
         defaultMessage: 'This action permanently removes the object from Kibana.',
       }),
       {
         confirmButtonText: i18n.translate(
-          'kbn.management.objects.confirmModalOptions.deleteButtonLabel',
+          'savedObjectsManagement.deleteConfirm.modalDeleteButtonLabel',
           {
             defaultMessage: 'Delete',
           }
         ),
-        title: i18n.translate('kbn.management.objects.confirmModalOptions.modalTitle', {
+        title: i18n.translate('savedObjectsManagement.deleteConfirm.modalTitle', {
           defaultMessage: `Delete '{title}'?`,
           values: {
             title: object?.attributes?.title || 'saved Kibana object',
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
similarity index 73%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap
rename to src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
index 2c0a5d8f6b8f1..fe64df6ff51d1 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
@@ -1,19 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ObjectsTable delete should show a confirm modal 1`] = `
+exports[`SavedObjectsTable delete should show a confirm modal 1`] = `
 <EuiConfirmModal
   buttonColor="danger"
   cancelButtonText={
     <FormattedMessage
       defaultMessage="Cancel"
-      id="kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel"
+      id="savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel"
       values={Object {}}
     />
   }
   confirmButtonText={
     <FormattedMessage
       defaultMessage="Delete"
-      id="kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel"
+      id="savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel"
       values={Object {}}
     />
   }
@@ -23,7 +23,7 @@ exports[`ObjectsTable delete should show a confirm modal 1`] = `
   title={
     <FormattedMessage
       defaultMessage="Delete saved objects"
-      id="kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModalTitle"
+      id="savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModalTitle"
       values={Object {}}
     />
   }
@@ -31,7 +31,7 @@ exports[`ObjectsTable delete should show a confirm modal 1`] = `
   <p>
     <FormattedMessage
       defaultMessage="This action will delete the following saved objects:"
-      id="kbn.management.objects.deleteSavedObjectsConfirmModalDescription"
+      id="savedObjectsManagement.deleteSavedObjectsConfirmModalDescription"
       values={Object {}}
     />
   </p>
@@ -58,12 +58,10 @@ exports[`ObjectsTable delete should show a confirm modal 1`] = `
       Array [
         Object {
           "id": "1",
-          "title": "Title 1",
           "type": "index-pattern",
         },
         Object {
           "id": "3",
-          "title": "Title 2",
           "type": "dashboard",
         },
       ]
@@ -76,7 +74,7 @@ exports[`ObjectsTable delete should show a confirm modal 1`] = `
 </EuiConfirmModal>
 `;
 
-exports[`ObjectsTable export should allow the user to choose when exporting all 1`] = `
+exports[`SavedObjectsTable export should allow the user to choose when exporting all 1`] = `
 <EuiModal
   onClose={[Function]}
 >
@@ -84,7 +82,7 @@ exports[`ObjectsTable export should allow the user to choose when exporting all
     <EuiModalHeaderTitle>
       <FormattedMessage
         defaultMessage="Export {filteredItemCount, plural, one{# object} other {# objects}}"
-        id="kbn.management.objects.objectsTable.exportObjectsConfirmModalTitle"
+        id="savedObjectsManagement.objectsTable.exportObjectsConfirmModalTitle"
         values={
           Object {
             "filteredItemCount": 4,
@@ -103,7 +101,7 @@ exports[`ObjectsTable export should allow the user to choose when exporting all
       label={
         <FormattedMessage
           defaultMessage="Select which types to export"
-          id="kbn.management.objects.objectsTable.exportObjectsConfirmModalDescription"
+          id="savedObjectsManagement.objectsTable.exportObjectsConfirmModalDescription"
           values={Object {}}
         />
       }
@@ -149,7 +147,7 @@ exports[`ObjectsTable export should allow the user to choose when exporting all
       label={
         <FormattedMessage
           defaultMessage="Include related objects"
-          id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
+          id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
           values={Object {}}
         />
       }
@@ -173,7 +171,7 @@ exports[`ObjectsTable export should allow the user to choose when exporting all
             >
               <FormattedMessage
                 defaultMessage="Cancel"
-                id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.cancelButtonLabel"
+                id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.cancelButtonLabel"
                 values={Object {}}
               />
             </EuiButtonEmpty>
@@ -187,7 +185,7 @@ exports[`ObjectsTable export should allow the user to choose when exporting all
             >
               <FormattedMessage
                 defaultMessage="Export all"
-                id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel"
+                id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel"
                 values={Object {}}
               />
             </EuiButton>
@@ -199,23 +197,87 @@ exports[`ObjectsTable export should allow the user to choose when exporting all
 </EuiModal>
 `;
 
-exports[`ObjectsTable import should show the flyout 1`] = `
+exports[`SavedObjectsTable import should show the flyout 1`] = `
 <Flyout
+  allowedTypes={
+    Array [
+      "index-pattern",
+      "visualization",
+      "dashboard",
+      "search",
+    ]
+  }
   close={[Function]}
-  confirmModalPromise={[MockFunction]}
   done={[Function]}
+  http={
+    Object {
+      "addLoadingCountSource": [MockFunction],
+      "anonymousPaths": Object {
+        "isAnonymous": [MockFunction],
+        "register": [MockFunction],
+      },
+      "basePath": BasePath {
+        "basePath": "",
+        "get": [Function],
+        "prepend": [Function],
+        "remove": [Function],
+        "serverBasePath": "",
+      },
+      "delete": [MockFunction],
+      "fetch": [MockFunction],
+      "get": [MockFunction],
+      "getLoadingCount$": [MockFunction],
+      "head": [MockFunction],
+      "intercept": [MockFunction],
+      "options": [MockFunction],
+      "patch": [MockFunction],
+      "post": [MockFunction],
+      "put": [MockFunction],
+    }
+  }
   indexPatterns={
     Object {
       "clearCache": [MockFunction],
+      "get": [MockFunction],
+      "make": [Function],
+    }
+  }
+  overlays={
+    Object {
+      "banners": Object {
+        "add": [MockFunction],
+        "get$": [MockFunction],
+        "getComponent": [MockFunction],
+        "remove": [MockFunction],
+        "replace": [MockFunction],
+      },
+      "openConfirm": [MockFunction],
+      "openFlyout": [MockFunction],
+      "openModal": [MockFunction],
+    }
+  }
+  serviceRegistry={
+    Object {
+      "all": [MockFunction],
+      "get": [MockFunction],
+      "register": [MockFunction],
     }
   }
-  newIndexPatternUrl=""
-  services={Array []}
 />
 `;
 
-exports[`ObjectsTable relationships should show the flyout 1`] = `
+exports[`SavedObjectsTable relationships should show the flyout 1`] = `
 <Relationships
+  basePath={
+    BasePath {
+      "basePath": "",
+      "get": [Function],
+      "prepend": [Function],
+      "remove": [Function],
+      "serverBasePath": "",
+    }
+  }
+  canGoInApp={[Function]}
   close={[Function]}
   getRelationships={[Function]}
   goInspectObject={[Function]}
@@ -237,7 +299,7 @@ exports[`ObjectsTable relationships should show the flyout 1`] = `
 />
 `;
 
-exports[`ObjectsTable should render normally 1`] = `
+exports[`SavedObjectsTable should render normally 1`] = `
 <EuiPageContent
   horizontalPosition="center"
 >
@@ -251,7 +313,23 @@ exports[`ObjectsTable should render normally 1`] = `
     size="xs"
   />
   <Table
+    actionRegistry={
+      Object {
+        "getAll": [MockFunction],
+        "has": [MockFunction],
+      }
+    }
+    basePath={
+      BasePath {
+        "basePath": "",
+        "get": [Function],
+        "prepend": [Function],
+        "remove": [Function],
+        "serverBasePath": "",
+      }
+    }
     canDelete={false}
+    canGoInApp={[Function]}
     filterOptions={
       Array [
         Object {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
similarity index 85%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
index 34ce8394232ed..4721d166c65e5 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
       <h2>
         <FormattedMessage
           defaultMessage="Import saved objects"
-          id="kbn.management.objects.objectsTable.flyout.importSavedObjectTitle"
+          id="savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle"
           values={Object {}}
         />
       </h2>
@@ -36,7 +36,7 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
         title={
           <FormattedMessage
             defaultMessage="Index Pattern Conflicts"
-            id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle"
+            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
             values={Object {}}
           />
         }
@@ -44,7 +44,7 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
         <p>
           <FormattedMessage
             defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
-            id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription"
+            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
             values={
               Object {
                 "indexPatternLink": <ForwardRef
@@ -52,7 +52,7 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
                 >
                   <FormattedMessage
                     defaultMessage="create a new index pattern"
-                    id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
+                    id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
                     values={Object {}}
                   />
                 </ForwardRef>,
@@ -131,7 +131,7 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
         >
           <FormattedMessage
             defaultMessage="Cancel"
-            id="kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel"
             values={Object {}}
           />
         </EuiButtonEmpty>
@@ -148,7 +148,7 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
         >
           <FormattedMessage
             defaultMessage="Confirm all changes"
-            id="kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel"
             values={Object {}}
           />
         </EuiButton>
@@ -164,6 +164,30 @@ exports[`Flyout conflicts should allow conflict resolution 2`] = `
     Array [
       Object {
         "getConflictResolutions": [Function],
+        "http": Object {
+          "addLoadingCountSource": [MockFunction],
+          "anonymousPaths": Object {
+            "isAnonymous": [MockFunction],
+            "register": [MockFunction],
+          },
+          "basePath": BasePath {
+            "basePath": "",
+            "get": [Function],
+            "prepend": [Function],
+            "remove": [Function],
+            "serverBasePath": "",
+          },
+          "delete": [MockFunction],
+          "fetch": [MockFunction],
+          "get": [MockFunction],
+          "getLoadingCount$": [MockFunction],
+          "head": [MockFunction],
+          "intercept": [MockFunction],
+          "options": [MockFunction],
+          "patch": [MockFunction],
+          "post": [MockFunction],
+          "put": [MockFunction],
+        },
         "state": Object {
           "conflictedIndexPatterns": undefined,
           "conflictedSavedObjectsLinkedToSavedSearches": undefined,
@@ -243,7 +267,7 @@ exports[`Flyout conflicts should handle errors 1`] = `
   title={
     <FormattedMessage
       defaultMessage="Import failed"
-      id="kbn.management.objects.objectsTable.flyout.importFailedTitle"
+      id="savedObjectsManagement.objectsTable.flyout.importFailedTitle"
       values={Object {}}
     />
   }
@@ -251,7 +275,7 @@ exports[`Flyout conflicts should handle errors 1`] = `
   <p>
     <FormattedMessage
       defaultMessage="Failed to import {failedImportCount} of {totalImportCount} objects. Import failed"
-      id="kbn.management.objects.objectsTable.flyout.importFailedDescription"
+      id="savedObjectsManagement.objectsTable.flyout.importFailedDescription"
       values={
         Object {
           "failedImportCount": 1,
@@ -272,7 +296,7 @@ exports[`Flyout errors should display unsupported type errors properly 1`] = `
   title={
     <FormattedMessage
       defaultMessage="Import failed"
-      id="kbn.management.objects.objectsTable.flyout.importFailedTitle"
+      id="savedObjectsManagement.objectsTable.flyout.importFailedTitle"
       values={Object {}}
     />
   }
@@ -280,7 +304,7 @@ exports[`Flyout errors should display unsupported type errors properly 1`] = `
   <p>
     <FormattedMessage
       defaultMessage="Failed to import {failedImportCount} of {totalImportCount} objects. Import failed"
-      id="kbn.management.objects.objectsTable.flyout.importFailedDescription"
+      id="savedObjectsManagement.objectsTable.flyout.importFailedDescription"
       values={
         Object {
           "failedImportCount": 1,
@@ -313,7 +337,7 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
       <h2>
         <FormattedMessage
           defaultMessage="Import saved objects"
-          id="kbn.management.objects.objectsTable.flyout.importSavedObjectTitle"
+          id="savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle"
           values={Object {}}
         />
       </h2>
@@ -331,7 +355,7 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         title={
           <FormattedMessage
             defaultMessage="Support for JSON files is going away"
-            id="kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle"
+            id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
             values={Object {}}
           />
         }
@@ -339,7 +363,7 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         <p>
           <FormattedMessage
             defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
-            id="kbn.management.objects.objectsTable.flyout.legacyFileUsedBody"
+            id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
             values={Object {}}
           />
         </p>
@@ -356,7 +380,7 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         title={
           <FormattedMessage
             defaultMessage="Index Pattern Conflicts"
-            id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle"
+            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
             values={Object {}}
           />
         }
@@ -364,7 +388,7 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         <p>
           <FormattedMessage
             defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
-            id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription"
+            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
             values={
               Object {
                 "indexPatternLink": <ForwardRef
@@ -372,7 +396,7 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
                 >
                   <FormattedMessage
                     defaultMessage="create a new index pattern"
-                    id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
+                    id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
                     values={Object {}}
                   />
                 </ForwardRef>,
@@ -462,7 +486,7 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         >
           <FormattedMessage
             defaultMessage="Cancel"
-            id="kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel"
             values={Object {}}
           />
         </EuiButtonEmpty>
@@ -479,7 +503,7 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         >
           <FormattedMessage
             defaultMessage="Confirm all changes"
-            id="kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel"
             values={Object {}}
           />
         </EuiButton>
@@ -498,7 +522,7 @@ Array [
     title={
       <FormattedMessage
         defaultMessage="Support for JSON files is going away"
-        id="kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle"
+        id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
         values={Object {}}
       />
     }
@@ -506,7 +530,7 @@ Array [
     <p>
       <FormattedMessage
         defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
-        id="kbn.management.objects.objectsTable.flyout.legacyFileUsedBody"
+        id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
         values={Object {}}
       />
     </p>
@@ -518,7 +542,7 @@ Array [
     title={
       <FormattedMessage
         defaultMessage="Index Pattern Conflicts"
-        id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle"
+        id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
         values={Object {}}
       />
     }
@@ -526,7 +550,7 @@ Array [
     <p>
       <FormattedMessage
         defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
-        id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription"
+        id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
         values={
           Object {
             "indexPatternLink": <ForwardRef
@@ -534,7 +558,7 @@ Array [
             >
               <FormattedMessage
                 defaultMessage="create a new index pattern"
-                id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
+                id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
                 values={Object {}}
               />
             </ForwardRef>,
@@ -548,7 +572,7 @@ Array [
     title={
       <FormattedMessage
         defaultMessage="Sorry, there was an error"
-        id="kbn.management.objects.objectsTable.flyout.errorCalloutTitle"
+        id="savedObjectsManagement.objectsTable.flyout.errorCalloutTitle"
         values={Object {}}
       />
     }
@@ -578,7 +602,7 @@ exports[`Flyout should render import step 1`] = `
       <h2>
         <FormattedMessage
           defaultMessage="Import saved objects"
-          id="kbn.management.objects.objectsTable.flyout.importSavedObjectTitle"
+          id="savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle"
           values={Object {}}
         />
       </h2>
@@ -595,7 +619,7 @@ exports[`Flyout should render import step 1`] = `
         label={
           <FormattedMessage
             defaultMessage="Please select a file to import"
-            id="kbn.management.objects.objectsTable.flyout.selectFileToImportFormRowLabel"
+            id="savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel"
             values={Object {}}
           />
         }
@@ -607,7 +631,7 @@ exports[`Flyout should render import step 1`] = `
           initialPromptText={
             <FormattedMessage
               defaultMessage="Import"
-              id="kbn.management.objects.objectsTable.flyout.importPromptText"
+              id="savedObjectsManagement.objectsTable.flyout.importPromptText"
               values={Object {}}
             />
           }
@@ -628,7 +652,7 @@ exports[`Flyout should render import step 1`] = `
           label={
             <FormattedMessage
               defaultMessage="Automatically overwrite all saved objects?"
-              id="kbn.management.objects.objectsTable.flyout.overwriteSavedObjectsLabel"
+              id="savedObjectsManagement.objectsTable.flyout.overwriteSavedObjectsLabel"
               values={Object {}}
             />
           }
@@ -651,7 +675,7 @@ exports[`Flyout should render import step 1`] = `
         >
           <FormattedMessage
             defaultMessage="Cancel"
-            id="kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel"
             values={Object {}}
           />
         </EuiButtonEmpty>
@@ -668,7 +692,7 @@ exports[`Flyout should render import step 1`] = `
         >
           <FormattedMessage
             defaultMessage="Import"
-            id="kbn.management.objects.objectsTable.flyout.import.confirmButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.import.confirmButtonLabel"
             values={Object {}}
           />
         </EuiButton>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap
similarity index 88%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap
index 51bd51a5e2e58..642a5030e4ec0 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`Header should render normally 1`] = `
         <h1>
           <FormattedMessage
             defaultMessage="Saved Objects"
-            id="kbn.management.objects.objectsTable.header.savedObjectsTitle"
+            id="savedObjectsManagement.objectsTable.header.savedObjectsTitle"
             values={Object {}}
           />
         </h1>
@@ -38,7 +38,7 @@ exports[`Header should render normally 1`] = `
           >
             <FormattedMessage
               defaultMessage="Export {filteredCount, plural, one{# object} other {# objects}}"
-              id="kbn.management.objects.objectsTable.header.exportButtonLabel"
+              id="savedObjectsManagement.objectsTable.header.exportButtonLabel"
               values={
                 Object {
                   "filteredCount": 2,
@@ -58,7 +58,7 @@ exports[`Header should render normally 1`] = `
           >
             <FormattedMessage
               defaultMessage="Import"
-              id="kbn.management.objects.objectsTable.header.importButtonLabel"
+              id="savedObjectsManagement.objectsTable.header.importButtonLabel"
               values={Object {}}
             />
           </EuiButtonEmpty>
@@ -73,7 +73,7 @@ exports[`Header should render normally 1`] = `
           >
             <FormattedMessage
               defaultMessage="Refresh"
-              id="kbn.management.objects.objectsTable.header.refreshButtonLabel"
+              id="savedObjectsManagement.objectsTable.header.refreshButtonLabel"
               values={Object {}}
             />
           </EuiButtonEmpty>
@@ -93,7 +93,7 @@ exports[`Header should render normally 1`] = `
       >
         <FormattedMessage
           defaultMessage="From here you can delete saved objects, such as saved searches. You can also edit the raw data of saved objects. Typically objects are only modified via their associated application, which is probably what you should use instead of this screen."
-          id="kbn.management.objects.objectsTable.howToDeleteSavedObjectsDescription"
+          id="savedObjectsManagement.objectsTable.howToDeleteSavedObjectsDescription"
           values={Object {}}
         />
       </EuiTextColor>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
index 728944f3ccbfe..a8bb691cd54e9 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
@@ -202,7 +202,7 @@ exports[`Relationships should render errors 1`] = `
       title={
         <FormattedMessage
           defaultMessage="Error"
-          id="kbn.management.objects.objectsTable.relationships.renderErrorMessage"
+          id="savedObjectsManagement.objectsTable.relationships.renderErrorMessage"
           values={Object {}}
         />
       }
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
index a4dcfb9c38184..d09dd6f8b868b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
@@ -36,7 +36,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
         >
           <FormattedMessage
             defaultMessage="Delete"
-            id="kbn.management.objects.objectsTable.table.deleteButtonLabel"
+            id="savedObjectsManagement.objectsTable.table.deleteButtonLabel"
             values={Object {}}
           />
         </EuiButton>,
@@ -51,7 +51,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
             >
               <FormattedMessage
                 defaultMessage="Export"
-                id="kbn.management.objects.objectsTable.table.exportPopoverButtonLabel"
+                id="savedObjectsManagement.objectsTable.table.exportPopoverButtonLabel"
                 values={Object {}}
               />
             </EuiButton>
@@ -72,7 +72,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
             label={
               <FormattedMessage
                 defaultMessage="Options"
-                id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel"
+                id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportOptionsLabel"
                 values={Object {}}
               />
             }
@@ -83,7 +83,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
               label={
                 <FormattedMessage
                   defaultMessage="Include related objects"
-                  id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
+                  id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
                   values={Object {}}
                 />
               }
@@ -106,7 +106,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
             >
               <FormattedMessage
                 defaultMessage="Export"
-                id="kbn.management.objects.objectsTable.table.exportButtonLabel"
+                id="savedObjectsManagement.objectsTable.table.exportButtonLabel"
                 values={Object {}}
               />
             </EuiButton>
@@ -171,6 +171,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
       items={
         Array [
           Object {
+            "attributes": Object {},
             "id": "1",
             "meta": Object {
               "editUrl": "#/management/kibana/index_patterns/1",
@@ -181,6 +182,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
               },
               "title": "MyIndexPattern*",
             },
+            "references": Array [],
             "type": "index-pattern",
           },
         ]
@@ -249,7 +251,7 @@ exports[`Table should render normally 1`] = `
         >
           <FormattedMessage
             defaultMessage="Delete"
-            id="kbn.management.objects.objectsTable.table.deleteButtonLabel"
+            id="savedObjectsManagement.objectsTable.table.deleteButtonLabel"
             values={Object {}}
           />
         </EuiButton>,
@@ -264,7 +266,7 @@ exports[`Table should render normally 1`] = `
             >
               <FormattedMessage
                 defaultMessage="Export"
-                id="kbn.management.objects.objectsTable.table.exportPopoverButtonLabel"
+                id="savedObjectsManagement.objectsTable.table.exportPopoverButtonLabel"
                 values={Object {}}
               />
             </EuiButton>
@@ -285,7 +287,7 @@ exports[`Table should render normally 1`] = `
             label={
               <FormattedMessage
                 defaultMessage="Options"
-                id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel"
+                id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportOptionsLabel"
                 values={Object {}}
               />
             }
@@ -296,7 +298,7 @@ exports[`Table should render normally 1`] = `
               label={
                 <FormattedMessage
                   defaultMessage="Include related objects"
-                  id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
+                  id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
                   values={Object {}}
                 />
               }
@@ -319,7 +321,7 @@ exports[`Table should render normally 1`] = `
             >
               <FormattedMessage
                 defaultMessage="Export"
-                id="kbn.management.objects.objectsTable.table.exportButtonLabel"
+                id="savedObjectsManagement.objectsTable.table.exportButtonLabel"
                 values={Object {}}
               />
             </EuiButton>
@@ -384,6 +386,7 @@ exports[`Table should render normally 1`] = `
       items={
         Array [
           Object {
+            "attributes": Object {},
             "id": "1",
             "meta": Object {
               "editUrl": "#/management/kibana/index_patterns/1",
@@ -394,6 +397,7 @@ exports[`Table should render normally 1`] = `
               },
               "title": "MyIndexPattern*",
             },
+            "references": Array [],
             "type": "index-pattern",
           },
         ]
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.mocks.ts b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.mocks.ts
new file mode 100644
index 0000000000000..b5361d212954f
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.mocks.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const importFileMock = jest.fn();
+jest.doMock('../../../lib/import_file', () => ({
+  importFile: importFileMock,
+}));
+
+export const resolveImportErrorsMock = jest.fn();
+jest.doMock('../../../lib/resolve_import_errors', () => ({
+  resolveImportErrors: resolveImportErrorsMock,
+}));
+
+export const importLegacyFileMock = jest.fn();
+jest.doMock('../../../lib/import_legacy_file', () => ({
+  importLegacyFile: importLegacyFileMock,
+}));
+
+export const resolveSavedObjectsMock = jest.fn();
+export const resolveSavedSearchesMock = jest.fn();
+export const resolveIndexPatternConflictsMock = jest.fn();
+export const saveObjectsMock = jest.fn();
+jest.doMock('../../../lib/resolve_saved_objects', () => ({
+  resolveSavedObjects: resolveSavedObjectsMock,
+  resolveSavedSearches: resolveSavedSearchesMock,
+  resolveIndexPatternConflicts: resolveIndexPatternConflictsMock,
+  saveObjects: saveObjectsMock,
+}));
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
similarity index 75%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
index 0d16e0ae35dd6..5d713ff044f24 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
@@ -17,68 +17,62 @@
  * under the License.
  */
 
+import {
+  importFileMock,
+  importLegacyFileMock,
+  resolveImportErrorsMock,
+  resolveIndexPatternConflictsMock,
+  resolveSavedObjectsMock,
+  resolveSavedSearchesMock,
+  saveObjectsMock,
+} from './flyout.test.mocks';
+
 import React from 'react';
 import { shallowWithI18nProvider } from 'test_utils/enzyme_helpers';
-import { mockManagementPlugin } from '../../../../../../../../../../../../plugins/index_pattern_management/public/mocks';
-import { Flyout } from '../flyout';
-
-jest.mock('ui/kfetch', () => ({ kfetch: jest.fn() }));
-
-jest.mock('../../../../../lib/import_file', () => ({
-  importFile: jest.fn(),
-}));
-
-jest.mock('../../../../../lib/resolve_import_errors', () => ({
-  resolveImportErrors: jest.fn(),
-}));
-
-jest.mock('ui/chrome', () => ({
-  addBasePath: () => {},
-  getInjected: () => ['index-pattern', 'visualization', 'dashboard', 'search'],
-}));
-
-jest.mock('../../../../../lib/import_legacy_file', () => ({
-  importLegacyFile: jest.fn(),
-}));
-
-jest.mock('../../../../../lib/resolve_saved_objects', () => ({
-  resolveSavedObjects: jest.fn(),
-  resolveSavedSearches: jest.fn(),
-  resolveIndexPatternConflicts: jest.fn(),
-  saveObjects: jest.fn(),
-}));
-
-jest.mock('../../../../../../../../../../../../plugins/index_pattern_management/public', () => ({
-  setup: mockManagementPlugin.createSetupContract(),
-  start: mockManagementPlugin.createStartContract(),
-}));
-
-jest.mock('ui/notify', () => ({}));
-
-const defaultProps = {
-  close: jest.fn(),
-  done: jest.fn(),
-  services: [],
-  newIndexPatternUrl: '',
-  getConflictResolutions: jest.fn(),
-  confirmModalPromise: jest.fn(),
-  indexPatterns: {
-    getFields: jest.fn().mockImplementation(() => [{ id: '1' }, { id: '2' }]),
-  },
-};
-
-const mockFile = {
+import { coreMock } from '../../../../../../core/public/mocks';
+import { serviceRegistryMock } from '../../../services/service_registry.mock';
+import { Flyout, FlyoutProps, FlyoutState } from './flyout';
+import { ShallowWrapper } from 'enzyme';
+
+const mockFile = ({
   name: 'foo.ndjson',
   path: '/home/foo.ndjson',
-};
-const legacyMockFile = {
+} as unknown) as File;
+const legacyMockFile = ({
   name: 'foo.json',
   path: '/home/foo.json',
-};
+} as unknown) as File;
 
 describe('Flyout', () => {
+  let defaultProps: FlyoutProps;
+
+  const shallowRender = (props: FlyoutProps) => {
+    return (shallowWithI18nProvider(<Flyout {...props} />) as unknown) as ShallowWrapper<
+      FlyoutProps,
+      FlyoutState,
+      Flyout
+    >;
+  };
+
+  beforeEach(() => {
+    const { http, overlays } = coreMock.createStart();
+
+    defaultProps = {
+      close: jest.fn(),
+      done: jest.fn(),
+      newIndexPatternUrl: '',
+      indexPatterns: {
+        getFields: jest.fn().mockImplementation(() => [{ id: '1' }, { id: '2' }]),
+      } as any,
+      overlays,
+      http,
+      allowedTypes: ['search', 'index-pattern', 'visualization'],
+      serviceRegistry: serviceRegistryMock.create(),
+    };
+  });
+
   it('should render import step', async () => {
-    const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+    const component = shallowRender(defaultProps);
 
     // Ensure all promises resolve
     await new Promise(resolve => process.nextTick(resolve));
@@ -89,7 +83,7 @@ describe('Flyout', () => {
   });
 
   it('should toggle the overwrite all control', async () => {
-    const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+    const component = shallowRender(defaultProps);
 
     // Ensure all promises resolve
     await new Promise(resolve => process.nextTick(resolve));
@@ -102,7 +96,7 @@ describe('Flyout', () => {
   });
 
   it('should allow picking a file', async () => {
-    const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+    const component = shallowRender(defaultProps);
 
     // Ensure all promises resolve
     await new Promise(resolve => process.nextTick(resolve));
@@ -115,7 +109,7 @@ describe('Flyout', () => {
   });
 
   it('should allow removing a file', async () => {
-    const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+    const component = shallowRender(defaultProps);
 
     // Ensure all promises resolve
     await Promise.resolve();
@@ -130,22 +124,21 @@ describe('Flyout', () => {
   });
 
   it('should handle invalid files', async () => {
-    const { importLegacyFile } = require('../../../../../lib/import_legacy_file');
-    const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+    const component = shallowRender(defaultProps);
 
     // Ensure all promises resolve
     await new Promise(resolve => process.nextTick(resolve));
     // Ensure the state changes are reflected
     component.update();
 
-    importLegacyFile.mockImplementation(() => {
+    importLegacyFileMock.mockImplementation(() => {
       throw new Error('foobar');
     });
 
     await component.instance().legacyImport();
     expect(component.state('error')).toBe('The file could not be processed.');
 
-    importLegacyFile.mockImplementation(() => ({
+    importLegacyFileMock.mockImplementation(() => ({
       invalid: true,
     }));
 
@@ -156,11 +149,8 @@ describe('Flyout', () => {
   });
 
   describe('conflicts', () => {
-    const { importFile } = require('../../../../../lib/import_file');
-    const { resolveImportErrors } = require('../../../../../lib/resolve_import_errors');
-
     beforeEach(() => {
-      importFile.mockImplementation(() => ({
+      importFileMock.mockImplementation(() => ({
         success: false,
         successCount: 0,
         errors: [
@@ -180,7 +170,7 @@ describe('Flyout', () => {
           },
         ],
       }));
-      resolveImportErrors.mockImplementation(() => ({
+      resolveImportErrorsMock.mockImplementation(() => ({
         status: 'success',
         importCount: 1,
         failedImports: [],
@@ -188,7 +178,7 @@ describe('Flyout', () => {
     });
 
     it('should figure out unmatchedReferences', async () => {
-      const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+      const component = shallowRender(defaultProps);
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -198,7 +188,7 @@ describe('Flyout', () => {
       component.setState({ file: mockFile, isLegacyFile: false });
       await component.instance().import();
 
-      expect(importFile).toHaveBeenCalledWith(mockFile, true);
+      expect(importFileMock).toHaveBeenCalledWith(defaultProps.http, mockFile, true);
       expect(component.state()).toMatchObject({
         conflictedIndexPatterns: undefined,
         conflictedSavedObjectsLinkedToSavedSearches: undefined,
@@ -223,7 +213,7 @@ describe('Flyout', () => {
     });
 
     it('should allow conflict resolution', async () => {
-      const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+      const component = shallowRender(defaultProps);
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -239,7 +229,7 @@ describe('Flyout', () => {
 
       // Ensure we can change the resolution
       component.instance().onIndexChanged('MyIndexPattern*', { target: { value: '2' } });
-      expect(component.state('unmatchedReferences')[0].newIndexPatternId).toBe('2');
+      expect(component.state('unmatchedReferences')![0].newIndexPatternId).toBe('2');
 
       // Let's resolve now
       await component
@@ -247,18 +237,18 @@ describe('Flyout', () => {
         .simulate('click');
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
-      expect(resolveImportErrors).toMatchSnapshot();
+      expect(resolveImportErrorsMock).toMatchSnapshot();
     });
 
     it('should handle errors', async () => {
-      const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+      const component = shallowRender(defaultProps);
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
       // Ensure the state changes are reflected
       component.update();
 
-      resolveImportErrors.mockImplementation(() => ({
+      resolveImportErrorsMock.mockImplementation(() => ({
         status: 'success',
         importCount: 0,
         failedImports: [
@@ -303,18 +293,15 @@ describe('Flyout', () => {
   });
 
   describe('errors', () => {
-    const { importFile } = require('../../../../../lib/import_file');
-    const { resolveImportErrors } = require('../../../../../lib/resolve_import_errors');
-
     it('should display unsupported type errors properly', async () => {
-      const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+      const component = shallowRender(defaultProps);
 
       // Ensure all promises resolve
       await Promise.resolve();
       // Ensure the state changes are reflected
       component.update();
 
-      importFile.mockImplementation(() => ({
+      importFileMock.mockImplementation(() => ({
         success: false,
         successCount: 0,
         errors: [
@@ -328,7 +315,7 @@ describe('Flyout', () => {
           },
         ],
       }));
-      resolveImportErrors.mockImplementation(() => ({
+      resolveImportErrorsMock.mockImplementation(() => ({
         status: 'success',
         importCount: 0,
         failedImports: [
@@ -372,14 +359,6 @@ describe('Flyout', () => {
   });
 
   describe('legacy conflicts', () => {
-    const { importLegacyFile } = require('../../../../../lib/import_legacy_file');
-    const {
-      resolveSavedObjects,
-      resolveSavedSearches,
-      resolveIndexPatternConflicts,
-      saveObjects,
-    } = require('../../../../../lib/resolve_saved_objects');
-
     const mockData = [
       {
         _id: '1',
@@ -406,7 +385,7 @@ describe('Flyout', () => {
         },
         obj: {
           searchSource: {
-            getOwnField: field => {
+            getOwnField: (field: string) => {
               if (field === 'index') {
                 return 'MyIndexPattern*';
               }
@@ -426,8 +405,8 @@ describe('Flyout', () => {
     const mockConflictedSearchDocs = [3];
 
     beforeEach(() => {
-      importLegacyFile.mockImplementation(() => mockData);
-      resolveSavedObjects.mockImplementation(() => ({
+      importLegacyFileMock.mockImplementation(() => mockData);
+      resolveSavedObjectsMock.mockImplementation(() => ({
         conflictedIndexPatterns: mockConflictedIndexPatterns,
         conflictedSavedObjectsLinkedToSavedSearches: mockConflictedSavedObjectsLinkedToSavedSearches,
         conflictedSearchDocs: mockConflictedSearchDocs,
@@ -437,7 +416,7 @@ describe('Flyout', () => {
     });
 
     it('should figure out unmatchedReferences', async () => {
-      const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+      const component = shallowRender(defaultProps);
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -447,14 +426,14 @@ describe('Flyout', () => {
       component.setState({ file: legacyMockFile, isLegacyFile: true });
       await component.instance().legacyImport();
 
-      expect(importLegacyFile).toHaveBeenCalledWith(legacyMockFile);
+      expect(importLegacyFileMock).toHaveBeenCalledWith(legacyMockFile);
       // Remove the last element from data since it should be filtered out
-      expect(resolveSavedObjects).toHaveBeenCalledWith(
+      expect(resolveSavedObjectsMock).toHaveBeenCalledWith(
         mockData.slice(0, 2).map(doc => ({ ...doc, _migrationVersion: {} })),
         true,
-        defaultProps.services,
+        defaultProps.serviceRegistry.all().map(s => s.service),
         defaultProps.indexPatterns,
-        defaultProps.confirmModalPromise
+        defaultProps.overlays.openConfirm
       );
 
       expect(component.state()).toMatchObject({
@@ -492,7 +471,7 @@ describe('Flyout', () => {
     });
 
     it('should allow conflict resolution', async () => {
-      const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+      const component = shallowRender(defaultProps);
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -508,7 +487,7 @@ describe('Flyout', () => {
 
       // Ensure we can change the resolution
       component.instance().onIndexChanged('MyIndexPattern*', { target: { value: '2' } });
-      expect(component.state('unmatchedReferences')[0].newIndexPatternId).toBe('2');
+      expect(component.state('unmatchedReferences')![0].newIndexPatternId).toBe('2');
 
       // Let's resolve now
       await component
@@ -516,33 +495,33 @@ describe('Flyout', () => {
         .simulate('click');
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
-      expect(resolveIndexPatternConflicts).toHaveBeenCalledWith(
+      expect(resolveIndexPatternConflictsMock).toHaveBeenCalledWith(
         component.instance().resolutions,
         mockConflictedIndexPatterns,
         true,
         defaultProps.indexPatterns
       );
-      expect(saveObjects).toHaveBeenCalledWith(
+      expect(saveObjectsMock).toHaveBeenCalledWith(
         mockConflictedSavedObjectsLinkedToSavedSearches,
         true
       );
-      expect(resolveSavedSearches).toHaveBeenCalledWith(
+      expect(resolveSavedSearchesMock).toHaveBeenCalledWith(
         mockConflictedSearchDocs,
-        defaultProps.services,
+        defaultProps.serviceRegistry.all().map(s => s.service),
         defaultProps.indexPatterns,
         true
       );
     });
 
     it('should handle errors', async () => {
-      const component = shallowWithI18nProvider(<Flyout {...defaultProps} />);
+      const component = shallowRender(defaultProps);
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
       // Ensure the state changes are reflected
       component.update();
 
-      resolveIndexPatternConflicts.mockImplementation(() => {
+      resolveIndexPatternConflictsMock.mockImplementation(() => {
         throw new Error('foobar');
       });
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/flyout.js b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
similarity index 77%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/flyout.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index da2221bb54203..45788dcb601ae 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/flyout.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -18,7 +18,6 @@
  */
 
 import React, { Component, Fragment } from 'react';
-import PropTypes from 'prop-types';
 import { take, get as getField } from 'lodash';
 import {
   EuiFlyout,
@@ -32,6 +31,7 @@ import {
   EuiForm,
   EuiFormRow,
   EuiSwitch,
+  // @ts-ignore
   EuiFilePicker,
   EuiInMemoryTable,
   EuiSelect,
@@ -47,34 +47,62 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-
+import { OverlayStart, HttpStart } from 'src/core/public';
+import { IndexPatternsContract, IIndexPattern } from '../../../../../data/public';
 import {
   importFile,
   importLegacyFile,
   resolveImportErrors,
   logLegacyImport,
   getDefaultTitle,
-} from '../../../../lib';
-import { processImportResponse } from '../../../../lib/process_import_response';
+  processImportResponse,
+  ProcessedImportResponse,
+} from '../../../lib';
 import {
   resolveSavedObjects,
   resolveSavedSearches,
   resolveIndexPatternConflicts,
   saveObjects,
-} from '../../../../lib/resolve_saved_objects';
-import { POSSIBLE_TYPES } from '../../objects_table';
-
-export class Flyout extends Component {
-  static propTypes = {
-    close: PropTypes.func.isRequired,
-    done: PropTypes.func.isRequired,
-    services: PropTypes.array.isRequired,
-    newIndexPatternUrl: PropTypes.string.isRequired,
-    indexPatterns: PropTypes.object.isRequired,
-    confirmModalPromise: PropTypes.func.isRequired,
-  };
+} from '../../../lib/resolve_saved_objects';
+import { ISavedObjectsManagementServiceRegistry } from '../../../services';
+
+export interface FlyoutProps {
+  serviceRegistry: ISavedObjectsManagementServiceRegistry;
+  allowedTypes: string[];
+  close: () => void;
+  done: () => void;
+  newIndexPatternUrl: string;
+  indexPatterns: IndexPatternsContract;
+  overlays: OverlayStart;
+  http: HttpStart;
+}
+
+export interface FlyoutState {
+  conflictedIndexPatterns?: any[];
+  conflictedSavedObjectsLinkedToSavedSearches?: any[];
+  conflictedSearchDocs?: any[];
+  unmatchedReferences?: ProcessedImportResponse['unmatchedReferences'];
+  failedImports?: ProcessedImportResponse['failedImports'];
+  conflictingRecord?: ConflictingRecord;
+  error?: string;
+  file?: File;
+  importCount: number;
+  indexPatterns?: IIndexPattern[];
+  isOverwriteAllChecked: boolean;
+  loadingMessage?: string;
+  isLegacyFile: boolean;
+  status: string;
+}
+
+interface ConflictingRecord {
+  id: string;
+  type: string;
+  title: string;
+  done: (success: boolean) => void;
+}
 
-  constructor(props) {
+export class Flyout extends Component<FlyoutProps, FlyoutState> {
+  constructor(props: FlyoutProps) {
     super(props);
 
     this.state = {
@@ -100,7 +128,7 @@ export class Flyout extends Component {
 
   fetchIndexPatterns = async () => {
     const indexPatterns = await this.props.indexPatterns.getFields(['id', 'title']);
-    this.setState({ indexPatterns });
+    this.setState({ indexPatterns } as any);
   };
 
   changeOverwriteAll = () => {
@@ -109,11 +137,12 @@ export class Flyout extends Component {
     }));
   };
 
-  setImportFile = ([file]) => {
-    if (!file) {
+  setImportFile = (files: FileList | null) => {
+    if (!files || !files[0]) {
       this.setState({ file: undefined, isLegacyFile: false });
       return;
     }
+    const file = files[0];
     this.setState({
       file,
       isLegacyFile: /\.json$/i.test(file.name) || file.type === 'application/json',
@@ -126,30 +155,29 @@ export class Flyout extends Component {
    * Does the initial import of a file, resolveImportErrors then handles errors and retries
    */
   import = async () => {
+    const { http } = this.props;
     const { file, isOverwriteAllChecked } = this.state;
     this.setState({ status: 'loading', error: undefined });
 
     // Import the file
-    let response;
     try {
-      response = await importFile(file, isOverwriteAllChecked);
+      const response = await importFile(http, file!, isOverwriteAllChecked);
+      this.setState(processImportResponse(response), () => {
+        // Resolve import errors right away if there's no index patterns to match
+        // This will ask about overwriting each object, etc
+        if (this.state.unmatchedReferences?.length === 0) {
+          this.resolveImportErrors();
+        }
+      });
     } catch (e) {
       this.setState({
         status: 'error',
-        error: i18n.translate('kbn.management.objects.objectsTable.flyout.importFileErrorMessage', {
+        error: i18n.translate('savedObjectsManagement.objectsTable.flyout.importFileErrorMessage', {
           defaultMessage: 'The file could not be processed.',
         }),
       });
       return;
     }
-
-    this.setState(processImportResponse(response), () => {
-      // Resolve import errors right away if there's no index patterns to match
-      // This will ask about overwriting each object, etc
-      if (this.state.unmatchedReferences.length === 0) {
-        this.resolveImportErrors();
-      }
-    });
   };
 
   /**
@@ -160,10 +188,10 @@ export class Flyout extends Component {
    * @param {array} objects List of objects to request the user if they wish to overwrite it
    * @return {Promise<array>} An object with the key being "type:id" and value the resolution chosen by the user
    */
-  getConflictResolutions = async objects => {
-    const resolutions = {};
+  getConflictResolutions = async (objects: any[]) => {
+    const resolutions: Record<string, boolean> = {};
     for (const { type, id, title } of objects) {
-      const overwrite = await new Promise(resolve => {
+      const overwrite = await new Promise<boolean>(resolve => {
         this.setState({
           conflictingRecord: {
             id,
@@ -193,6 +221,7 @@ export class Flyout extends Component {
 
     try {
       const updatedState = await resolveImportErrors({
+        http: this.props.http,
         state: this.state,
         getConflictResolutions: this.getConflictResolutions,
       });
@@ -201,7 +230,7 @@ export class Flyout extends Component {
       this.setState({
         status: 'error',
         error: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.resolveImportErrorsFileErrorMessage',
+          'savedObjectsManagement.objectsTable.flyout.resolveImportErrorsFileErrorMessage',
           { defaultMessage: 'The file could not be processed.' }
         ),
       });
@@ -209,22 +238,22 @@ export class Flyout extends Component {
   };
 
   legacyImport = async () => {
-    const { services, indexPatterns, confirmModalPromise } = this.props;
+    const { serviceRegistry, indexPatterns, overlays, http, allowedTypes } = this.props;
     const { file, isOverwriteAllChecked } = this.state;
 
     this.setState({ status: 'loading', error: undefined });
 
     // Log warning on server, don't wait for response
-    logLegacyImport();
+    logLegacyImport(http);
 
     let contents;
     try {
-      contents = await importLegacyFile(file);
+      contents = await importLegacyFile(file!);
     } catch (e) {
       this.setState({
         status: 'error',
         error: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.importLegacyFileErrorMessage',
+          'savedObjectsManagement.objectsTable.flyout.importLegacyFileErrorMessage',
           { defaultMessage: 'The file could not be processed.' }
         ),
       });
@@ -235,7 +264,7 @@ export class Flyout extends Component {
       this.setState({
         status: 'error',
         error: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage',
+          'savedObjectsManagement.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage',
           { defaultMessage: 'Saved objects file format is invalid and cannot be imported.' }
         ),
       });
@@ -243,7 +272,7 @@ export class Flyout extends Component {
     }
 
     contents = contents
-      .filter(content => POSSIBLE_TYPES.includes(content._type))
+      .filter(content => allowedTypes.includes(content._type))
       .map(doc => ({
         ...doc,
         // The server assumes that documents with no migrationVersion are up to date.
@@ -263,18 +292,18 @@ export class Flyout extends Component {
     } = await resolveSavedObjects(
       contents,
       isOverwriteAllChecked,
-      services,
+      serviceRegistry.all().map(e => e.service),
       indexPatterns,
-      confirmModalPromise
+      overlays.openConfirm
     );
 
-    const byId = {};
+    const byId: Record<string, any[]> = {};
     conflictedIndexPatterns
       .map(({ doc, obj }) => {
         return { doc, obj: obj._serialize() };
       })
       .forEach(({ doc, obj }) =>
-        obj.references.forEach(ref => {
+        obj.references.forEach((ref: Record<string, any>) => {
           byId[ref.id] = byId[ref.id] != null ? byId[ref.id].concat({ doc, obj }) : [{ doc, obj }];
         })
       );
@@ -291,7 +320,7 @@ export class Flyout extends Component {
         });
         return accum;
       },
-      []
+      [] as any[]
     );
 
     this.setState({
@@ -305,12 +334,12 @@ export class Flyout extends Component {
     });
   };
 
-  get hasUnmatchedReferences() {
+  public get hasUnmatchedReferences() {
     return this.state.unmatchedReferences && this.state.unmatchedReferences.length > 0;
   }
 
-  get resolutions() {
-    return this.state.unmatchedReferences.reduce(
+  public get resolutions() {
+    return this.state.unmatchedReferences!.reduce(
       (accum, { existingIndexPatternId, newIndexPatternId }) => {
         if (newIndexPatternId) {
           accum.push({
@@ -320,7 +349,7 @@ export class Flyout extends Component {
         }
         return accum;
       },
-      []
+      [] as Array<{ oldId: string; newId: string }>
     );
   }
 
@@ -333,7 +362,7 @@ export class Flyout extends Component {
       failedImports,
     } = this.state;
 
-    const { services, indexPatterns } = this.props;
+    const { serviceRegistry, indexPatterns } = this.props;
 
     this.setState({
       error: undefined,
@@ -350,48 +379,48 @@ export class Flyout extends Component {
         // Do not Promise.all these calls as the order matters
         this.setState({
           loadingMessage: i18n.translate(
-            'kbn.management.objects.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage',
+            'savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage',
             { defaultMessage: 'Resolving conflicts…' }
           ),
         });
         if (resolutions.length) {
           importCount += await resolveIndexPatternConflicts(
             resolutions,
-            conflictedIndexPatterns,
+            conflictedIndexPatterns!,
             isOverwriteAllChecked,
-            this.props.indexPatterns
+            indexPatterns
           );
         }
         this.setState({
           loadingMessage: i18n.translate(
-            'kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage',
+            'savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage',
             { defaultMessage: 'Saving conflicts…' }
           ),
         });
         importCount += await saveObjects(
-          conflictedSavedObjectsLinkedToSavedSearches,
+          conflictedSavedObjectsLinkedToSavedSearches!,
           isOverwriteAllChecked
         );
         this.setState({
           loadingMessage: i18n.translate(
-            'kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage',
+            'savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage',
             { defaultMessage: 'Ensure saved searches are linked properly…' }
           ),
         });
         importCount += await resolveSavedSearches(
-          conflictedSearchDocs,
-          services,
+          conflictedSearchDocs!,
+          serviceRegistry.all().map(e => e.service),
           indexPatterns,
           isOverwriteAllChecked
         );
         this.setState({
           loadingMessage: i18n.translate(
-            'kbn.management.objects.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage',
+            'savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage',
             { defaultMessage: 'Retrying failed objects…' }
           ),
         });
         importCount += await saveObjects(
-          failedImports.map(({ obj }) => obj),
+          failedImports!.map(({ obj }) => obj) as any[],
           isOverwriteAllChecked
         );
       } catch (e) {
@@ -407,26 +436,26 @@ export class Flyout extends Component {
     this.setState({ status: 'success', importCount });
   };
 
-  onIndexChanged = (id, e) => {
+  onIndexChanged = (id: string, e: any) => {
     const value = e.target.value;
     this.setState(state => {
-      const conflictIndex = state.unmatchedReferences.findIndex(
+      const conflictIndex = state.unmatchedReferences?.findIndex(
         conflict => conflict.existingIndexPatternId === id
       );
-      if (conflictIndex === -1) {
+      if (conflictIndex === undefined || conflictIndex === -1) {
         return state;
       }
 
       return {
         unmatchedReferences: [
-          ...state.unmatchedReferences.slice(0, conflictIndex),
+          ...state.unmatchedReferences!.slice(0, conflictIndex),
           {
-            ...state.unmatchedReferences[conflictIndex],
+            ...state.unmatchedReferences![conflictIndex],
             newIndexPatternId: value,
           },
-          ...state.unmatchedReferences.slice(conflictIndex + 1),
+          ...state.unmatchedReferences!.slice(conflictIndex + 1),
         ],
-      };
+      } as any;
     });
   };
 
@@ -441,11 +470,11 @@ export class Flyout extends Component {
       {
         field: 'existingIndexPatternId',
         name: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdName',
+          'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdName',
           { defaultMessage: 'ID' }
         ),
         description: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdDescription',
+          'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription',
           { defaultMessage: 'ID of the index pattern' }
         ),
         sortable: true,
@@ -453,28 +482,28 @@ export class Flyout extends Component {
       {
         field: 'list',
         name: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountName',
+          'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName',
           { defaultMessage: 'Count' }
         ),
         description: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountDescription',
+          'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription',
           { defaultMessage: 'How many affected objects' }
         ),
-        render: list => {
+        render: (list: any[]) => {
           return <Fragment>{list.length}</Fragment>;
         },
       },
       {
         field: 'list',
         name: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName',
+          'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName',
           { defaultMessage: 'Sample of affected objects' }
         ),
         description: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription',
+          'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription',
           { defaultMessage: 'Sample of affected objects' }
         ),
-        render: list => {
+        render: (list: any[]) => {
           return (
             <ul style={{ listStyle: 'none' }}>
               {take(list, 3).map((obj, key) => (
@@ -487,15 +516,18 @@ export class Flyout extends Component {
       {
         field: 'existingIndexPatternId',
         name: i18n.translate(
-          'kbn.management.objects.objectsTable.flyout.renderConflicts.columnNewIndexPatternName',
+          'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName',
           { defaultMessage: 'New index pattern' }
         ),
-        render: id => {
-          const options = this.state.indexPatterns.map(indexPattern => ({
-            text: indexPattern.title,
-            value: indexPattern.id,
-            ['data-test-subj']: `indexPatternOption-${indexPattern.title}`,
-          }));
+        render: (id: string) => {
+          const options = this.state.indexPatterns!.map(
+            indexPattern =>
+              ({
+                text: indexPattern.title,
+                value: indexPattern.id,
+                'data-test-subj': `indexPatternOption-${indexPattern.title}`,
+              } as { text: string; value: string; 'data-test-subj'?: string })
+          );
 
           options.unshift({
             text: '-- Skip Import --',
@@ -518,7 +550,11 @@ export class Flyout extends Component {
     };
 
     return (
-      <EuiInMemoryTable items={unmatchedReferences} columns={columns} pagination={pagination} />
+      <EuiInMemoryTable
+        items={unmatchedReferences as any[]}
+        columns={columns}
+        pagination={pagination}
+      />
     );
   }
 
@@ -534,7 +570,7 @@ export class Flyout extends Component {
         <EuiCallOut
           title={
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.errorCalloutTitle"
+              id="savedObjectsManagement.objectsTable.flyout.errorCalloutTitle"
               defaultMessage="Sorry, there was an error"
             />
           }
@@ -581,7 +617,7 @@ export class Flyout extends Component {
           data-test-subj="importSavedObjectsFailedWarning"
           title={
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.importFailedTitle"
+              id="savedObjectsManagement.objectsTable.flyout.importFailedTitle"
               defaultMessage="Import failed"
             />
           }
@@ -590,7 +626,7 @@ export class Flyout extends Component {
         >
           <p>
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.importFailedDescription"
+              id="savedObjectsManagement.objectsTable.flyout.importFailedDescription"
               defaultMessage="Failed to import {failedImportCount} of {totalImportCount} objects. Import failed"
               values={{
                 failedImportCount: failedImports.length,
@@ -604,7 +640,7 @@ export class Flyout extends Component {
                 if (error.type === 'missing_references') {
                   return error.references.map(reference => {
                     return i18n.translate(
-                      'kbn.management.objects.objectsTable.flyout.importFailedMissingReference',
+                      'savedObjectsManagement.objectsTable.flyout.importFailedMissingReference',
                       {
                         defaultMessage: '{type} [id={id}] could not locate {refType} [id={refId}]',
                         values: {
@@ -618,7 +654,7 @@ export class Flyout extends Component {
                   });
                 } else if (error.type === 'unsupported_type') {
                   return i18n.translate(
-                    'kbn.management.objects.objectsTable.flyout.importFailedUnsupportedType',
+                    'savedObjectsManagement.objectsTable.flyout.importFailedUnsupportedType',
                     {
                       defaultMessage: '{type} [id={id}] unsupported type',
                       values: {
@@ -628,7 +664,7 @@ export class Flyout extends Component {
                     }
                   );
                 }
-                return getField(error, 'body.message', error.message || '');
+                return getField(error, 'body.message', (error as any).message ?? '');
               })
               .join(' ')}
           </p>
@@ -643,7 +679,7 @@ export class Flyout extends Component {
             data-test-subj="importSavedObjectsSuccessNoneImported"
             title={
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle"
+                id="savedObjectsManagement.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle"
                 defaultMessage="No objects imported"
               />
             }
@@ -657,7 +693,7 @@ export class Flyout extends Component {
           data-test-subj="importSavedObjectsSuccess"
           title={
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.importSuccessfulTitle"
+              id="savedObjectsManagement.objectsTable.flyout.importSuccessfulTitle"
               defaultMessage="Import successful"
             />
           }
@@ -666,7 +702,7 @@ export class Flyout extends Component {
         >
           <p>
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.importSuccessfulDescription"
+              id="savedObjectsManagement.objectsTable.flyout.importSuccessfulDescription"
               defaultMessage="Successfully imported {importCount} objects."
               values={{ importCount }}
             />
@@ -684,7 +720,7 @@ export class Flyout extends Component {
         <EuiFormRow
           label={
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.selectFileToImportFormRowLabel"
+              id="savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel"
               defaultMessage="Please select a file to import"
             />
           }
@@ -692,7 +728,7 @@ export class Flyout extends Component {
           <EuiFilePicker
             initialPromptText={
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.flyout.importPromptText"
+                id="savedObjectsManagement.objectsTable.flyout.importPromptText"
                 defaultMessage="Import"
               />
             }
@@ -704,7 +740,7 @@ export class Flyout extends Component {
             name="overwriteAll"
             label={
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.flyout.overwriteSavedObjectsLabel"
+                id="savedObjectsManagement.objectsTable.flyout.overwriteSavedObjectsLabel"
                 defaultMessage="Automatically overwrite all saved objects?"
               />
             }
@@ -727,7 +763,7 @@ export class Flyout extends Component {
       confirmButton = (
         <EuiButton onClick={done} size="s" fill data-test-subj="importSavedObjectsDoneBtn">
           <FormattedMessage
-            id="kbn.management.objects.objectsTable.flyout.importSuccessful.confirmButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmButtonLabel"
             defaultMessage="Done"
           />
         </EuiButton>
@@ -742,7 +778,7 @@ export class Flyout extends Component {
           data-test-subj="importSavedObjectsConfirmBtn"
         >
           <FormattedMessage
-            id="kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel"
             defaultMessage="Confirm all changes"
           />
         </EuiButton>
@@ -757,7 +793,7 @@ export class Flyout extends Component {
           data-test-subj="importSavedObjectsImportBtn"
         >
           <FormattedMessage
-            id="kbn.management.objects.objectsTable.flyout.import.confirmButtonLabel"
+            id="savedObjectsManagement.objectsTable.flyout.import.confirmButtonLabel"
             defaultMessage="Import"
           />
         </EuiButton>
@@ -769,7 +805,7 @@ export class Flyout extends Component {
         <EuiFlexItem grow={false}>
           <EuiButtonEmpty onClick={close} size="s">
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel"
+              id="savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           </EuiButtonEmpty>
@@ -791,7 +827,7 @@ export class Flyout extends Component {
           data-test-subj="importSavedObjectsLegacyWarning"
           title={
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle"
+              id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
               defaultMessage="Support for JSON files is going away"
             />
           }
@@ -800,7 +836,7 @@ export class Flyout extends Component {
         >
           <p>
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.legacyFileUsedBody"
+              id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
               defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
             />
           </p>
@@ -815,7 +851,7 @@ export class Flyout extends Component {
           data-test-subj="importSavedObjectsConflictsWarning"
           title={
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle"
+              id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
               defaultMessage="Index Pattern Conflicts"
             />
           }
@@ -824,7 +860,7 @@ export class Flyout extends Component {
         >
           <p>
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription"
+              id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
               defaultMessage="The following saved objects use index patterns that do not exist.
               Please select the index patterns you'd like re-associated with
               them. You can {indexPatternLink} if necessary."
@@ -832,7 +868,7 @@ export class Flyout extends Component {
                 indexPatternLink: (
                   <EuiLink href={this.props.newIndexPatternUrl}>
                     <FormattedMessage
-                      id="kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
+                      id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
                       defaultMessage="create a new index pattern"
                     />
                   </EuiLink>
@@ -867,11 +903,11 @@ export class Flyout extends Component {
   }
 
   overwriteConfirmed() {
-    this.state.conflictingRecord.done(true);
+    this.state.conflictingRecord!.done(true);
   }
 
   overwriteSkipped() {
-    this.state.conflictingRecord.done(false);
+    this.state.conflictingRecord!.done(false);
   }
 
   render() {
@@ -883,18 +919,18 @@ export class Flyout extends Component {
         <EuiOverlayMask>
           <EuiConfirmModal
             title={i18n.translate(
-              'kbn.management.objects.objectsTable.flyout.confirmOverwriteTitle',
+              'savedObjectsManagement.objectsTable.flyout.confirmOverwriteTitle',
               {
                 defaultMessage: 'Overwrite {type}?',
                 values: { type: this.state.conflictingRecord.type },
               }
             )}
             cancelButtonText={i18n.translate(
-              'kbn.management.objects.objectsTable.flyout.confirmOverwriteCancelButtonText',
+              'savedObjectsManagement.objectsTable.flyout.confirmOverwriteCancelButtonText',
               { defaultMessage: 'Cancel' }
             )}
             confirmButtonText={i18n.translate(
-              'kbn.management.objects.objectsTable.flyout.confirmOverwriteOverwriteButtonText',
+              'savedObjectsManagement.objectsTable.flyout.confirmOverwriteOverwriteButtonText',
               { defaultMessage: 'Overwrite' }
             )}
             buttonColor="danger"
@@ -904,7 +940,7 @@ export class Flyout extends Component {
           >
             <p>
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.flyout.confirmOverwriteBody"
+                id="savedObjectsManagement.objectsTable.flyout.confirmOverwriteBody"
                 defaultMessage="Are you sure you want to overwrite {title}?"
                 values={{
                   title:
@@ -924,7 +960,7 @@ export class Flyout extends Component {
           <EuiTitle size="m">
             <h2>
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.flyout.importSavedObjectTitle"
+                id="savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle"
                 defaultMessage="Import saved objects"
               />
             </h2>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/header.test.js b/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.test.tsx
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/header.test.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/header.test.tsx
index 1f501b5751224..891190d0bb24b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/header.test.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.test.tsx
@@ -19,8 +19,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-
-import { Header } from '../header';
+import { Header } from './header';
 
 describe('Header', () => {
   it('should render normally', () => {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/header.js b/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx
similarity index 83%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/header.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx
index 0bec8a0cf2daf..7a9584f08d632 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/header.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx
@@ -18,8 +18,6 @@
  */
 
 import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-
 import {
   EuiSpacer,
   EuiTitle,
@@ -31,14 +29,24 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-export const Header = ({ onExportAll, onImport, onRefresh, filteredCount }) => (
+export const Header = ({
+  onExportAll,
+  onImport,
+  onRefresh,
+  filteredCount,
+}: {
+  onExportAll: () => void;
+  onImport: () => void;
+  onRefresh: () => void;
+  filteredCount: number;
+}) => (
   <Fragment>
     <EuiFlexGroup justifyContent="spaceBetween" alignItems="baseline">
       <EuiFlexItem grow={false}>
         <EuiTitle>
           <h1>
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.header.savedObjectsTitle"
+              id="savedObjectsManagement.objectsTable.header.savedObjectsTitle"
               defaultMessage="Saved Objects"
             />
           </h1>
@@ -55,7 +63,7 @@ export const Header = ({ onExportAll, onImport, onRefresh, filteredCount }) => (
               onClick={onExportAll}
             >
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.header.exportButtonLabel"
+                id="savedObjectsManagement.objectsTable.header.exportButtonLabel"
                 defaultMessage="Export {filteredCount, plural, one{# object} other {# objects}}"
                 values={{
                   filteredCount,
@@ -71,7 +79,7 @@ export const Header = ({ onExportAll, onImport, onRefresh, filteredCount }) => (
               onClick={onImport}
             >
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.header.importButtonLabel"
+                id="savedObjectsManagement.objectsTable.header.importButtonLabel"
                 defaultMessage="Import"
               />
             </EuiButtonEmpty>
@@ -79,7 +87,7 @@ export const Header = ({ onExportAll, onImport, onRefresh, filteredCount }) => (
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty size="s" iconType="refresh" onClick={onRefresh}>
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.header.refreshButtonLabel"
+                id="savedObjectsManagement.objectsTable.header.refreshButtonLabel"
                 defaultMessage="Refresh"
               />
             </EuiButtonEmpty>
@@ -92,7 +100,7 @@ export const Header = ({ onExportAll, onImport, onRefresh, filteredCount }) => (
       <p>
         <EuiTextColor color="subdued">
           <FormattedMessage
-            id="kbn.management.objects.objectsTable.howToDeleteSavedObjectsDescription"
+            id="savedObjectsManagement.objectsTable.howToDeleteSavedObjectsDescription"
             defaultMessage="From here you can delete saved objects, such as saved searches.
             You can also edit the raw data of saved objects.
             Typically objects are only modified via their associated application,
@@ -104,10 +112,3 @@ export const Header = ({ onExportAll, onImport, onRefresh, filteredCount }) => (
     <EuiSpacer size="m" />
   </Fragment>
 );
-
-Header.propTypes = {
-  onExportAll: PropTypes.func.isRequired,
-  onImport: PropTypes.func.isRequired,
-  onRefresh: PropTypes.func.isRequired,
-  filteredCount: PropTypes.number.isRequired,
-};
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/index.ts b/src/plugins/saved_objects_management/public/management_section/objects_table/components/index.ts
new file mode 100644
index 0000000000000..9c8736a9011eb
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/index.ts
@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { Header } from './header';
+export { Table } from './table';
+export { Flyout } from './flyout';
+export { Relationships } from './relationships';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
similarity index 88%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
index 479726e8785d8..347f2d977015c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
@@ -19,27 +19,23 @@
 
 import React from 'react';
 import { shallowWithI18nProvider } from 'test_utils/enzyme_helpers';
+import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { Relationships, RelationshipsProps } from './relationships';
 
-jest.mock('ui/kfetch', () => ({ kfetch: jest.fn() }));
-
-jest.mock('ui/chrome', () => ({
-  addBasePath: () => '',
-}));
-
-jest.mock('../../../../../lib/fetch_export_by_type_and_search', () => ({
+jest.mock('../../../lib/fetch_export_by_type_and_search', () => ({
   fetchExportByTypeAndSearch: jest.fn(),
 }));
 
-jest.mock('../../../../../lib/fetch_export_objects', () => ({
+jest.mock('../../../lib/fetch_export_objects', () => ({
   fetchExportObjects: jest.fn(),
 }));
 
-import { Relationships } from '../relationships';
-
 describe('Relationships', () => {
   it('should render index patterns normally', async () => {
-    const props = {
+    const props: RelationshipsProps = {
       goInspectObject: () => {},
+      canGoInApp: () => true,
+      basePath: httpServiceMock.createSetupContract().basePath,
       getRelationships: jest.fn().mockImplementation(() => [
         {
           type: 'search',
@@ -73,6 +69,8 @@ describe('Relationships', () => {
       savedObject: {
         id: '1',
         type: 'index-pattern',
+        attributes: {},
+        references: [],
         meta: {
           title: 'MyIndexPattern*',
           icon: 'indexPatternApp',
@@ -101,8 +99,10 @@ describe('Relationships', () => {
   });
 
   it('should render searches normally', async () => {
-    const props = {
+    const props: RelationshipsProps = {
       goInspectObject: () => {},
+      canGoInApp: () => true,
+      basePath: httpServiceMock.createSetupContract().basePath,
       getRelationships: jest.fn().mockImplementation(() => [
         {
           type: 'index-pattern',
@@ -136,6 +136,8 @@ describe('Relationships', () => {
       savedObject: {
         id: '1',
         type: 'search',
+        attributes: {},
+        references: [],
         meta: {
           title: 'MySearch',
           icon: 'search',
@@ -164,8 +166,10 @@ describe('Relationships', () => {
   });
 
   it('should render visualizations normally', async () => {
-    const props = {
+    const props: RelationshipsProps = {
       goInspectObject: () => {},
+      canGoInApp: () => true,
+      basePath: httpServiceMock.createSetupContract().basePath,
       getRelationships: jest.fn().mockImplementation(() => [
         {
           type: 'dashboard',
@@ -199,6 +203,8 @@ describe('Relationships', () => {
       savedObject: {
         id: '1',
         type: 'visualization',
+        attributes: {},
+        references: [],
         meta: {
           title: 'MyViz',
           icon: 'visualizeApp',
@@ -227,8 +233,10 @@ describe('Relationships', () => {
   });
 
   it('should render dashboards normally', async () => {
-    const props = {
+    const props: RelationshipsProps = {
       goInspectObject: () => {},
+      canGoInApp: () => true,
+      basePath: httpServiceMock.createSetupContract().basePath,
       getRelationships: jest.fn().mockImplementation(() => [
         {
           type: 'visualization',
@@ -262,6 +270,8 @@ describe('Relationships', () => {
       savedObject: {
         id: '1',
         type: 'dashboard',
+        attributes: {},
+        references: [],
         meta: {
           title: 'MyDashboard',
           icon: 'dashboardApp',
@@ -290,14 +300,18 @@ describe('Relationships', () => {
   });
 
   it('should render errors', async () => {
-    const props = {
+    const props: RelationshipsProps = {
       goInspectObject: () => {},
+      canGoInApp: () => true,
+      basePath: httpServiceMock.createSetupContract().basePath,
       getRelationships: jest.fn().mockImplementation(() => {
         throw new Error('foo');
       }),
       savedObject: {
         id: '1',
         type: 'dashboard',
+        attributes: {},
+        references: [],
         meta: {
           title: 'MyDashboard',
           icon: 'dashboardApp',
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
similarity index 75%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
index ce3415ad2f0e7..ddb262138d565 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
@@ -18,8 +18,6 @@
  */
 
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
 import {
   EuiTitle,
   EuiFlyout,
@@ -34,25 +32,34 @@ import {
   EuiText,
   EuiSpacer,
 } from '@elastic/eui';
-import chrome from 'ui/chrome';
+import { FilterConfig } from '@elastic/eui/src/components/search_bar/filters/filters';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { getDefaultTitle, getSavedObjectLabel } from '../../../../lib';
+import { IBasePath } from 'src/core/public';
+import { getDefaultTitle, getSavedObjectLabel } from '../../../lib';
+import { SavedObjectWithMetadata, SavedObjectRelation } from '../../../types';
+
+export interface RelationshipsProps {
+  basePath: IBasePath;
+  getRelationships: (type: string, id: string) => Promise<SavedObjectRelation[]>;
+  savedObject: SavedObjectWithMetadata;
+  close: () => void;
+  goInspectObject: (obj: SavedObjectWithMetadata) => void;
+  canGoInApp: (obj: SavedObjectWithMetadata) => boolean;
+}
 
-export class Relationships extends Component {
-  static propTypes = {
-    getRelationships: PropTypes.func.isRequired,
-    savedObject: PropTypes.object.isRequired,
-    close: PropTypes.func.isRequired,
-    goInspectObject: PropTypes.func.isRequired,
-    canGoInApp: PropTypes.func.isRequired,
-  };
+export interface RelationshipsState {
+  relationships: SavedObjectRelation[];
+  isLoading: boolean;
+  error?: string;
+}
 
-  constructor(props) {
+export class Relationships extends Component<RelationshipsProps, RelationshipsState> {
+  constructor(props: RelationshipsProps) {
     super(props);
 
     this.state = {
-      relationships: undefined,
+      relationships: [],
       isLoading: false,
       error: undefined,
     };
@@ -62,7 +69,7 @@ export class Relationships extends Component {
     this.getRelationshipData();
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps: RelationshipsProps) {
     if (nextProps.savedObject.id !== this.props.savedObject.id) {
       this.getRelationshipData();
     }
@@ -92,7 +99,7 @@ export class Relationships extends Component {
       <EuiCallOut
         title={
           <FormattedMessage
-            id="kbn.management.objects.objectsTable.relationships.renderErrorMessage"
+            id="savedObjectsManagement.objectsTable.relationships.renderErrorMessage"
             defaultMessage="Error"
           />
         }
@@ -104,7 +111,7 @@ export class Relationships extends Component {
   }
 
   renderRelationships() {
-    const { goInspectObject, savedObject } = this.props;
+    const { goInspectObject, savedObject, basePath } = this.props;
     const { relationships, isLoading, error } = this.state;
 
     if (error) {
@@ -118,17 +125,17 @@ export class Relationships extends Component {
     const columns = [
       {
         field: 'type',
-        name: i18n.translate('kbn.management.objects.objectsTable.relationships.columnTypeName', {
+        name: i18n.translate('savedObjectsManagement.objectsTable.relationships.columnTypeName', {
           defaultMessage: 'Type',
         }),
         width: '50px',
         align: 'center',
         description: i18n.translate(
-          'kbn.management.objects.objectsTable.relationships.columnTypeDescription',
+          'savedObjectsManagement.objectsTable.relationships.columnTypeDescription',
           { defaultMessage: 'Type of the saved object' }
         ),
         sortable: false,
-        render: (type, object) => {
+        render: (type: string, object: SavedObjectWithMetadata) => {
           return (
             <EuiToolTip position="top" content={getSavedObjectLabel(type)}>
               <EuiIcon
@@ -144,19 +151,19 @@ export class Relationships extends Component {
       {
         field: 'relationship',
         name: i18n.translate(
-          'kbn.management.objects.objectsTable.relationships.columnRelationshipName',
+          'savedObjectsManagement.objectsTable.relationships.columnRelationshipName',
           { defaultMessage: 'Direct relationship' }
         ),
         dataType: 'string',
         sortable: false,
         width: '125px',
         'data-test-subj': 'directRelationship',
-        render: relationship => {
+        render: (relationship: string) => {
           if (relationship === 'parent') {
             return (
               <EuiText size="s">
                 <FormattedMessage
-                  id="kbn.management.objects.objectsTable.relationships.columnRelationship.parentAsValue"
+                  id="savedObjectsManagement.objectsTable.relationships.columnRelationship.parentAsValue"
                   defaultMessage="Parent"
                 />
               </EuiText>
@@ -166,7 +173,7 @@ export class Relationships extends Component {
             return (
               <EuiText size="s">
                 <FormattedMessage
-                  id="kbn.management.objects.objectsTable.relationships.columnRelationship.childAsValue"
+                  id="savedObjectsManagement.objectsTable.relationships.columnRelationship.childAsValue"
                   defaultMessage="Child"
                 />
               </EuiText>
@@ -176,17 +183,17 @@ export class Relationships extends Component {
       },
       {
         field: 'meta.title',
-        name: i18n.translate('kbn.management.objects.objectsTable.relationships.columnTitleName', {
+        name: i18n.translate('savedObjectsManagement.objectsTable.relationships.columnTitleName', {
           defaultMessage: 'Title',
         }),
         description: i18n.translate(
-          'kbn.management.objects.objectsTable.relationships.columnTitleDescription',
+          'savedObjectsManagement.objectsTable.relationships.columnTitleDescription',
           { defaultMessage: 'Title of the saved object' }
         ),
         dataType: 'string',
         sortable: false,
-        render: (title, object) => {
-          const { path } = object.meta.inAppUrl || {};
+        render: (title: string, object: SavedObjectWithMetadata) => {
+          const { path = '' } = object.meta.inAppUrl || {};
           const canGoInApp = this.props.canGoInApp(object);
           if (!canGoInApp) {
             return (
@@ -196,7 +203,7 @@ export class Relationships extends Component {
             );
           }
           return (
-            <EuiLink href={chrome.addBasePath(path)} data-test-subj="relationshipsTitle">
+            <EuiLink href={basePath.prepend(path)} data-test-subj="relationshipsTitle">
               {title || getDefaultTitle(object)}
             </EuiLink>
           );
@@ -204,24 +211,24 @@ export class Relationships extends Component {
       },
       {
         name: i18n.translate(
-          'kbn.management.objects.objectsTable.relationships.columnActionsName',
+          'savedObjectsManagement.objectsTable.relationships.columnActionsName',
           { defaultMessage: 'Actions' }
         ),
         actions: [
           {
             name: i18n.translate(
-              'kbn.management.objects.objectsTable.relationships.columnActions.inspectActionName',
+              'savedObjectsManagement.objectsTable.relationships.columnActions.inspectActionName',
               { defaultMessage: 'Inspect' }
             ),
             description: i18n.translate(
-              'kbn.management.objects.objectsTable.relationships.columnActions.inspectActionDescription',
+              'savedObjectsManagement.objectsTable.relationships.columnActions.inspectActionDescription',
               { defaultMessage: 'Inspect this saved object' }
             ),
             type: 'icon',
             icon: 'inspect',
             'data-test-subj': 'relationshipsTableAction-inspect',
-            onClick: object => goInspectObject(object),
-            available: object => !!object.meta.editUrl,
+            onClick: (object: SavedObjectWithMetadata) => goInspectObject(object),
+            available: (object: SavedObjectWithMetadata) => !!object.meta.editUrl,
           },
         ],
       },
@@ -244,7 +251,7 @@ export class Relationships extends Component {
           type: 'field_value_selection',
           field: 'relationship',
           name: i18n.translate(
-            'kbn.management.objects.objectsTable.relationships.search.filters.relationship.name',
+            'savedObjectsManagement.objectsTable.relationships.search.filters.relationship.name',
             { defaultMessage: 'Direct relationship' }
           ),
           multiSelect: 'or',
@@ -253,7 +260,7 @@ export class Relationships extends Component {
               value: 'parent',
               name: 'parent',
               view: i18n.translate(
-                'kbn.management.objects.objectsTable.relationships.search.filters.relationship.parentAsValue.view',
+                'savedObjectsManagement.objectsTable.relationships.search.filters.relationship.parentAsValue.view',
                 { defaultMessage: 'Parent' }
               ),
             },
@@ -261,7 +268,7 @@ export class Relationships extends Component {
               value: 'child',
               name: 'child',
               view: i18n.translate(
-                'kbn.management.objects.objectsTable.relationships.search.filters.relationship.childAsValue.view',
+                'savedObjectsManagement.objectsTable.relationships.search.filters.relationship.childAsValue.view',
                 { defaultMessage: 'Child' }
               ),
             },
@@ -271,13 +278,13 @@ export class Relationships extends Component {
           type: 'field_value_selection',
           field: 'type',
           name: i18n.translate(
-            'kbn.management.objects.objectsTable.relationships.search.filters.type.name',
+            'savedObjectsManagement.objectsTable.relationships.search.filters.type.name',
             { defaultMessage: 'Type' }
           ),
           multiSelect: 'or',
           options: [...filterTypesMap.values()],
         },
-      ],
+      ] as FilterConfig[],
     };
 
     return (
@@ -285,7 +292,7 @@ export class Relationships extends Component {
         <EuiCallOut>
           <p>
             {i18n.translate(
-              'kbn.management.objects.objectsTable.relationships.relationshipsTitle',
+              'savedObjectsManagement.objectsTable.relationships.relationshipsTitle',
               {
                 defaultMessage:
                   'Here are the saved objects related to {title}. ' +
@@ -301,7 +308,7 @@ export class Relationships extends Component {
         <EuiSpacer />
         <EuiInMemoryTable
           items={relationships}
-          columns={columns}
+          columns={columns as any}
           pagination={true}
           search={search}
           rowProps={() => ({
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
similarity index 87%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
index 9b3e2314c9f84..356f227773610 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
@@ -19,27 +19,22 @@
 
 import React from 'react';
 import { shallowWithI18nProvider, mountWithI18nProvider } from 'test_utils/enzyme_helpers';
+// @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { keyCodes } from '@elastic/eui/lib/services';
-import { npSetup as mockNpSetup } from '../../../../../../../../../../../ui/public/new_platform/__mocks__';
+import { keyCodes } from '@elastic/eui';
+import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { actionServiceMock } from '../../../services/action_service.mock';
+import { Table, TableProps } from './table';
 
-jest.mock('ui/kfetch', () => ({ kfetch: jest.fn() }));
-
-jest.mock('ui/chrome', () => ({
-  addBasePath: () => '',
-}));
-
-jest.mock('ui/new_platform', () => ({
-  npSetup: mockNpSetup,
-}));
-
-import { Table } from '../table';
-
-const defaultProps = {
+const defaultProps: TableProps = {
+  basePath: httpServiceMock.createSetupContract().basePath,
+  actionRegistry: actionServiceMock.createStart(),
   selectedSavedObjects: [
     {
       id: '1',
       type: 'index-pattern',
+      attributes: {},
+      references: [],
       meta: {
         title: `MyIndexPattern*`,
         icon: 'indexPatternApp',
@@ -58,13 +53,15 @@ const defaultProps = {
   onDelete: () => {},
   onExport: () => {},
   goInspectObject: () => {},
-  canGoInApp: () => {},
+  canGoInApp: () => true,
   pageIndex: 1,
   pageSize: 2,
   items: [
     {
       id: '1',
       type: 'index-pattern',
+      attributes: {},
+      references: [],
       meta: {
         title: `MyIndexPattern*`,
         icon: 'indexPatternApp',
@@ -120,7 +117,7 @@ describe('Table', () => {
       { type: 'visualization' },
       { type: 'search' },
       { type: 'index-pattern' },
-    ];
+    ] as any;
     const customizedProps = { ...defaultProps, selectedSavedObjects, canDelete: false };
     const component = shallowWithI18nProvider(<Table {...customizedProps} />);
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
similarity index 71%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
index 132fa1e691c1c..5b574e4b3d331 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
@@ -17,12 +17,10 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
-import { npSetup } from 'ui/new_platform';
+import { IBasePath } from 'src/core/public';
 import React, { PureComponent, Fragment } from 'react';
-import PropTypes from 'prop-types';
-
 import {
+  // @ts-ignore
   EuiSearchBar,
   EuiBasicTable,
   EuiButton,
@@ -35,54 +33,64 @@ import {
   EuiSwitch,
   EuiFormRow,
   EuiText,
+  EuiTableFieldDataColumnType,
+  EuiTableActionsColumnType,
 } from '@elastic/eui';
-import { getDefaultTitle, getSavedObjectLabel } from '../../../../lib';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { getDefaultTitle, getSavedObjectLabel } from '../../../lib';
+import { SavedObjectWithMetadata } from '../../../types';
+import {
+  SavedObjectsManagementActionServiceStart,
+  SavedObjectsManagementAction,
+} from '../../../services';
 
-export class Table extends PureComponent {
-  static propTypes = {
-    selectedSavedObjects: PropTypes.array.isRequired,
-    selectionConfig: PropTypes.shape({
-      selectable: PropTypes.func,
-      selectableMessage: PropTypes.func,
-      onSelectionChange: PropTypes.func.isRequired,
-    }).isRequired,
-    filterOptions: PropTypes.array.isRequired,
-    canDelete: PropTypes.bool.isRequired,
-    onDelete: PropTypes.func.isRequired,
-    onExport: PropTypes.func.isRequired,
-    goInspectObject: PropTypes.func.isRequired,
-
-    pageIndex: PropTypes.number.isRequired,
-    pageSize: PropTypes.number.isRequired,
-    items: PropTypes.array.isRequired,
-    itemId: PropTypes.oneOfType([
-      PropTypes.string, // the name of the item id property
-      PropTypes.func, // (item) => string
-    ]),
-    totalItemCount: PropTypes.number.isRequired,
-    onQueryChange: PropTypes.func.isRequired,
-    onTableChange: PropTypes.func.isRequired,
-    isSearching: PropTypes.bool.isRequired,
-
-    onShowRelationships: PropTypes.func.isRequired,
+export interface TableProps {
+  basePath: IBasePath;
+  actionRegistry: SavedObjectsManagementActionServiceStart;
+  selectedSavedObjects: SavedObjectWithMetadata[];
+  selectionConfig: {
+    onSelectionChange: (selection: SavedObjectWithMetadata[]) => void;
   };
+  filterOptions: any[];
+  canDelete: boolean;
+  onDelete: () => void;
+  onExport: (includeReferencesDeep: boolean) => void;
+  goInspectObject: (obj: SavedObjectWithMetadata) => void;
+  pageIndex: number;
+  pageSize: number;
+  items: SavedObjectWithMetadata[];
+  itemId: string | (() => string);
+  totalItemCount: number;
+  onQueryChange: (query: any) => void;
+  onTableChange: (table: any) => void;
+  isSearching: boolean;
+  onShowRelationships: (object: SavedObjectWithMetadata) => void;
+  canGoInApp: (obj: SavedObjectWithMetadata) => boolean;
+}
+
+interface TableState {
+  isSearchTextValid: boolean;
+  parseErrorMessage: any;
+  isExportPopoverOpen: boolean;
+  isIncludeReferencesDeepChecked: boolean;
+  activeAction?: SavedObjectsManagementAction;
+}
 
-  state = {
+export class Table extends PureComponent<TableProps, TableState> {
+  state: TableState = {
     isSearchTextValid: true,
     parseErrorMessage: null,
     isExportPopoverOpen: false,
     isIncludeReferencesDeepChecked: true,
-    activeAction: null,
+    activeAction: undefined,
   };
 
-  constructor(props) {
+  constructor(props: TableProps) {
     super(props);
-    this.extraActions = npSetup.plugins.savedObjectsManagement.actionRegistry.getAll();
   }
 
-  onChange = ({ query, error }) => {
+  onChange = ({ query, error }: any) => {
     if (error) {
       this.setState({
         isSearchTextValid: false,
@@ -136,12 +144,14 @@ export class Table extends PureComponent {
       onTableChange,
       goInspectObject,
       onShowRelationships,
+      basePath,
+      actionRegistry,
     } = this.props;
 
     const pagination = {
-      pageIndex: pageIndex,
-      pageSize: pageSize,
-      totalItemCount: totalItemCount,
+      pageIndex,
+      pageSize,
+      totalItemCount,
       pageSizeOptions: [5, 10, 20, 50],
     };
 
@@ -149,7 +159,7 @@ export class Table extends PureComponent {
       {
         type: 'field_value_selection',
         field: 'type',
-        name: i18n.translate('kbn.management.objects.objectsTable.table.typeFilterName', {
+        name: i18n.translate('savedObjectsManagement.objectsTable.table.typeFilterName', {
           defaultMessage: 'Type',
         }),
         multiSelect: 'or',
@@ -168,18 +178,18 @@ export class Table extends PureComponent {
     const columns = [
       {
         field: 'type',
-        name: i18n.translate('kbn.management.objects.objectsTable.table.columnTypeName', {
+        name: i18n.translate('savedObjectsManagement.objectsTable.table.columnTypeName', {
           defaultMessage: 'Type',
         }),
         width: '50px',
         align: 'center',
         description: i18n.translate(
-          'kbn.management.objects.objectsTable.table.columnTypeDescription',
+          'savedObjectsManagement.objectsTable.table.columnTypeDescription',
           { defaultMessage: 'Type of the saved object' }
         ),
         sortable: false,
         'data-test-subj': 'savedObjectsTableRowType',
-        render: (type, object) => {
+        render: (type: string, object: SavedObjectWithMetadata) => {
           return (
             <EuiToolTip position="top" content={getSavedObjectLabel(type)}>
               <EuiIcon
@@ -191,42 +201,42 @@ export class Table extends PureComponent {
             </EuiToolTip>
           );
         },
-      },
+      } as EuiTableFieldDataColumnType<SavedObjectWithMetadata<any>>,
       {
         field: 'meta.title',
-        name: i18n.translate('kbn.management.objects.objectsTable.table.columnTitleName', {
+        name: i18n.translate('savedObjectsManagement.objectsTable.table.columnTitleName', {
           defaultMessage: 'Title',
         }),
         description: i18n.translate(
-          'kbn.management.objects.objectsTable.table.columnTitleDescription',
+          'savedObjectsManagement.objectsTable.table.columnTitleDescription',
           { defaultMessage: 'Title of the saved object' }
         ),
         dataType: 'string',
         sortable: false,
         'data-test-subj': 'savedObjectsTableRowTitle',
-        render: (title, object) => {
-          const { path } = object.meta.inAppUrl || {};
+        render: (title: string, object: SavedObjectWithMetadata) => {
+          const { path = '' } = object.meta.inAppUrl || {};
           const canGoInApp = this.props.canGoInApp(object);
           if (!canGoInApp) {
             return <EuiText size="s">{title || getDefaultTitle(object)}</EuiText>;
           }
           return (
-            <EuiLink href={chrome.addBasePath(path)}>{title || getDefaultTitle(object)}</EuiLink>
+            <EuiLink href={basePath.prepend(path)}>{title || getDefaultTitle(object)}</EuiLink>
           );
         },
-      },
+      } as EuiTableFieldDataColumnType<SavedObjectWithMetadata<any>>,
       {
-        name: i18n.translate('kbn.management.objects.objectsTable.table.columnActionsName', {
+        name: i18n.translate('savedObjectsManagement.objectsTable.table.columnActionsName', {
           defaultMessage: 'Actions',
         }),
         actions: [
           {
             name: i18n.translate(
-              'kbn.management.objects.objectsTable.table.columnActions.inspectActionName',
+              'savedObjectsManagement.objectsTable.table.columnActions.inspectActionName',
               { defaultMessage: 'Inspect' }
             ),
             description: i18n.translate(
-              'kbn.management.objects.objectsTable.table.columnActions.inspectActionDescription',
+              'savedObjectsManagement.objectsTable.table.columnActions.inspectActionDescription',
               { defaultMessage: 'Inspect this saved object' }
             ),
             type: 'icon',
@@ -237,11 +247,11 @@ export class Table extends PureComponent {
           },
           {
             name: i18n.translate(
-              'kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionName',
+              'savedObjectsManagement.objectsTable.table.columnActions.viewRelationshipsActionName',
               { defaultMessage: 'Relationships' }
             ),
             description: i18n.translate(
-              'kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionDescription',
+              'savedObjectsManagement.objectsTable.table.columnActions.viewRelationshipsActionDescription',
               {
                 defaultMessage:
                   'View the relationships this saved object has to other saved objects',
@@ -252,33 +262,35 @@ export class Table extends PureComponent {
             onClick: object => onShowRelationships(object),
             'data-test-subj': 'savedObjectsTableAction-relationships',
           },
-          ...this.extraActions.map(action => {
+          ...actionRegistry.getAll().map(action => {
             return {
               ...action.euiAction,
               'data-test-subj': `savedObjectsTableAction-${action.id}`,
-              onClick: object => {
+              onClick: (object: SavedObjectWithMetadata) => {
                 this.setState({
                   activeAction: action,
                 });
 
                 action.registerOnFinishCallback(() => {
                   this.setState({
-                    activeAction: null,
+                    activeAction: undefined,
                   });
                 });
 
-                action.euiAction.onClick(object);
+                if (action.euiAction.onClick) {
+                  action.euiAction.onClick(object as any);
+                }
               },
             };
           }),
         ],
-      },
+      } as EuiTableActionsColumnType<SavedObjectWithMetadata>,
     ];
 
     let queryParseError;
     if (!this.state.isSearchTextValid) {
       const parseErrorMsg = i18n.translate(
-        'kbn.management.objects.objectsTable.searchBar.unableToParseQueryErrorMessage',
+        'savedObjectsManagement.objectsTable.searchBar.unableToParseQueryErrorMessage',
         { defaultMessage: 'Unable to parse query' }
       );
       queryParseError = (
@@ -294,20 +306,20 @@ export class Table extends PureComponent {
         isDisabled={selectedSavedObjects.length === 0}
       >
         <FormattedMessage
-          id="kbn.management.objects.objectsTable.table.exportPopoverButtonLabel"
+          id="savedObjectsManagement.objectsTable.table.exportPopoverButtonLabel"
           defaultMessage="Export"
         />
       </EuiButton>
     );
 
-    const activeActionContents = this.state.activeAction ? this.state.activeAction.render() : null;
+    const activeActionContents = this.state.activeAction?.render() ?? null;
 
     return (
       <Fragment>
         {activeActionContents}
         <EuiSearchBar
           box={{ 'data-test-subj': 'savedObjectSearchBar' }}
-          filters={filters}
+          filters={filters as any}
           onChange={this.onChange}
           toolsRight={[
             <EuiButton
@@ -319,14 +331,14 @@ export class Table extends PureComponent {
               title={
                 this.props.canDelete
                   ? undefined
-                  : i18n.translate('kbn.management.objects.objectsTable.table.deleteButtonTitle', {
+                  : i18n.translate('savedObjectsManagement.objectsTable.table.deleteButtonTitle', {
                       defaultMessage: 'Unable to delete saved objects',
                     })
               }
               data-test-subj="savedObjectsManagementDelete"
             >
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.table.deleteButtonLabel"
+                id="savedObjectsManagement.objectsTable.table.deleteButtonLabel"
                 defaultMessage="Delete"
               />
             </EuiButton>,
@@ -339,7 +351,7 @@ export class Table extends PureComponent {
               <EuiFormRow
                 label={
                   <FormattedMessage
-                    id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel"
+                    id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportOptionsLabel"
                     defaultMessage="Options"
                   />
                 }
@@ -348,7 +360,7 @@ export class Table extends PureComponent {
                   name="includeReferencesDeep"
                   label={
                     <FormattedMessage
-                      id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
+                      id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
                       defaultMessage="Include related objects"
                     />
                   }
@@ -359,7 +371,7 @@ export class Table extends PureComponent {
               <EuiFormRow>
                 <EuiButton key="exportSO" iconType="exportAction" onClick={this.onExportClick} fill>
                   <FormattedMessage
-                    id="kbn.management.objects.objectsTable.table.exportButtonLabel"
+                    id="savedObjectsManagement.objectsTable.table.exportButtonLabel"
                     defaultMessage="Export"
                   />
                 </EuiButton>
@@ -374,7 +386,7 @@ export class Table extends PureComponent {
             loading={isSearching}
             itemId={itemId}
             items={items}
-            columns={columns}
+            columns={columns as any}
             pagination={pagination}
             selection={selection}
             onChange={onTableChange}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/index.js b/src/plugins/saved_objects_management/public/management_section/objects_table/index.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/index.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/index.ts
index e1195c6edfe31..8777b15389690 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/index.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { Table } from './table';
+export { SavedObjectsTable } from './saved_objects_table';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts
new file mode 100644
index 0000000000000..6b4659a6b5a13
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts
@@ -0,0 +1,67 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const saveAsMock = jest.fn();
+jest.doMock('@elastic/filesaver', () => ({
+  saveAs: saveAsMock,
+}));
+
+jest.doMock('lodash', () => ({
+  ...jest.requireActual('lodash'),
+  debounce: (func: Function) => {
+    function debounced(this: any, ...args: any[]) {
+      return func.apply(this, args);
+    }
+    return debounced;
+  },
+}));
+
+export const findObjectsMock = jest.fn();
+jest.doMock('../../lib/find_objects', () => ({
+  findObjects: findObjectsMock,
+}));
+
+export const fetchExportObjectsMock = jest.fn();
+jest.doMock('../../lib/fetch_export_objects', () => ({
+  fetchExportObjects: fetchExportObjectsMock,
+}));
+
+export const fetchExportByTypeAndSearchMock = jest.fn();
+jest.doMock('../../lib/fetch_export_by_type_and_search', () => ({
+  fetchExportByTypeAndSearch: fetchExportByTypeAndSearchMock,
+}));
+
+export const extractExportDetailsMock = jest.fn();
+jest.doMock('../../lib/extract_export_details', () => ({
+  extractExportDetails: extractExportDetailsMock,
+}));
+
+jest.doMock('./components/header', () => ({
+  Header: () => 'Header',
+}));
+
+export const getSavedObjectCountsMock = jest.fn();
+jest.doMock('../../lib/get_saved_object_counts', () => ({
+  getSavedObjectCounts: getSavedObjectCountsMock,
+}));
+
+export const getRelationshipsMock = jest.fn();
+jest.doMock('../../lib/get_relationships', () => ({
+  getRelationships: getRelationshipsMock,
+}));
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
similarity index 58%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
index 7b9c17640a0f3..342fdc4784b09 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
@@ -17,69 +17,39 @@
  * under the License.
  */
 
+import {
+  extractExportDetailsMock,
+  fetchExportByTypeAndSearchMock,
+  fetchExportObjectsMock,
+  findObjectsMock,
+  getRelationshipsMock,
+  getSavedObjectCountsMock,
+  saveAsMock,
+} from './saved_objects_table.test.mocks';
+
 import React from 'react';
-import { shallowWithI18nProvider } from 'test_utils/enzyme_helpers';
-import { mockManagementPlugin } from '../../../../../../../../../../plugins/index_pattern_management/public/mocks';
 import { Query } from '@elastic/eui';
-
-import { ObjectsTable, POSSIBLE_TYPES } from '../objects_table';
-import { Flyout } from '../components/flyout/';
-import { Relationships } from '../components/relationships/';
-import { findObjects } from '../../../lib';
-import { extractExportDetails } from '../../../lib/extract_export_details';
-
-jest.mock('ui/kfetch', () => ({ kfetch: jest.fn() }));
-
-jest.mock('../../../../../../../../../../plugins/index_pattern_management/public', () => ({
-  setup: mockManagementPlugin.createSetupContract(),
-  start: mockManagementPlugin.createStartContract(),
-}));
-
-jest.mock('../../../lib/find_objects', () => ({
-  findObjects: jest.fn(),
-}));
-
-jest.mock('../components/header', () => ({
-  Header: () => 'Header',
-}));
-
-jest.mock('ui/chrome', () => ({
-  addBasePath: () => '',
-  getInjected: () => ['index-pattern', 'visualization', 'dashboard', 'search'],
-}));
-
-jest.mock('../../../lib/fetch_export_objects', () => ({
-  fetchExportObjects: jest.fn(),
-}));
-
-jest.mock('../../../lib/fetch_export_by_type_and_search', () => ({
-  fetchExportByTypeAndSearch: jest.fn(),
-}));
-
-jest.mock('../../../lib/extract_export_details', () => ({
-  extractExportDetails: jest.fn(),
-}));
-
-jest.mock('../../../lib/get_saved_object_counts', () => ({
-  getSavedObjectCounts: jest.fn().mockImplementation(() => {
-    return {
-      'index-pattern': 0,
-      visualization: 0,
-      dashboard: 0,
-      search: 0,
-    };
-  }),
-}));
-
-jest.mock('@elastic/filesaver', () => ({
-  saveAs: jest.fn(),
-}));
-
-jest.mock('../../../lib/get_relationships', () => ({
-  getRelationships: jest.fn(),
-}));
-
-jest.mock('ui/notify', () => ({}));
+import { ShallowWrapper } from 'enzyme';
+import { shallowWithI18nProvider } from 'test_utils/enzyme_helpers';
+import {
+  httpServiceMock,
+  overlayServiceMock,
+  notificationServiceMock,
+  savedObjectsServiceMock,
+  applicationServiceMock,
+} from '../../../../../core/public/mocks';
+import { dataPluginMock } from '../../../../data/public/mocks';
+import { serviceRegistryMock } from '../../services/service_registry.mock';
+import { actionServiceMock } from '../../services/action_service.mock';
+import {
+  SavedObjectsTable,
+  SavedObjectsTableProps,
+  SavedObjectsTableState,
+} from './saved_objects_table';
+import { Flyout, Relationships } from './components';
+import { SavedObjectWithMetadata } from '../../types';
+
+const allowedTypes = ['index-pattern', 'visualization', 'dashboard', 'search'];
 
 const allSavedObjects = [
   {
@@ -112,122 +82,128 @@ const allSavedObjects = [
   },
 ];
 
-const $http = () => {};
-$http.post = jest.fn().mockImplementation(() => []);
-const defaultProps = {
-  goInspectObject: () => {},
-  confirmModalPromise: jest.fn(),
-  savedObjectsClient: {
-    find: jest.fn(),
-    bulkGet: jest.fn(),
-  },
-  indexPatterns: {
-    clearCache: jest.fn(),
-  },
-  $http,
-  basePath: '',
-  newIndexPatternUrl: '',
-  kbnIndex: '',
-  services: [],
-  uiCapabilities: {
-    savedObjectsManagement: {
-      read: true,
-      edit: false,
-      delete: false,
-    },
-  },
-  canDelete: true,
-};
-
-beforeEach(() => {
-  findObjects.mockImplementation(() => ({
-    total: 4,
-    savedObjects: [
-      {
-        id: '1',
-        type: 'index-pattern',
-        meta: {
-          title: `MyIndexPattern*`,
-          icon: 'indexPatternApp',
-          editUrl: '#/management/kibana/index_patterns/1',
-          inAppUrl: {
-            path: '/management/kibana/index_patterns/1',
-            uiCapabilitiesPath: 'management.kibana.index_patterns',
+describe('SavedObjectsTable', () => {
+  let defaultProps: SavedObjectsTableProps;
+  let http: ReturnType<typeof httpServiceMock.createStartContract>;
+  let overlays: ReturnType<typeof overlayServiceMock.createStartContract>;
+  let notifications: ReturnType<typeof notificationServiceMock.createStartContract>;
+  let savedObjects: ReturnType<typeof savedObjectsServiceMock.createStartContract>;
+
+  const shallowRender = (overrides: Partial<SavedObjectsTableProps> = {}) => {
+    return (shallowWithI18nProvider(
+      <SavedObjectsTable {...defaultProps} {...overrides} />
+    ) as unknown) as ShallowWrapper<
+      SavedObjectsTableProps,
+      SavedObjectsTableState,
+      SavedObjectsTable
+    >;
+  };
+
+  beforeEach(() => {
+    extractExportDetailsMock.mockReset();
+
+    http = httpServiceMock.createStartContract();
+    overlays = overlayServiceMock.createStartContract();
+    notifications = notificationServiceMock.createStartContract();
+    savedObjects = savedObjectsServiceMock.createStartContract();
+
+    const applications = applicationServiceMock.createStartContract();
+    applications.capabilities = {
+      navLinks: {},
+      management: {},
+      catalogue: {},
+      savedObjectsManagement: {
+        read: true,
+        edit: false,
+        delete: false,
+      },
+    };
+
+    http.post.mockResolvedValue([]);
+
+    getSavedObjectCountsMock.mockReturnValue({
+      'index-pattern': 0,
+      visualization: 0,
+      dashboard: 0,
+      search: 0,
+    });
+
+    defaultProps = {
+      allowedTypes,
+      serviceRegistry: serviceRegistryMock.create(),
+      actionRegistry: actionServiceMock.createStart(),
+      savedObjectsClient: savedObjects.client,
+      indexPatterns: dataPluginMock.createStartContract().indexPatterns,
+      http,
+      overlays,
+      notifications,
+      applications,
+      perPageConfig: 15,
+      goInspectObject: () => {},
+      canGoInApp: () => true,
+    };
+
+    findObjectsMock.mockImplementation(() => ({
+      total: 4,
+      savedObjects: [
+        {
+          id: '1',
+          type: 'index-pattern',
+          meta: {
+            title: `MyIndexPattern*`,
+            icon: 'indexPatternApp',
+            editUrl: '#/management/kibana/index_patterns/1',
+            inAppUrl: {
+              path: '/management/kibana/index_patterns/1',
+              uiCapabilitiesPath: 'management.kibana.index_patterns',
+            },
           },
         },
-      },
-      {
-        id: '2',
-        type: 'search',
-        meta: {
-          title: `MySearch`,
-          icon: 'search',
-          editUrl: '#/management/kibana/objects/savedSearches/2',
-          inAppUrl: {
-            path: '/discover/2',
-            uiCapabilitiesPath: 'discover.show',
+        {
+          id: '2',
+          type: 'search',
+          meta: {
+            title: `MySearch`,
+            icon: 'search',
+            editUrl: '#/management/kibana/objects/savedSearches/2',
+            inAppUrl: {
+              path: '/discover/2',
+              uiCapabilitiesPath: 'discover.show',
+            },
           },
         },
-      },
-      {
-        id: '3',
-        type: 'dashboard',
-        meta: {
-          title: `MyDashboard`,
-          icon: 'dashboardApp',
-          editUrl: '#/management/kibana/objects/savedDashboards/3',
-          inAppUrl: {
-            path: '/dashboard/3',
-            uiCapabilitiesPath: 'dashboard.show',
+        {
+          id: '3',
+          type: 'dashboard',
+          meta: {
+            title: `MyDashboard`,
+            icon: 'dashboardApp',
+            editUrl: '#/management/kibana/objects/savedDashboards/3',
+            inAppUrl: {
+              path: '/dashboard/3',
+              uiCapabilitiesPath: 'dashboard.show',
+            },
           },
         },
-      },
-      {
-        id: '4',
-        type: 'visualization',
-        meta: {
-          title: `MyViz`,
-          icon: 'visualizeApp',
-          editUrl: '#/management/kibana/objects/savedVisualizations/4',
-          inAppUrl: {
-            path: '/visualize/edit/4',
-            uiCapabilitiesPath: 'visualize.show',
+        {
+          id: '4',
+          type: 'visualization',
+          meta: {
+            title: `MyViz`,
+            icon: 'visualizeApp',
+            editUrl: '#/management/kibana/objects/savedVisualizations/4',
+            inAppUrl: {
+              path: '/visualize/edit/4',
+              uiCapabilitiesPath: 'visualize.show',
+            },
           },
         },
-      },
-    ],
-  }));
-});
-
-let addDangerMock;
-let addSuccessMock;
-let addWarningMock;
-
-describe('ObjectsTable', () => {
-  beforeEach(() => {
-    defaultProps.savedObjectsClient.find.mockClear();
-    extractExportDetails.mockReset();
-    // mock _.debounce to fire immediately with no internal timer
-    require('lodash').debounce = func => {
-      function debounced(...args) {
-        return func.apply(this, args);
-      }
-      return debounced;
-    };
-    addDangerMock = jest.fn();
-    addSuccessMock = jest.fn();
-    addWarningMock = jest.fn();
-    require('ui/notify').toastNotifications = {
-      addDanger: addDangerMock,
-      addSuccess: addSuccessMock,
-      addWarning: addWarningMock,
-    };
+      ],
+    }));
   });
 
   it('should render normally', async () => {
-    const component = shallowWithI18nProvider(
-      <ObjectsTable {...defaultProps} perPageConfig={15} />
-    );
+    const component = shallowRender({ perPageConfig: 15 });
 
     // Ensure all promises resolve
     await new Promise(resolve => process.nextTick(resolve));
@@ -238,19 +214,17 @@ describe('ObjectsTable', () => {
   });
 
   it('should add danger toast when find fails', async () => {
-    findObjects.mockImplementation(() => {
+    findObjectsMock.mockImplementation(() => {
       throw new Error('Simulated find error');
     });
-    const component = shallowWithI18nProvider(
-      <ObjectsTable {...defaultProps} perPageConfig={15} />
-    );
+    const component = shallowRender({ perPageConfig: 15 });
 
     // Ensure all promises resolve
     await new Promise(resolve => process.nextTick(resolve));
     // Ensure the state changes are reflected
     component.update();
 
-    expect(addDangerMock).toHaveBeenCalled();
+    expect(notifications.toasts.addDanger).toHaveBeenCalled();
   });
 
   describe('export', () => {
@@ -258,7 +232,7 @@ describe('ObjectsTable', () => {
       const mockSelectedSavedObjects = [
         { id: '1', type: 'index-pattern' },
         { id: '3', type: 'dashboard' },
-      ];
+      ] as SavedObjectWithMetadata[];
 
       const mockSavedObjects = mockSelectedSavedObjects.map(obj => ({
         _id: obj.id,
@@ -272,11 +246,7 @@ describe('ObjectsTable', () => {
         })),
       };
 
-      const { fetchExportObjects } = require('../../../lib/fetch_export_objects');
-
-      const component = shallowWithI18nProvider(
-        <ObjectsTable {...defaultProps} savedObjectsClient={mockSavedObjectsClient} />
-      );
+      const component = shallowRender({ savedObjectsClient: mockSavedObjectsClient });
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -288,8 +258,8 @@ describe('ObjectsTable', () => {
 
       await component.instance().onExport(true);
 
-      expect(fetchExportObjects).toHaveBeenCalledWith(mockSelectedSavedObjects, true);
-      expect(addSuccessMock).toHaveBeenCalledWith({
+      expect(fetchExportObjectsMock).toHaveBeenCalledWith(http, mockSelectedSavedObjects, true);
+      expect(notifications.toasts.addSuccess).toHaveBeenCalledWith({
         title: 'Your file is downloading in the background',
       });
     });
@@ -298,7 +268,7 @@ describe('ObjectsTable', () => {
       const mockSelectedSavedObjects = [
         { id: '1', type: 'index-pattern' },
         { id: '3', type: 'dashboard' },
-      ];
+      ] as SavedObjectWithMetadata[];
 
       const mockSavedObjects = mockSelectedSavedObjects.map(obj => ({
         _id: obj.id,
@@ -312,16 +282,13 @@ describe('ObjectsTable', () => {
         })),
       };
 
-      const { fetchExportObjects } = require('../../../lib/fetch_export_objects');
-      extractExportDetails.mockImplementation(() => ({
+      extractExportDetailsMock.mockImplementation(() => ({
         exportedCount: 2,
         missingRefCount: 1,
         missingReferences: [{ id: '7', type: 'visualisation' }],
       }));
 
-      const component = shallowWithI18nProvider(
-        <ObjectsTable {...defaultProps} savedObjectsClient={mockSavedObjectsClient} />
-      );
+      const component = shallowRender({ savedObjectsClient: mockSavedObjectsClient });
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -333,8 +300,8 @@ describe('ObjectsTable', () => {
 
       await component.instance().onExport(true);
 
-      expect(fetchExportObjects).toHaveBeenCalledWith(mockSelectedSavedObjects, true);
-      expect(addWarningMock).toHaveBeenCalledWith({
+      expect(fetchExportObjectsMock).toHaveBeenCalledWith(http, mockSelectedSavedObjects, true);
+      expect(notifications.toasts.addWarning).toHaveBeenCalledWith({
         title:
           'Your file is downloading in the background. ' +
           'Some related objects could not be found. ' +
@@ -343,25 +310,21 @@ describe('ObjectsTable', () => {
     });
 
     it('should allow the user to choose when exporting all', async () => {
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
       // Ensure the state changes are reflected
       component.update();
 
-      component.find('Header').prop('onExportAll')();
+      (component.find('Header') as any).prop('onExportAll')();
       component.update();
 
       expect(component.find('EuiModal')).toMatchSnapshot();
     });
 
     it('should export all', async () => {
-      const {
-        fetchExportByTypeAndSearch,
-      } = require('../../../lib/fetch_export_by_type_and_search');
-      const { saveAs } = require('@elastic/filesaver');
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -370,23 +333,24 @@ describe('ObjectsTable', () => {
 
       // Set up mocks
       const blob = new Blob([JSON.stringify(allSavedObjects)], { type: 'application/ndjson' });
-      fetchExportByTypeAndSearch.mockImplementation(() => blob);
+      fetchExportByTypeAndSearchMock.mockImplementation(() => blob);
 
       await component.instance().onExportAll();
 
-      expect(fetchExportByTypeAndSearch).toHaveBeenCalledWith(POSSIBLE_TYPES, undefined, true);
-      expect(saveAs).toHaveBeenCalledWith(blob, 'export.ndjson');
-      expect(addSuccessMock).toHaveBeenCalledWith({
+      expect(fetchExportByTypeAndSearchMock).toHaveBeenCalledWith(
+        http,
+        allowedTypes,
+        undefined,
+        true
+      );
+      expect(saveAsMock).toHaveBeenCalledWith(blob, 'export.ndjson');
+      expect(notifications.toasts.addSuccess).toHaveBeenCalledWith({
         title: 'Your file is downloading in the background',
       });
     });
 
     it('should export all, accounting for the current search criteria', async () => {
-      const {
-        fetchExportByTypeAndSearch,
-      } = require('../../../lib/fetch_export_by_type_and_search');
-      const { saveAs } = require('@elastic/filesaver');
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       component.instance().onQueryChange({
         query: Query.parse('test'),
@@ -399,13 +363,18 @@ describe('ObjectsTable', () => {
 
       // Set up mocks
       const blob = new Blob([JSON.stringify(allSavedObjects)], { type: 'application/ndjson' });
-      fetchExportByTypeAndSearch.mockImplementation(() => blob);
+      fetchExportByTypeAndSearchMock.mockImplementation(() => blob);
 
       await component.instance().onExportAll();
 
-      expect(fetchExportByTypeAndSearch).toHaveBeenCalledWith(POSSIBLE_TYPES, 'test*', true);
-      expect(saveAs).toHaveBeenCalledWith(blob, 'export.ndjson');
-      expect(addSuccessMock).toHaveBeenCalledWith({
+      expect(fetchExportByTypeAndSearchMock).toHaveBeenCalledWith(
+        http,
+        allowedTypes,
+        'test*',
+        true
+      );
+      expect(saveAsMock).toHaveBeenCalledWith(blob, 'export.ndjson');
+      expect(notifications.toasts.addSuccess).toHaveBeenCalledWith({
         title: 'Your file is downloading in the background',
       });
     });
@@ -413,7 +382,7 @@ describe('ObjectsTable', () => {
 
   describe('import', () => {
     it('should show the flyout', async () => {
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -427,7 +396,7 @@ describe('ObjectsTable', () => {
     });
 
     it('should hide the flyout', async () => {
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -443,9 +412,7 @@ describe('ObjectsTable', () => {
 
   describe('relationships', () => {
     it('should fetch relationships', async () => {
-      const { getRelationships } = require('../../../lib/get_relationships');
-
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -454,17 +421,11 @@ describe('ObjectsTable', () => {
 
       await component.instance().getRelationships('search', '1');
       const savedObjectTypes = ['index-pattern', 'visualization', 'dashboard', 'search'];
-      expect(getRelationships).toHaveBeenCalledWith(
-        'search',
-        '1',
-        savedObjectTypes,
-        defaultProps.$http,
-        defaultProps.basePath
-      );
+      expect(getRelationshipsMock).toHaveBeenCalledWith(http, 'search', '1', savedObjectTypes);
     });
 
     it('should show the flyout', async () => {
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -483,7 +444,7 @@ describe('ObjectsTable', () => {
             uiCapabilitiesPath: 'discover.show',
           },
         },
-      });
+      } as SavedObjectWithMetadata);
       component.update();
 
       expect(component.find(Relationships)).toMatchSnapshot();
@@ -503,7 +464,7 @@ describe('ObjectsTable', () => {
     });
 
     it('should hide the flyout', async () => {
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -522,12 +483,12 @@ describe('ObjectsTable', () => {
 
   describe('delete', () => {
     it('should show a confirm modal', async () => {
-      const component = shallowWithI18nProvider(<ObjectsTable {...defaultProps} />);
+      const component = shallowRender();
 
       const mockSelectedSavedObjects = [
-        { id: '1', type: 'index-pattern', title: 'Title 1' },
-        { id: '3', type: 'dashboard', title: 'Title 2' },
-      ];
+        { id: '1', type: 'index-pattern' },
+        { id: '3', type: 'dashboard' },
+      ] as SavedObjectWithMetadata[];
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
@@ -546,7 +507,7 @@ describe('ObjectsTable', () => {
       const mockSelectedSavedObjects = [
         { id: '1', type: 'index-pattern' },
         { id: '3', type: 'dashboard' },
-      ];
+      ] as SavedObjectWithMetadata[];
 
       const mockSavedObjects = mockSelectedSavedObjects.map(obj => ({
         id: obj.id,
@@ -562,9 +523,7 @@ describe('ObjectsTable', () => {
         delete: jest.fn(),
       };
 
-      const component = shallowWithI18nProvider(
-        <ObjectsTable {...defaultProps} savedObjectsClient={mockSavedObjectsClient} />
-      );
+      const component = shallowRender({ savedObjectsClient: mockSavedObjectsClient });
 
       // Ensure all promises resolve
       await new Promise(resolve => process.nextTick(resolve));
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
similarity index 73%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js
rename to src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
index 188762f165b24..c76fea5a0fb29 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
@@ -17,17 +17,10 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
-import { saveAs } from '@elastic/filesaver';
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { debounce } from 'lodash';
-import { Header } from './components/header';
-import { Flyout } from './components/flyout';
-import { Relationships } from './components/relationships';
-import { Table } from './components/table';
-import { toastNotifications } from 'ui/notify';
-
+// @ts-ignore
+import { saveAs } from '@elastic/filesaver';
 import {
   EuiSpacer,
   Query,
@@ -54,7 +47,15 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-
+import {
+  SavedObjectsClientContract,
+  SavedObjectsFindOptions,
+  HttpStart,
+  OverlayStart,
+  NotificationsStart,
+  ApplicationStart,
+} from 'src/core/public';
+import { IndexPatternsContract } from '../../../../data/public';
 import {
   parseQuery,
   getSavedObjectCounts,
@@ -63,39 +64,72 @@ import {
   fetchExportObjects,
   fetchExportByTypeAndSearch,
   findObjects,
+  extractExportDetails,
+  SavedObjectsExportResultDetails,
 } from '../../lib';
-import { extractExportDetails } from '../../lib/extract_export_details';
-
-export const POSSIBLE_TYPES = chrome.getInjected('importAndExportableTypes');
-
-export class ObjectsTable extends Component {
-  static propTypes = {
-    savedObjectsClient: PropTypes.object.isRequired,
-    indexPatterns: PropTypes.object.isRequired,
-    $http: PropTypes.func.isRequired,
-    basePath: PropTypes.string.isRequired,
-    perPageConfig: PropTypes.number,
-    newIndexPatternUrl: PropTypes.string.isRequired,
-    confirmModalPromise: PropTypes.func.isRequired,
-    services: PropTypes.array.isRequired,
-    uiCapabilities: PropTypes.object.isRequired,
-    goInspectObject: PropTypes.func.isRequired,
-    canGoInApp: PropTypes.func.isRequired,
-  };
+import { SavedObjectWithMetadata } from '../../types';
+import {
+  ISavedObjectsManagementServiceRegistry,
+  SavedObjectsManagementActionServiceStart,
+} from '../../services';
+import { Header, Table, Flyout, Relationships } from './components';
+
+interface ExportAllOption {
+  id: string;
+  label: string;
+}
 
-  constructor(props) {
+export interface SavedObjectsTableProps {
+  allowedTypes: string[];
+  serviceRegistry: ISavedObjectsManagementServiceRegistry;
+  actionRegistry: SavedObjectsManagementActionServiceStart;
+  savedObjectsClient: SavedObjectsClientContract;
+  indexPatterns: IndexPatternsContract;
+  http: HttpStart;
+  overlays: OverlayStart;
+  notifications: NotificationsStart;
+  applications: ApplicationStart;
+  perPageConfig: number;
+  goInspectObject: (obj: SavedObjectWithMetadata) => void;
+  canGoInApp: (obj: SavedObjectWithMetadata) => boolean;
+}
+
+export interface SavedObjectsTableState {
+  totalCount: number;
+  page: number;
+  perPage: number;
+  savedObjects: SavedObjectWithMetadata[];
+  savedObjectCounts: Record<string, number>;
+  activeQuery: Query;
+  selectedSavedObjects: SavedObjectWithMetadata[];
+  isShowingImportFlyout: boolean;
+  isSearching: boolean;
+  filteredItemCount: number;
+  isShowingRelationships: boolean;
+  relationshipObject?: SavedObjectWithMetadata;
+  isShowingDeleteConfirmModal: boolean;
+  isShowingExportAllOptionsModal: boolean;
+  isDeleting: boolean;
+  exportAllOptions: ExportAllOption[];
+  exportAllSelectedOptions: Record<string, boolean>;
+  isIncludeReferencesDeepChecked: boolean;
+}
+
+export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedObjectsTableState> {
+  private _isMounted = false;
+
+  constructor(props: SavedObjectsTableProps) {
     super(props);
-    this.savedObjectTypes = POSSIBLE_TYPES;
 
     this.state = {
       totalCount: 0,
       page: 0,
       perPage: props.perPageConfig || 50,
       savedObjects: [],
-      savedObjectCounts: this.savedObjectTypes.reduce((typeToCountMap, type) => {
+      savedObjectCounts: props.allowedTypes.reduce((typeToCountMap, type) => {
         typeToCountMap[type] = 0;
         return typeToCountMap;
-      }, {}),
+      }, {} as Record<string, number>),
       activeQuery: Query.parse(''),
       selectedSavedObjects: [],
       isShowingImportFlyout: false,
@@ -124,21 +158,20 @@ export class ObjectsTable extends Component {
   }
 
   fetchCounts = async () => {
+    const { allowedTypes } = this.props;
     const { queryText, visibleTypes } = parseQuery(this.state.activeQuery);
 
-    const filteredTypes = this.savedObjectTypes.filter(
-      type => !visibleTypes || visibleTypes.includes(type)
-    );
+    const filteredTypes = allowedTypes.filter(type => !visibleTypes || visibleTypes.includes(type));
 
     // These are the saved objects visible in the table.
     const filteredSavedObjectCounts = await getSavedObjectCounts(
-      this.props.$http,
+      this.props.http,
       filteredTypes,
       queryText
     );
 
-    const exportAllOptions = [];
-    const exportAllSelectedOptions = {};
+    const exportAllOptions: ExportAllOption[] = [];
+    const exportAllSelectedOptions: Record<string, boolean> = {};
 
     Object.keys(filteredSavedObjectCounts).forEach(id => {
       // Add this type as a bulk-export option.
@@ -147,17 +180,13 @@ export class ObjectsTable extends Component {
         label: `${id} (${filteredSavedObjectCounts[id] || 0})`,
       });
 
-      // Select it by defayult.
+      // Select it by default.
       exportAllSelectedOptions[id] = true;
     });
 
     // Fetch all the saved objects that exist so we can accurately populate the counts within
     // the table filter dropdown.
-    const savedObjectCounts = await getSavedObjectCounts(
-      this.props.$http,
-      this.savedObjectTypes,
-      queryText
-    );
+    const savedObjectCounts = await getSavedObjectCounts(this.props.http, allowedTypes, queryText);
 
     this.setState(state => ({
       ...state,
@@ -178,66 +207,64 @@ export class ObjectsTable extends Component {
 
   debouncedFetch = debounce(async () => {
     const { activeQuery: query, page, perPage } = this.state;
+    const { notifications, http, allowedTypes } = this.props;
     const { queryText, visibleTypes } = parseQuery(query);
     // "searchFields" is missing from the "findOptions" but gets injected via the API.
     // The API extracts the fields from each uiExports.savedObjectsManagement "defaultSearchField" attribute
-    const findOptions = {
+    const findOptions: SavedObjectsFindOptions = {
       search: queryText ? `${queryText}*` : undefined,
       perPage,
       page: page + 1,
       fields: ['id'],
-      type: this.savedObjectTypes.filter(type => !visibleTypes || visibleTypes.includes(type)),
+      type: allowedTypes.filter(type => !visibleTypes || visibleTypes.includes(type)),
     };
     if (findOptions.type.length > 1) {
       findOptions.sortField = 'type';
     }
 
-    let resp;
     try {
-      resp = await findObjects(findOptions);
+      const resp = await findObjects(http, findOptions);
+      if (!this._isMounted) {
+        return;
+      }
+
+      this.setState(({ activeQuery }) => {
+        // ignore results for old requests
+        if (activeQuery.text !== query.text) {
+          return null;
+        }
+
+        return {
+          savedObjects: resp.savedObjects,
+          filteredItemCount: resp.total,
+          isSearching: false,
+        };
+      });
     } catch (error) {
       if (this._isMounted) {
         this.setState({
           isSearching: false,
         });
       }
-      toastNotifications.addDanger({
+      notifications.toasts.addDanger({
         title: i18n.translate(
-          'kbn.management.objects.objectsTable.unableFindSavedObjectsNotificationMessage',
+          'savedObjectsManagement.objectsTable.unableFindSavedObjectsNotificationMessage',
           { defaultMessage: 'Unable find saved objects' }
         ),
         text: `${error}`,
       });
-      return;
-    }
-
-    if (!this._isMounted) {
-      return;
     }
-
-    this.setState(({ activeQuery }) => {
-      // ignore results for old requests
-      if (activeQuery.text !== query.text) {
-        return {};
-      }
-
-      return {
-        savedObjects: resp.savedObjects,
-        filteredItemCount: resp.total,
-        isSearching: false,
-      };
-    });
   }, 300);
 
   refreshData = async () => {
     await Promise.all([this.fetchSavedObjects(), this.fetchCounts()]);
   };
 
-  onSelectionChanged = selection => {
+  onSelectionChanged = (selection: SavedObjectWithMetadata[]) => {
     this.setState({ selectedSavedObjects: selection });
   };
 
-  onQueryChange = ({ query }) => {
+  onQueryChange = ({ query }: { query: Query }) => {
     // TODO: Use isSameQuery to compare new query with state.activeQuery to avoid re-fetching the
     // same data we already have.
     this.setState(
@@ -253,7 +280,7 @@ export class ObjectsTable extends Component {
     );
   };
 
-  onTableChange = async table => {
+  onTableChange = async (table: any) => {
     const { index: page, size: perPage } = table.page || {};
 
     this.setState(
@@ -266,7 +293,7 @@ export class ObjectsTable extends Component {
     );
   };
 
-  onShowRelationships = object => {
+  onShowRelationships = (object: SavedObjectWithMetadata) => {
     this.setState({
       isShowingRelationships: true,
       relationshipObject: object,
@@ -280,16 +307,17 @@ export class ObjectsTable extends Component {
     });
   };
 
-  onExport = async includeReferencesDeep => {
+  onExport = async (includeReferencesDeep: boolean) => {
     const { selectedSavedObjects } = this.state;
+    const { notifications, http } = this.props;
     const objectsToExport = selectedSavedObjects.map(obj => ({ id: obj.id, type: obj.type }));
 
     let blob;
     try {
-      blob = await fetchExportObjects(objectsToExport, includeReferencesDeep);
+      blob = await fetchExportObjects(http, objectsToExport, includeReferencesDeep);
     } catch (e) {
-      toastNotifications.addDanger({
-        title: i18n.translate('kbn.management.objects.objectsTable.export.dangerNotification', {
+      notifications.toasts.addDanger({
+        title: i18n.translate('savedObjectsManagement.objectsTable.export.dangerNotification', {
           defaultMessage: 'Unable to generate export',
         }),
       });
@@ -304,24 +332,26 @@ export class ObjectsTable extends Component {
 
   onExportAll = async () => {
     const { exportAllSelectedOptions, isIncludeReferencesDeepChecked, activeQuery } = this.state;
+    const { notifications, http } = this.props;
     const { queryText } = parseQuery(activeQuery);
     const exportTypes = Object.entries(exportAllSelectedOptions).reduce((accum, [id, selected]) => {
       if (selected) {
         accum.push(id);
       }
       return accum;
-    }, []);
+    }, [] as string[]);
 
     let blob;
     try {
       blob = await fetchExportByTypeAndSearch(
+        http,
         exportTypes,
         queryText ? `${queryText}*` : undefined,
         isIncludeReferencesDeepChecked
       );
     } catch (e) {
-      toastNotifications.addDanger({
-        title: i18n.translate('kbn.management.objects.objectsTable.export.dangerNotification', {
+      notifications.toasts.addDanger({
+        title: i18n.translate('savedObjectsManagement.objectsTable.export.dangerNotification', {
           defaultMessage: 'Unable to generate export',
         }),
       });
@@ -335,11 +365,12 @@ export class ObjectsTable extends Component {
     this.setState({ isShowingExportAllOptionsModal: false });
   };
 
-  showExportSuccessMessage = exportDetails => {
+  showExportSuccessMessage = (exportDetails: SavedObjectsExportResultDetails | undefined) => {
+    const { notifications } = this.props;
     if (exportDetails && exportDetails.missingReferences.length > 0) {
-      toastNotifications.addWarning({
+      notifications.toasts.addWarning({
         title: i18n.translate(
-          'kbn.management.objects.objectsTable.export.successWithMissingRefsNotification',
+          'savedObjectsManagement.objectsTable.export.successWithMissingRefsNotification',
           {
             defaultMessage:
               'Your file is downloading in the background. ' +
@@ -349,8 +380,8 @@ export class ObjectsTable extends Component {
         ),
       });
     } else {
-      toastNotifications.addSuccess({
-        title: i18n.translate('kbn.management.objects.objectsTable.export.successNotification', {
+      notifications.toasts.addSuccess({
+        title: i18n.translate('savedObjectsManagement.objectsTable.export.successNotification', {
           defaultMessage: 'Your file is downloading in the background',
         }),
       });
@@ -412,30 +443,30 @@ export class ObjectsTable extends Component {
     });
   };
 
-  getRelationships = async (type, id) => {
-    return await getRelationships(
-      type,
-      id,
-      this.savedObjectTypes,
-      this.props.$http,
-      this.props.basePath
-    );
+  getRelationships = async (type: string, id: string) => {
+    const { allowedTypes, http } = this.props;
+    return await getRelationships(http, type, id, allowedTypes);
   };
 
   renderFlyout() {
     if (!this.state.isShowingImportFlyout) {
       return null;
     }
+    const { applications } = this.props;
+    const newIndexPatternUrl = applications.getUrlForApp('kibana', {
+      path: '#/management/kibana/index_pattern',
+    });
 
     return (
       <Flyout
         close={this.hideImportFlyout}
         done={this.finishImport}
-        services={this.props.services}
+        http={this.props.http}
+        serviceRegistry={this.props.serviceRegistry}
         indexPatterns={this.props.indexPatterns}
-        newIndexPatternUrl={this.props.newIndexPatternUrl}
-        savedObjectTypes={this.props.savedObjectTypes}
-        confirmModalPromise={this.props.confirmModalPromise}
+        newIndexPatternUrl={newIndexPatternUrl}
+        allowedTypes={this.props.allowedTypes}
+        overlays={this.props.overlays}
       />
     );
   }
@@ -447,10 +478,10 @@ export class ObjectsTable extends Component {
 
     return (
       <Relationships
-        savedObject={this.state.relationshipObject}
+        basePath={this.props.http.basePath}
+        savedObject={this.state.relationshipObject!}
         getRelationships={this.getRelationships}
         close={this.onHideRelationships}
-        getDashboardUrl={this.props.getDashboardUrl}
         goInspectObject={this.props.goInspectObject}
         canGoInApp={this.props.canGoInApp}
       />
@@ -482,7 +513,7 @@ export class ObjectsTable extends Component {
         <EuiConfirmModal
           title={
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModalTitle"
+              id="savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModalTitle"
               defaultMessage="Delete saved objects"
             />
           }
@@ -491,19 +522,19 @@ export class ObjectsTable extends Component {
           buttonColor="danger"
           cancelButtonText={
             <FormattedMessage
-              id="kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel"
+              id="savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           }
           confirmButtonText={
             isDeleting ? (
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel"
+                id="savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel"
                 defaultMessage="Deleting…"
               />
             ) : (
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel"
+                id="savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel"
                 defaultMessage="Delete"
               />
             )
@@ -512,7 +543,7 @@ export class ObjectsTable extends Component {
         >
           <p>
             <FormattedMessage
-              id="kbn.management.objects.deleteSavedObjectsConfirmModalDescription"
+              id="savedObjectsManagement.deleteSavedObjectsConfirmModalDescription"
               defaultMessage="This action will delete the following saved objects:"
             />
           </p>
@@ -522,7 +553,7 @@ export class ObjectsTable extends Component {
               {
                 field: 'type',
                 name: i18n.translate(
-                  'kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName',
+                  'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName',
                   { defaultMessage: 'Type' }
                 ),
                 width: '50px',
@@ -535,14 +566,14 @@ export class ObjectsTable extends Component {
               {
                 field: 'id',
                 name: i18n.translate(
-                  'kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.idColumnName',
+                  'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.idColumnName',
                   { defaultMessage: 'Id' }
                 ),
               },
               {
                 field: 'meta.title',
                 name: i18n.translate(
-                  'kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName',
+                  'savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName',
                   { defaultMessage: 'Title' }
                 ),
               },
@@ -586,7 +617,7 @@ export class ObjectsTable extends Component {
           <EuiModalHeader>
             <EuiModalHeaderTitle>
               <FormattedMessage
-                id="kbn.management.objects.objectsTable.exportObjectsConfirmModalTitle"
+                id="savedObjectsManagement.objectsTable.exportObjectsConfirmModalTitle"
                 defaultMessage="Export {filteredItemCount, plural, one{# object} other {# objects}}"
                 values={{
                   filteredItemCount,
@@ -598,7 +629,7 @@ export class ObjectsTable extends Component {
             <EuiFormRow
               label={
                 <FormattedMessage
-                  id="kbn.management.objects.objectsTable.exportObjectsConfirmModalDescription"
+                  id="savedObjectsManagement.objectsTable.exportObjectsConfirmModalDescription"
                   defaultMessage="Select which types to export"
                 />
               }
@@ -626,7 +657,7 @@ export class ObjectsTable extends Component {
               name="includeReferencesDeep"
               label={
                 <FormattedMessage
-                  id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
+                  id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel"
                   defaultMessage="Include related objects"
                 />
               }
@@ -641,7 +672,7 @@ export class ObjectsTable extends Component {
                   <EuiFlexItem grow={false}>
                     <EuiButtonEmpty onClick={this.closeExportAllModal}>
                       <FormattedMessage
-                        id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.cancelButtonLabel"
+                        id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.cancelButtonLabel"
                         defaultMessage="Cancel"
                       />
                     </EuiButtonEmpty>
@@ -649,7 +680,7 @@ export class ObjectsTable extends Component {
                   <EuiFlexItem grow={false}>
                     <EuiButton fill onClick={this.onExportAll}>
                       <FormattedMessage
-                        id="kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel"
+                        id="savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel"
                         defaultMessage="Export all"
                       />
                     </EuiButton>
@@ -673,12 +704,13 @@ export class ObjectsTable extends Component {
       isSearching,
       savedObjectCounts,
     } = this.state;
+    const { http, allowedTypes, applications } = this.props;
 
     const selectionConfig = {
       onSelectionChange: this.onSelectionChanged,
     };
 
-    const filterOptions = this.savedObjectTypes.map(type => ({
+    const filterOptions = allowedTypes.map(type => ({
       value: type,
       name: type,
       view: `${type} (${savedObjectCounts[type] || 0})`,
@@ -698,14 +730,16 @@ export class ObjectsTable extends Component {
         />
         <EuiSpacer size="xs" />
         <Table
+          basePath={http.basePath}
           itemId={'id'}
+          actionRegistry={this.props.actionRegistry}
           selectionConfig={selectionConfig}
           selectedSavedObjects={selectedSavedObjects}
           onQueryChange={this.onQueryChange}
           onTableChange={this.onTableChange}
           filterOptions={filterOptions}
           onExport={this.onExport}
-          canDelete={this.props.uiCapabilities.savedObjectsManagement.delete}
+          canDelete={applications.capabilities.savedObjectsManagement.delete as boolean}
           onDelete={this.onDelete}
           goInspectObject={this.props.goInspectObject}
           pageIndex={page}
diff --git a/src/plugins/saved_objects_management/public/management_section/types.ts b/src/plugins/saved_objects_management/public/management_section/types.ts
new file mode 100644
index 0000000000000..541746534b84a
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/types.ts
@@ -0,0 +1,38 @@
+/*
+ * 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 { SavedObjectReference } from '../../../../core/types';
+
+export interface ObjectField {
+  type: FieldType;
+  name: string;
+  value: any;
+}
+
+export type FieldType = 'text' | 'number' | 'boolean' | 'array' | 'json';
+
+export interface FieldState {
+  value?: any;
+  invalid?: boolean;
+}
+
+export interface SubmittedFormData {
+  attributes: any;
+  references: SavedObjectReference[];
+}
diff --git a/src/plugins/saved_objects_management/public/mocks.ts b/src/plugins/saved_objects_management/public/mocks.ts
index 8cf23afe87907..1de3de8e85302 100644
--- a/src/plugins/saved_objects_management/public/mocks.ts
+++ b/src/plugins/saved_objects_management/public/mocks.ts
@@ -17,23 +17,27 @@
  * under the License.
  */
 
-import { actionRegistryMock } from './services/action_registry.mock';
+import { actionServiceMock } from './services/action_service.mock';
+import { serviceRegistryMock } from './services/service_registry.mock';
 import { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './plugin';
 
 const createSetupContractMock = (): jest.Mocked<SavedObjectsManagementPluginSetup> => {
   const mock = {
-    actionRegistry: actionRegistryMock.create(),
+    actions: actionServiceMock.createSetup(),
+    serviceRegistry: serviceRegistryMock.create(),
   };
   return mock;
 };
 
 const createStartContractMock = (): jest.Mocked<SavedObjectsManagementPluginStart> => {
-  const mock = {};
+  const mock = {
+    actions: actionServiceMock.createStart(),
+  };
   return mock;
 };
 
 export const savedObjectsManagementPluginMock = {
-  createActionRegistry: actionRegistryMock.create,
+  createServiceRegistry: serviceRegistryMock.create,
   createSetupContract: createSetupContractMock,
   createStartContract: createStartContractMock,
 };
diff --git a/src/plugins/saved_objects_management/public/plugin.test.ts b/src/plugins/saved_objects_management/public/plugin.test.ts
index 1cafbb235ad5b..09080f46a6869 100644
--- a/src/plugins/saved_objects_management/public/plugin.test.ts
+++ b/src/plugins/saved_objects_management/public/plugin.test.ts
@@ -20,6 +20,9 @@
 import { coreMock } from '../../../core/public/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { homePluginMock } from '../../home/public/mocks';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { managementPluginMock } from '../../management/public/mocks';
+import { dataPluginMock } from '../../data/public/mocks';
 import { SavedObjectsManagementPlugin } from './plugin';
 
 describe('SavedObjectsManagementPlugin', () => {
@@ -31,10 +34,13 @@ describe('SavedObjectsManagementPlugin', () => {
 
   describe('#setup', () => {
     it('registers the saved_objects feature to the home plugin', async () => {
-      const coreSetup = coreMock.createSetup();
+      const coreSetup = coreMock.createSetup({
+        pluginStartDeps: { data: dataPluginMock.createStartContract() },
+      });
       const homeSetup = homePluginMock.createSetupContract();
+      const managementSetup = managementPluginMock.createSetupContract();
 
-      await plugin.setup(coreSetup, { home: homeSetup });
+      await plugin.setup(coreSetup, { home: homeSetup, management: managementSetup });
 
       expect(homeSetup.featureCatalogue.register).toHaveBeenCalledTimes(1);
       expect(homeSetup.featureCatalogue.register).toHaveBeenCalledWith(
diff --git a/src/plugins/saved_objects_management/public/plugin.ts b/src/plugins/saved_objects_management/public/plugin.ts
index 3f2e9c166058e..c8dede3da9263 100644
--- a/src/plugins/saved_objects_management/public/plugin.ts
+++ b/src/plugins/saved_objects_management/public/plugin.ts
@@ -19,37 +19,59 @@
 
 import { i18n } from '@kbn/i18n';
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { ManagementSetup } from '../../management/public';
+import { DataPublicPluginStart } from '../../data/public';
+import { DashboardStart } from '../../dashboard/public';
+import { DiscoverStart } from '../../discover/public';
 import { HomePublicPluginSetup, FeatureCatalogueCategory } from '../../home/public';
+import { VisualizationsStart } from '../../visualizations/public';
 import {
-  SavedObjectsManagementActionRegistry,
-  ISavedObjectsManagementActionRegistry,
+  SavedObjectsManagementActionService,
+  SavedObjectsManagementActionServiceSetup,
+  SavedObjectsManagementActionServiceStart,
+  SavedObjectsManagementServiceRegistry,
+  ISavedObjectsManagementServiceRegistry,
 } from './services';
+import { registerServices } from './register_services';
 
 export interface SavedObjectsManagementPluginSetup {
-  actionRegistry: ISavedObjectsManagementActionRegistry;
+  actions: SavedObjectsManagementActionServiceSetup;
+  serviceRegistry: ISavedObjectsManagementServiceRegistry;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface SavedObjectsManagementPluginStart {}
+export interface SavedObjectsManagementPluginStart {
+  actions: SavedObjectsManagementActionServiceStart;
+}
 
 export interface SetupDependencies {
+  management: ManagementSetup;
   home: HomePublicPluginSetup;
 }
 
+export interface StartDependencies {
+  data: DataPublicPluginStart;
+  dashboard?: DashboardStart;
+  visualizations?: VisualizationsStart;
+  discover?: DiscoverStart;
+}
+
 export class SavedObjectsManagementPlugin
   implements
     Plugin<
       SavedObjectsManagementPluginSetup,
       SavedObjectsManagementPluginStart,
       SetupDependencies,
-      {}
+      StartDependencies
     > {
-  private actionRegistry = new SavedObjectsManagementActionRegistry();
+  private actionService = new SavedObjectsManagementActionService();
+  private serviceRegistry = new SavedObjectsManagementServiceRegistry();
 
   public setup(
-    core: CoreSetup<{}>,
-    { home }: SetupDependencies
+    core: CoreSetup<StartDependencies, SavedObjectsManagementPluginStart>,
+    { home, management }: SetupDependencies
   ): SavedObjectsManagementPluginSetup {
+    const actionSetup = this.actionService.setup();
+
     home.featureCatalogue.register({
       id: 'saved_objects',
       title: i18n.translate('savedObjectsManagement.objects.savedObjectsTitle', {
@@ -65,12 +87,39 @@ export class SavedObjectsManagementPlugin
       category: FeatureCatalogueCategory.ADMIN,
     });
 
+    const kibanaSection = management.sections.getSection('kibana');
+    if (!kibanaSection) {
+      throw new Error('`kibana` management section not found.');
+    }
+    kibanaSection.registerApp({
+      id: 'objects',
+      title: i18n.translate('savedObjectsManagement.managementSectionLabel', {
+        defaultMessage: 'Saved Objects',
+      }),
+      order: 10,
+      mount: async mountParams => {
+        const { mountManagementSection } = await import('./management_section');
+        return mountManagementSection({
+          core,
+          serviceRegistry: this.serviceRegistry,
+          mountParams,
+        });
+      },
+    });
+
+    // depends on `getStartServices`, should not be awaited
+    registerServices(this.serviceRegistry, core.getStartServices);
+
     return {
-      actionRegistry: this.actionRegistry,
+      actions: actionSetup,
+      serviceRegistry: this.serviceRegistry,
     };
   }
 
   public start(core: CoreStart) {
-    return {};
+    const actionStart = this.actionService.start();
+    return {
+      actions: actionStart,
+    };
   }
 }
diff --git a/src/plugins/saved_objects_management/public/register_services.ts b/src/plugins/saved_objects_management/public/register_services.ts
new file mode 100644
index 0000000000000..a34b632b78f6c
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/register_services.ts
@@ -0,0 +1,59 @@
+/*
+ * 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 { StartServicesAccessor } from '../../../core/public';
+import { SavedObjectsManagementPluginStart, StartDependencies } from './plugin';
+import { ISavedObjectsManagementServiceRegistry } from './services';
+
+export const registerServices = async (
+  registry: ISavedObjectsManagementServiceRegistry,
+  getStartServices: StartServicesAccessor<StartDependencies, SavedObjectsManagementPluginStart>
+) => {
+  const [coreStart, { dashboard, data, visualizations, discover }] = await getStartServices();
+
+  if (dashboard) {
+    registry.register({
+      id: 'savedDashboards',
+      title: 'dashboards',
+      service: dashboard.getSavedDashboardLoader(),
+    });
+  }
+
+  if (visualizations) {
+    registry.register({
+      id: 'savedVisualizations',
+      title: 'visualizations',
+      service: visualizations.savedVisualizationsLoader,
+    });
+  }
+
+  if (discover) {
+    registry.register({
+      id: 'savedSearches',
+      title: 'searches',
+      service: discover.savedSearches.createLoader({
+        savedObjectsClient: coreStart.savedObjects.client,
+        indexPatterns: data.indexPatterns,
+        search: data.search,
+        chrome: coreStart.chrome,
+        overlays: coreStart.overlays,
+      }),
+    });
+  }
+};
diff --git a/src/plugins/saved_objects_management/public/services/action_service.mock.ts b/src/plugins/saved_objects_management/public/services/action_service.mock.ts
new file mode 100644
index 0000000000000..97c95a589b925
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/services/action_service.mock.ts
@@ -0,0 +1,57 @@
+/*
+ * 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 {
+  SavedObjectsManagementActionService,
+  SavedObjectsManagementActionServiceSetup,
+  SavedObjectsManagementActionServiceStart,
+} from './action_service';
+
+const createSetupMock = (): jest.Mocked<SavedObjectsManagementActionServiceSetup> => {
+  const mock = {
+    register: jest.fn(),
+  };
+  return mock;
+};
+
+const createStartMock = (): jest.Mocked<SavedObjectsManagementActionServiceStart> => {
+  const mock = {
+    has: jest.fn(),
+    getAll: jest.fn(),
+  };
+
+  mock.has.mockReturnValue(true);
+  mock.getAll.mockReturnValue([]);
+
+  return mock;
+};
+
+const createServiceMock = (): jest.Mocked<PublicMethodsOf<SavedObjectsManagementActionService>> => {
+  const mock = {
+    setup: jest.fn().mockReturnValue(createSetupMock()),
+    start: jest.fn().mockReturnValue(createStartMock()),
+  };
+  return mock;
+};
+
+export const actionServiceMock = {
+  create: createServiceMock,
+  createSetup: createSetupMock,
+  createStart: createStartMock,
+};
diff --git a/src/plugins/saved_objects_management/public/services/action_registry.test.ts b/src/plugins/saved_objects_management/public/services/action_service.test.ts
similarity index 69%
rename from src/plugins/saved_objects_management/public/services/action_registry.test.ts
rename to src/plugins/saved_objects_management/public/services/action_service.test.ts
index eb3bda00f4196..107554589f83d 100644
--- a/src/plugins/saved_objects_management/public/services/action_registry.test.ts
+++ b/src/plugins/saved_objects_management/public/services/action_service.test.ts
@@ -17,8 +17,11 @@
  * under the License.
  */
 
-import { SavedObjectsManagementActionRegistry } from './action_registry';
-import { SavedObjectsManagementAction } from './action_types';
+import {
+  SavedObjectsManagementActionService,
+  SavedObjectsManagementActionServiceSetup,
+} from './action_service';
+import { SavedObjectsManagementAction } from './types';
 
 class DummyAction extends SavedObjectsManagementAction {
   constructor(public id: string) {
@@ -36,27 +39,30 @@ class DummyAction extends SavedObjectsManagementAction {
 }
 
 describe('SavedObjectsManagementActionRegistry', () => {
-  let registry: SavedObjectsManagementActionRegistry;
+  let service: SavedObjectsManagementActionService;
+  let setup: SavedObjectsManagementActionServiceSetup;
 
   const createAction = (id: string): SavedObjectsManagementAction => {
     return new DummyAction(id);
   };
 
   beforeEach(() => {
-    registry = new SavedObjectsManagementActionRegistry();
+    service = new SavedObjectsManagementActionService();
+    setup = service.setup();
   });
 
   describe('#register', () => {
     it('allows actions to be registered and retrieved', () => {
       const action = createAction('foo');
-      registry.register(action);
-      expect(registry.getAll()).toContain(action);
+      setup.register(action);
+      const start = service.start();
+      expect(start.getAll()).toContain(action);
     });
 
     it('does not allow actions with duplicate ids to be registered', () => {
       const action = createAction('my-action');
-      registry.register(action);
-      expect(() => registry.register(action)).toThrowErrorMatchingInlineSnapshot(
+      setup.register(action);
+      expect(() => setup.register(action)).toThrowErrorMatchingInlineSnapshot(
         `"Saved Objects Management Action with id 'my-action' already exists"`
       );
     });
@@ -65,12 +71,14 @@ describe('SavedObjectsManagementActionRegistry', () => {
   describe('#has', () => {
     it('returns true when an action with a matching ID exists', () => {
       const action = createAction('existing-action');
-      registry.register(action);
-      expect(registry.has('existing-action')).toEqual(true);
+      setup.register(action);
+      const start = service.start();
+      expect(start.has('existing-action')).toEqual(true);
     });
 
     it(`returns false when an action doesn't exist`, () => {
-      expect(registry.has('missing-action')).toEqual(false);
+      const start = service.start();
+      expect(start.has('missing-action')).toEqual(false);
     });
   });
 });
diff --git a/src/plugins/saved_objects_management/public/services/action_registry.ts b/src/plugins/saved_objects_management/public/services/action_service.ts
similarity index 56%
rename from src/plugins/saved_objects_management/public/services/action_registry.ts
rename to src/plugins/saved_objects_management/public/services/action_service.ts
index 8bf77231dd73f..2b0b4cf5431e5 100644
--- a/src/plugins/saved_objects_management/public/services/action_registry.ts
+++ b/src/plugins/saved_objects_management/public/services/action_service.ts
@@ -17,36 +17,44 @@
  * under the License.
  */
 
-import { SavedObjectsManagementAction } from './action_types';
-
-export type ISavedObjectsManagementActionRegistry = PublicMethodsOf<
-  SavedObjectsManagementActionRegistry
->;
-
-export class SavedObjectsManagementActionRegistry {
-  private readonly actions = new Map<string, SavedObjectsManagementAction>();
+import { SavedObjectsManagementAction } from './types';
 
+export interface SavedObjectsManagementActionServiceSetup {
   /**
    * register given action in the registry.
    */
-  register(action: SavedObjectsManagementAction) {
-    if (this.actions.has(action.id)) {
-      throw new Error(`Saved Objects Management Action with id '${action.id}' already exists`);
-    }
-    this.actions.set(action.id, action);
-  }
+  register: (action: SavedObjectsManagementAction) => void;
+}
 
+export interface SavedObjectsManagementActionServiceStart {
   /**
    * return true if the registry contains given action, false otherwise.
    */
-  has(actionId: string) {
-    return this.actions.has(actionId);
-  }
-
+  has: (actionId: string) => boolean;
   /**
    * return all {@link SavedObjectsManagementAction | actions} currently registered.
    */
-  getAll() {
-    return [...this.actions.values()];
+  getAll: () => SavedObjectsManagementAction[];
+}
+
+export class SavedObjectsManagementActionService {
+  private readonly actions = new Map<string, SavedObjectsManagementAction>();
+
+  setup(): SavedObjectsManagementActionServiceSetup {
+    return {
+      register: action => {
+        if (this.actions.has(action.id)) {
+          throw new Error(`Saved Objects Management Action with id '${action.id}' already exists`);
+        }
+        this.actions.set(action.id, action);
+      },
+    };
+  }
+
+  start(): SavedObjectsManagementActionServiceStart {
+    return {
+      has: actionId => this.actions.has(actionId),
+      getAll: () => [...this.actions.values()],
+    };
   }
 }
diff --git a/src/plugins/saved_objects_management/public/services/index.ts b/src/plugins/saved_objects_management/public/services/index.ts
index d6353576b8e11..a59ad9012c402 100644
--- a/src/plugins/saved_objects_management/public/services/index.ts
+++ b/src/plugins/saved_objects_management/public/services/index.ts
@@ -18,7 +18,13 @@
  */
 
 export {
-  SavedObjectsManagementActionRegistry,
-  ISavedObjectsManagementActionRegistry,
-} from './action_registry';
-export { SavedObjectsManagementAction, SavedObjectsManagementRecord } from './action_types';
+  SavedObjectsManagementActionService,
+  SavedObjectsManagementActionServiceStart,
+  SavedObjectsManagementActionServiceSetup,
+} from './action_service';
+export {
+  SavedObjectsManagementServiceRegistry,
+  ISavedObjectsManagementServiceRegistry,
+  SavedObjectsManagementServiceRegistryEntry,
+} from './service_registry';
+export { SavedObjectsManagementAction, SavedObjectsManagementRecord } from './types';
diff --git a/src/plugins/saved_objects_management/public/services/action_registry.mock.ts b/src/plugins/saved_objects_management/public/services/service_registry.mock.ts
similarity index 79%
rename from src/plugins/saved_objects_management/public/services/action_registry.mock.ts
rename to src/plugins/saved_objects_management/public/services/service_registry.mock.ts
index a9093ad42d0ac..2e671c781928f 100644
--- a/src/plugins/saved_objects_management/public/services/action_registry.mock.ts
+++ b/src/plugins/saved_objects_management/public/services/service_registry.mock.ts
@@ -17,21 +17,20 @@
  * under the License.
  */
 
-import { ISavedObjectsManagementActionRegistry } from './action_registry';
+import { ISavedObjectsManagementServiceRegistry } from './service_registry';
 
-const createRegistryMock = (): jest.Mocked<ISavedObjectsManagementActionRegistry> => {
+const createRegistryMock = (): jest.Mocked<ISavedObjectsManagementServiceRegistry> => {
   const mock = {
     register: jest.fn(),
-    has: jest.fn(),
-    getAll: jest.fn(),
+    all: jest.fn(),
+    get: jest.fn(),
   };
 
-  mock.has.mockReturnValue(true);
-  mock.getAll.mockReturnValue([]);
+  mock.all.mockReturnValue([]);
 
   return mock;
 };
 
-export const actionRegistryMock = {
+export const serviceRegistryMock = {
   create: createRegistryMock,
 };
diff --git a/src/plugins/saved_objects_management/public/services/service_registry.ts b/src/plugins/saved_objects_management/public/services/service_registry.ts
new file mode 100644
index 0000000000000..2d6ec0b92047a
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/services/service_registry.ts
@@ -0,0 +1,49 @@
+/*
+ * 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 { SavedObjectLoader } from '../../../saved_objects/public';
+
+export interface SavedObjectsManagementServiceRegistryEntry {
+  id: string;
+  service: SavedObjectLoader;
+  title: string;
+}
+
+export type ISavedObjectsManagementServiceRegistry = PublicMethodsOf<
+  SavedObjectsManagementServiceRegistry
+>;
+
+export class SavedObjectsManagementServiceRegistry {
+  private readonly registry = new Map<string, SavedObjectsManagementServiceRegistryEntry>();
+
+  public register(entry: SavedObjectsManagementServiceRegistryEntry) {
+    if (this.registry.has(entry.id)) {
+      throw new Error('');
+    }
+    this.registry.set(entry.id, entry);
+  }
+
+  public all(): SavedObjectsManagementServiceRegistryEntry[] {
+    return [...this.registry.values()];
+  }
+
+  public get(id: string): SavedObjectsManagementServiceRegistryEntry | undefined {
+    return this.registry.get(id);
+  }
+}
diff --git a/src/plugins/saved_objects_management/public/services/action_types.ts b/src/plugins/saved_objects_management/public/services/types.ts
similarity index 100%
rename from src/plugins/saved_objects_management/public/services/action_types.ts
rename to src/plugins/saved_objects_management/public/services/types.ts
diff --git a/src/plugins/saved_objects_management/public/types.ts b/src/plugins/saved_objects_management/public/types.ts
new file mode 100644
index 0000000000000..e91b5d253b55f
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/types.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { SavedObjectMetadata, SavedObjectWithMetadata, SavedObjectRelation } from '../common';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/index.js b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
similarity index 61%
rename from src/legacy/core_plugins/kibana/public/management/sections/objects/index.js
rename to src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
index 3965c42ac088d..ab5bec6678946 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/index.js
+++ b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
@@ -17,20 +17,24 @@
  * under the License.
  */
 
-import { i18n } from '@kbn/i18n';
-import { management } from 'ui/management';
-import './_view';
-import './_objects';
-import 'ace';
-import { uiModules } from 'ui/modules';
+import { IRouter } from 'src/core/server';
 
-// add the module deps to this module
-uiModules.get('apps/management');
+export const registerGetAllowedTypesRoute = (router: IRouter) => {
+  router.get(
+    {
+      path: '/api/kibana/management/saved_objects/_allowed_types',
+      validate: false,
+    },
+    async (context, req, res) => {
+      const allowedTypes = context.core.savedObjects.typeRegistry
+        .getImportableAndExportableTypes()
+        .map(type => type.name);
 
-management.getSection('kibana').register('objects', {
-  display: i18n.translate('kbn.management.objects.savedObjectsSectionLabel', {
-    defaultMessage: 'Saved Objects',
-  }),
-  order: 10,
-  url: '#/management/kibana/objects',
-});
+      return res.ok({
+        body: {
+          types: allowedTypes,
+        },
+      });
+    }
+  );
+};
diff --git a/src/plugins/saved_objects_management/server/routes/index.test.ts b/src/plugins/saved_objects_management/server/routes/index.test.ts
index f183972953dce..237760444f04e 100644
--- a/src/plugins/saved_objects_management/server/routes/index.test.ts
+++ b/src/plugins/saved_objects_management/server/routes/index.test.ts
@@ -34,7 +34,7 @@ describe('registerRoutes', () => {
     });
 
     expect(httpSetup.createRouter).toHaveBeenCalledTimes(1);
-    expect(router.get).toHaveBeenCalledTimes(2);
+    expect(router.get).toHaveBeenCalledTimes(3);
     expect(router.post).toHaveBeenCalledTimes(2);
 
     expect(router.get).toHaveBeenCalledWith(
@@ -49,6 +49,12 @@ describe('registerRoutes', () => {
       }),
       expect.any(Function)
     );
+    expect(router.get).toHaveBeenCalledWith(
+      expect.objectContaining({
+        path: '/api/kibana/management/saved_objects/_allowed_types',
+      }),
+      expect.any(Function)
+    );
     expect(router.post).toHaveBeenCalledWith(
       expect.objectContaining({
         path: '/api/kibana/management/saved_objects/scroll/counts',
diff --git a/src/plugins/saved_objects_management/server/routes/index.ts b/src/plugins/saved_objects_management/server/routes/index.ts
index 2c6adb71ed3ce..0929de56b215e 100644
--- a/src/plugins/saved_objects_management/server/routes/index.ts
+++ b/src/plugins/saved_objects_management/server/routes/index.ts
@@ -23,6 +23,7 @@ import { registerFindRoute } from './find';
 import { registerScrollForCountRoute } from './scroll_count';
 import { registerScrollForExportRoute } from './scroll_export';
 import { registerRelationshipsRoute } from './relationships';
+import { registerGetAllowedTypesRoute } from './get_allowed_types';
 
 interface RegisterRouteOptions {
   http: HttpServiceSetup;
@@ -35,4 +36,5 @@ export function registerRoutes({ http, managementServicePromise }: RegisterRoute
   registerScrollForCountRoute(router);
   registerScrollForExportRoute(router);
   registerRelationshipsRoute(router, managementServicePromise);
+  registerGetAllowedTypesRoute(router);
 }
diff --git a/src/plugins/saved_objects_management/server/types.ts b/src/plugins/saved_objects_management/server/types.ts
index 5c4763d357e87..bd17d6a19ae70 100644
--- a/src/plugins/saved_objects_management/server/types.ts
+++ b/src/plugins/saved_objects_management/server/types.ts
@@ -17,38 +17,10 @@
  * under the License.
  */
 
-import { SavedObject } from 'src/core/server';
-
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface SavedObjectsManagementPluginSetup {}
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface SavedObjectsManagementPluginStart {}
 
-/**
- * The metadata injected into a {@link SavedObject | saved object} when returning
- * {@link SavedObjectWithMetadata | enhanced objects} from the plugin API endpoints.
- */
-export interface SavedObjectMetadata {
-  icon?: string;
-  title?: string;
-  editUrl?: string;
-  inAppUrl?: { path: string; uiCapabilitiesPath: string };
-}
-
-/**
- * A {@link SavedObject | saved object} enhanced with meta properties used by the client-side plugin.
- */
-export type SavedObjectWithMetadata<T = unknown> = SavedObject<T> & {
-  meta: SavedObjectMetadata;
-};
-
-/**
- * Represents a relation between two {@link SavedObject | saved object}
- */
-export interface SavedObjectRelation {
-  id: string;
-  type: string;
-  relationship: 'child' | 'parent';
-  meta: SavedObjectMetadata;
-}
+export { SavedObjectMetadata, SavedObjectWithMetadata, SavedObjectRelation } from '../common';
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts
index 7d680f0ee0ed6..4e61756d933c9 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts
@@ -22,8 +22,8 @@ describe('CopySavedObjectsToSpaceService', () => {
       const service = new CopySavedObjectsToSpaceService();
       service.setup(deps);
 
-      expect(deps.savedObjectsManagementSetup.actionRegistry.register).toHaveBeenCalledTimes(1);
-      expect(deps.savedObjectsManagementSetup.actionRegistry.register).toHaveBeenCalledWith(
+      expect(deps.savedObjectsManagementSetup.actions.register).toHaveBeenCalledTimes(1);
+      expect(deps.savedObjectsManagementSetup.actions.register).toHaveBeenCalledWith(
         expect.any(CopyToSpaceSavedObjectsManagementAction)
       );
     });
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts
index d564514beebff..93d0f92744d41 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts
@@ -18,6 +18,6 @@ interface SetupDeps {
 export class CopySavedObjectsToSpaceService {
   public setup({ spacesManager, savedObjectsManagementSetup, notificationsSetup }: SetupDeps) {
     const action = new CopyToSpaceSavedObjectsManagementAction(spacesManager, notificationsSetup);
-    savedObjectsManagementSetup.actionRegistry.register(action);
+    savedObjectsManagementSetup.actions.register(action);
   }
 }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index fe0c58e83e544..e579830bad203 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2011,7 +2011,6 @@
     "kbn.dashboard.listing.table.descriptionColumnName": "説明",
     "kbn.dashboard.panel.unableToMigratePanelDataForSixOneZeroErrorMessage": "「6.1.0」のダッシュボードの互換性のため、パネルデータを移行できませんでした。パネルには想定された列または行フィールドがありません",
     "kbn.dashboard.panel.unableToMigratePanelDataForSixThreeZeroErrorMessage": "「6.3.0」のダッシュボードの互換性のため、パネルデータを移行できませんでした。パネルに必要なフィールドがありません: {key}",
-    "kbn.dashboard.savedDashboardsTitle": "ダッシュボード",
     "kbn.dashboardTitle": "ダッシュボード",
     "kbn.devToolsTitle": "開発ツール",
     "kbn.discover.backToTopLinkText": "最上部へ戻る。",
@@ -2281,9 +2280,6 @@
     "kbn.management.editIndexPattern.timeFilterLabel.mappingAPILink": "マッピング API",
     "kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail": "このページは {indexPatternTitle} インデックス内のすべてのフィールドと、Elasticsearch に記録された各フィールドのコアタイプを一覧表示します。フィールドタイプを変更するには Elasticsearch を使用します",
     "kbn.management.editIndexPatternLiveRegionAriaLabel": "インデックスパターン",
-    "kbn.management.indexPattern.confirmOverwriteButton": "上書き",
-    "kbn.management.indexPattern.confirmOverwriteLabel": "「{title}」に上書きしてよろしいですか？",
-    "kbn.management.indexPattern.confirmOverwriteTitle": "{type} を上書きしますか？",
     "kbn.management.indexPattern.goToPatternButtonLabel": "既存のパターンに移動",
     "kbn.management.indexPattern.sectionsHeader": "インデックスパターン",
     "kbn.management.indexPattern.titleExistsLabel": "「{title}」というタイトルのインデックスパターンが既に存在します。",
@@ -2306,125 +2302,128 @@
     "kbn.management.indexPatternTable.title": "インデックスパターン",
     "kbn.management.landing.header": "Kibana {version} 管理",
     "kbn.management.landing.subhead": "インデックス、インデックスパターン、保存されたオブジェクト、Kibana の設定、その他を管理します。",
-    "kbn.management.landing.text": "アプリの一覧は左側のメニューにあります。",
-    "kbn.management.objects.confirmModalOptions.deleteButtonLabel": "削除",
-    "kbn.management.objects.confirmModalOptions.modalDescription": "このアクションはオブジェクトを Kibana から永久に削除します。",
-    "kbn.management.objects.confirmModalOptions.modalTitle": "「{title}」を削除しますか？",
-    "kbn.management.objects.deleteSavedObjectsConfirmModalDescription": "この操作は次の保存されたオブジェクトを削除します:",
-    "kbn.management.objects.field.offLabel": "オフ",
-    "kbn.management.objects.field.onLabel": "オン",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "キャンセル",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel": "削除",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel": "削除中…",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.idColumnName": "ID",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName": "タイトル",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName": "タイプ",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModalTitle": "保存されたオブジェクトの削除",
-    "kbn.management.objects.objectsTable.export.dangerNotification": "エクスポートを生成できません",
-    "kbn.management.objects.objectsTable.export.successNotification": "ファイルはバックグラウンドでダウンロード中です",
-    "kbn.management.objects.objectsTable.export.successWithMissingRefsNotification": "ファイルはバックグラウンドでダウンロード中です。一部の関連オブジェクトが見つかりませんでした。足りないオブジェクトの一覧は、エクスポートされたファイルの最後の行をご覧ください。",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "キャンセル",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "すべてエクスポート:",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "オプション",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel": "関連オブジェクトを含める",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModalDescription": "エクスポートするタイプを選択してください",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModalTitle": "{filteredItemCount, plural, one{# オブジェクト} other {# オブジェクト}}をエクスポート",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage": "矛盾を解決中…",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "失敗したオブジェクトを再試行中…",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "保存された検索が正しくリンクされていることを確認してください…",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "矛盾を保存中…",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteBody": "{title} を上書きしてよろしいですか？",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteCancelButtonText": "キャンセル",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "上書き",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteTitle": "{type} を上書きしますか？",
-    "kbn.management.objects.objectsTable.flyout.errorCalloutTitle": "申し訳ございませんが、エラーが発生しました",
-    "kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel": "キャンセル",
-    "kbn.management.objects.objectsTable.flyout.import.confirmButtonLabel": "インポート",
-    "kbn.management.objects.objectsTable.flyout.importFailedDescription": "{totalImportCount} 個中 {failedImportCount} 個のオブジェクトのインポートに失敗しました。インポート失敗",
-    "kbn.management.objects.objectsTable.flyout.importFailedMissingReference": "{type} [id={id}] は {refType} [id={refId}] を見つけられませんでした",
-    "kbn.management.objects.objectsTable.flyout.importFailedTitle": "インポート失敗",
-    "kbn.management.objects.objectsTable.flyout.importFailedUnsupportedType": "{type} [id={id}] サポートされていないタイプ",
-    "kbn.management.objects.objectsTable.flyout.importFileErrorMessage": "ファイルを処理できませんでした。",
-    "kbn.management.objects.objectsTable.flyout.importLegacyFileErrorMessage": "ファイルを処理できませんでした。",
-    "kbn.management.objects.objectsTable.flyout.importPromptText": "インポート",
-    "kbn.management.objects.objectsTable.flyout.importSavedObjectTitle": "保存されたオブジェクトのインポート",
-    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "すべての変更を確定",
-    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完了",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle": "オブジェクトがインポートされませんでした",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulDescription": "{importCount} 個のオブジェクトがインポートされました。",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulTitle": "インポート成功",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "新規インデックスパターンを作成",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription": "次の保存されたオブジェクトは、存在しないインデックスパターンを使用しています。別のデックスパターンを選択してください。必要に応じて {indexPatternLink} できます。",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle": "インデックスパターンの矛盾",
-    "kbn.management.objects.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "保存されたオブジェクトのファイル形式が無効なため、インポートできません。",
-    "kbn.management.objects.objectsTable.flyout.legacyFileUsedBody": "最新のレポートで NDJSON ファイルを作成すれば完了です。",
-    "kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle": "JSON ファイルのサポートが終了します",
-    "kbn.management.objects.objectsTable.flyout.overwriteSavedObjectsLabel": "すべての保存されたオブジェクトを自動的に上書きしますか？",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountDescription": "影響されるオブジェクトの数です",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountName": "カウント",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdDescription": "インデックスパターンの ID です",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdName": "ID",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新規インデックスパターン",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "影響されるオブジェクトのサンプルです",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "影響されるオブジェクトのサンプル",
-    "kbn.management.objects.objectsTable.flyout.resolveImportErrorsFileErrorMessage": "ファイルを処理できませんでした。",
-    "kbn.management.objects.objectsTable.flyout.selectFileToImportFormRowLabel": "インポートするファイルを選択してください",
-    "kbn.management.objects.objectsTable.header.exportButtonLabel": "{filteredCount, plural, one{# オブジェクト} other {# オブジェクト}}をエクスポート",
-    "kbn.management.objects.objectsTable.header.importButtonLabel": "インポート",
-    "kbn.management.objects.objectsTable.header.refreshButtonLabel": "更新",
-    "kbn.management.objects.objectsTable.header.savedObjectsTitle": "保存されたオブジェクト",
-    "kbn.management.objects.objectsTable.howToDeleteSavedObjectsDescription": "ここから保存された検索などの保存されたオブジェクトを削除できます。保存されたオブジェクトの生データを編集することもできます。通常、オブジェクトは関連アプリケーションでのみ編集され、こｎ画面で編集するよりもそちらのほうが賢明です。",
-    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionDescription": "この保存されたオブジェクトを確認してください",
-    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionName": "検査",
-    "kbn.management.objects.objectsTable.relationships.columnActionsName": "アクション",
-    "kbn.management.objects.objectsTable.relationships.columnRelationship.childAsValue": "子",
-    "kbn.management.objects.objectsTable.relationships.columnRelationship.parentAsValue": "ペアレント",
-    "kbn.management.objects.objectsTable.relationships.columnRelationshipName": "直接関係",
-    "kbn.management.objects.objectsTable.relationships.columnTitleDescription": "保存されたオブジェクトのタイトルです",
-    "kbn.management.objects.objectsTable.relationships.columnTitleName": "タイトル",
-    "kbn.management.objects.objectsTable.relationships.columnTypeDescription": "保存されたオブジェクトのタイプです",
-    "kbn.management.objects.objectsTable.relationships.columnTypeName": "タイプ",
-    "kbn.management.objects.objectsTable.relationships.relationshipsTitle": "{title} に関連する保存されたオブジェクトはこちらです。この {type} を削除すると、親オブジェクトに影響がありますが、子オブジェクトには影響はありません。",
-    "kbn.management.objects.objectsTable.relationships.renderErrorMessage": "エラー",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.childAsValue.view": "子",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.name": "直接関係",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.parentAsValue.view": "親",
-    "kbn.management.objects.objectsTable.relationships.search.filters.type.name": "タイプ",
-    "kbn.management.objects.objectsTable.searchBar.unableToParseQueryErrorMessage": "クエリをパースできません",
-    "kbn.management.objects.objectsTable.table.columnActions.inspectActionDescription": "この保存されたオブジェクトを確認してください",
-    "kbn.management.objects.objectsTable.table.columnActions.inspectActionName": "検査",
-    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionDescription": "この保存されたオブジェクトと他の保存されたオブジェクトとの関係性を表示します",
-    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionName": "関係性",
-    "kbn.management.objects.objectsTable.table.columnActionsName": "アクション",
-    "kbn.management.objects.objectsTable.table.columnTitleDescription": "保存されたオブジェクトのタイトルです",
-    "kbn.management.objects.objectsTable.table.columnTitleName": "タイトル",
-    "kbn.management.objects.objectsTable.table.columnTypeDescription": "保存されたオブジェクトのタイプです",
-    "kbn.management.objects.objectsTable.table.columnTypeName": "タイプ",
-    "kbn.management.objects.objectsTable.table.deleteButtonLabel": "削除",
-    "kbn.management.objects.objectsTable.table.deleteButtonTitle": "保存されたオブジェクトを削除できません",
-    "kbn.management.objects.objectsTable.table.exportButtonLabel": "エクスポート",
-    "kbn.management.objects.objectsTable.table.exportPopoverButtonLabel": "エクスポート",
-    "kbn.management.objects.objectsTable.table.typeFilterName": "タイプ",
-    "kbn.management.objects.objectsTable.unableFindSavedObjectsNotificationMessage": "保存されたオブジェクトが見つかりません",
-    "kbn.management.objects.parsingFieldErrorMessage": "{fieldName} をインデックスパターン {indexName} 用にパース中にエラーが発生しました: {errorMessage}",
-    "kbn.management.objects.savedObjectsSectionLabel": "保存されたオブジェクト",
-    "kbn.management.objects.view.cancelButtonAriaLabel": "キャンセル",
-    "kbn.management.objects.view.cancelButtonLabel": "キャンセル",
-    "kbn.management.objects.view.deleteItemButtonLabel": "{title} を削除",
-    "kbn.management.objects.view.editItemTitle": "{title} の編集",
-    "kbn.management.objects.view.fieldDoesNotExistErrorMessage": "このオブジェクトに関連付けられたフィールドは、現在このインデックスパターンに存在しません。",
-    "kbn.management.objects.view.howToFixErrorDescription": "このエラーの原因がわかる場合は修正してください。わからない場合は上の削除ボタンをクリックしてください。",
-    "kbn.management.objects.view.howToModifyObjectDescription": "オブジェクトの編集は上級ユーザー向けです。オブジェクトのプロパティが検証されておらず、無効なオブジェクトはエラー、データ損失、またはそれ以上の問題の原因となります。コードを熟知した人に指示されていない限り、この設定は変更しない方が無難です。",
-    "kbn.management.objects.view.howToModifyObjectTitle": "十分ご注意ください！",
-    "kbn.management.objects.view.indexPatternDoesNotExistErrorMessage": "このオブジェクトに関連付けられたインデックスパターンは現在存在しません。",
-    "kbn.management.objects.view.saveButtonAriaLabel": "{ title } オブジェクトを保存",
-    "kbn.management.objects.view.saveButtonLabel": "{ title } オブジェクトを保存",
-    "kbn.management.objects.view.savedObjectProblemErrorMessage": "この保存されたオブジェクトに問題があります",
-    "kbn.management.objects.view.savedSearchDoesNotExistErrorMessage": "このオブジェクトに関連付けられた保存された検索は現在存在しません。",
-    "kbn.management.objects.view.viewItemButtonLabel": "{title} を表示",
-    "kbn.management.objects.view.viewItemTitle": "{title} を表示",
-    "kbn.management.savedObjects.editBreadcrumb": "{savedObjectType} を編集",
-    "kbn.management.savedObjects.indexBreadcrumb": "保存されたオブジェクト",
+    "kbn.management.landing.text": "すべてのツールの一覧は、左のメニューにあります。",
+    "savedObjectsManagement.indexPattern.confirmOverwriteButton": "上書き",
+    "savedObjectsManagement.indexPattern.confirmOverwriteLabel": "「{title}」に上書きしてよろしいですか？",
+    "savedObjectsManagement.indexPattern.confirmOverwriteTitle": "{type} を上書きしますか？",
+    "savedObjectsManagement.deleteConfirm.modalDeleteButtonLabel": "削除",
+    "savedObjectsManagement.deleteConfirm.modalDescription": "このアクションはオブジェクトを Kibana から永久に削除します。",
+    "savedObjectsManagement.deleteConfirm.modalTitle": "「{title}」を削除しますか？",
+    "savedObjectsManagement.deleteSavedObjectsConfirmModalDescription": "この操作は次の保存されたオブジェクトを削除します:",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "キャンセル",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel": "削除",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel": "削除中…",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.idColumnName": "ID",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName": "タイトル",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName": "タイプ",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModalTitle": "保存されたオブジェクトの削除",
+    "savedObjectsManagement.objectsTable.export.dangerNotification": "エクスポートを生成できません",
+    "savedObjectsManagement.objectsTable.export.successNotification": "ファイルはバックグラウンドでダウンロード中です",
+    "savedObjectsManagement.objectsTable.export.successWithMissingRefsNotification": "ファイルはバックグラウンドでダウンロード中です。一部の関連オブジェクトが見つかりませんでした。足りないオブジェクトの一覧は、エクスポートされたファイルの最後の行をご覧ください。",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "キャンセル",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "すべてエクスポート:",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "オプション",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel": "関連オブジェクトを含める",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModalDescription": "エクスポートするタイプを選択してください",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModalTitle": "{filteredItemCount, plural, one{# オブジェクト} other {# オブジェクト}}をエクスポート",
+    "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage": "矛盾を解決中…",
+    "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "失敗したオブジェクトを再試行中…",
+    "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "保存された検索が正しくリンクされていることを確認してください…",
+    "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "矛盾を保存中…",
+    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteBody": "{title} を上書きしてよろしいですか？",
+    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteCancelButtonText": "キャンセル",
+    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "上書き",
+    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteTitle": "{type} を上書きしますか？",
+    "savedObjectsManagement.objectsTable.flyout.errorCalloutTitle": "申し訳ございませんが、エラーが発生しました",
+    "savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel": "キャンセル",
+    "savedObjectsManagement.objectsTable.flyout.import.confirmButtonLabel": "インポート",
+    "savedObjectsManagement.objectsTable.flyout.importFailedDescription": "{totalImportCount} 個中 {failedImportCount} 個のオブジェクトのインポートに失敗しました。インポート失敗",
+    "savedObjectsManagement.objectsTable.flyout.importFailedMissingReference": "{type} [id={id}] は {refType} [id={refId}] を見つけられませんでした",
+    "savedObjectsManagement.objectsTable.flyout.importFailedTitle": "インポート失敗",
+    "savedObjectsManagement.objectsTable.flyout.importFailedUnsupportedType": "{type} [id={id}] サポートされていないタイプ",
+    "savedObjectsManagement.objectsTable.flyout.importFileErrorMessage": "ファイルを処理できませんでした。",
+    "savedObjectsManagement.objectsTable.flyout.importLegacyFileErrorMessage": "ファイルを処理できませんでした。",
+    "savedObjectsManagement.objectsTable.flyout.importPromptText": "インポート",
+    "savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle": "保存されたオブジェクトのインポート",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "すべての変更を確定",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完了",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle": "オブジェクトがインポートされませんでした",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessfulDescription": "{importCount} 個のオブジェクトがインポートされました。",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessfulTitle": "インポート成功",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "新規インデックスパターンを作成",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "次の保存されたオブジェクトは、存在しないインデックスパターンを使用しています。別のデックスパターンを選択してください。必要に応じて {indexPatternLink} できます。",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "インデックスパターンの矛盾",
+    "savedObjectsManagement.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "保存されたオブジェクトのファイル形式が無効なため、インポートできません。",
+    "savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody": "最新のレポートで NDJSON ファイルを作成すれば完了です。",
+    "savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle": "JSON ファイルのサポートが終了します",
+    "savedObjectsManagement.objectsTable.flyout.overwriteSavedObjectsLabel": "すべての保存されたオブジェクトを自動的に上書きしますか？",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "影響されるオブジェクトの数です",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "カウント",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "インデックスパターンの ID です",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdName": "ID",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新規インデックスパターン",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "影響されるオブジェクトのサンプルです",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "影響されるオブジェクトのサンプル",
+    "savedObjectsManagement.objectsTable.flyout.resolveImportErrorsFileErrorMessage": "ファイルを処理できませんでした。",
+    "savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel": "インポートするファイルを選択してください",
+    "savedObjectsManagement.objectsTable.header.exportButtonLabel": "{filteredCount, plural, one{# オブジェクト} other {# オブジェクト}}をエクスポート",
+    "savedObjectsManagement.objectsTable.header.importButtonLabel": "インポート",
+    "savedObjectsManagement.objectsTable.header.refreshButtonLabel": "更新",
+    "savedObjectsManagement.objectsTable.header.savedObjectsTitle": "保存されたオブジェクト",
+    "savedObjectsManagement.objectsTable.howToDeleteSavedObjectsDescription": "ここから保存された検索などの保存されたオブジェクトを削除できます。保存されたオブジェクトの生データを編集することもできます。通常、オブジェクトは関連アプリケーションでのみ編集され、こｎ画面で編集するよりもそちらのほうが賢明です。",
+    "savedObjectsManagement.objectsTable.relationships.columnActions.inspectActionDescription": "この保存されたオブジェクトを確認してください",
+    "savedObjectsManagement.objectsTable.relationships.columnActions.inspectActionName": "検査",
+    "savedObjectsManagement.objectsTable.relationships.columnActionsName": "アクション",
+    "savedObjectsManagement.objectsTable.relationships.columnRelationship.childAsValue": "子",
+    "savedObjectsManagement.objectsTable.relationships.columnRelationship.parentAsValue": "ペアレント",
+    "savedObjectsManagement.objectsTable.relationships.columnRelationshipName": "直接関係",
+    "savedObjectsManagement.objectsTable.relationships.columnTitleDescription": "保存されたオブジェクトのタイトルです",
+    "savedObjectsManagement.objectsTable.relationships.columnTitleName": "タイトル",
+    "savedObjectsManagement.objectsTable.relationships.columnTypeDescription": "保存されたオブジェクトのタイプです",
+    "savedObjectsManagement.objectsTable.relationships.columnTypeName": "タイプ",
+    "savedObjectsManagement.objectsTable.relationships.relationshipsTitle": "{title} に関連する保存されたオブジェクトはこちらです。この {type} を削除すると、親オブジェクトに影響がありますが、子オブジェクトには影響はありません。",
+    "savedObjectsManagement.objectsTable.relationships.renderErrorMessage": "エラー",
+    "savedObjectsManagement.objectsTable.relationships.search.filters.relationship.childAsValue.view": "子",
+    "savedObjectsManagement.objectsTable.relationships.search.filters.relationship.name": "直接関係",
+    "savedObjectsManagement.objectsTable.relationships.search.filters.relationship.parentAsValue.view": "親",
+    "savedObjectsManagement.objectsTable.relationships.search.filters.type.name": "タイプ",
+    "savedObjectsManagement.objectsTable.searchBar.unableToParseQueryErrorMessage": "クエリをパースできません",
+    "savedObjectsManagement.objectsTable.table.columnActions.inspectActionDescription": "この保存されたオブジェクトを確認してください",
+    "savedObjectsManagement.objectsTable.table.columnActions.inspectActionName": "検査",
+    "savedObjectsManagement.objectsTable.table.columnActions.viewRelationshipsActionDescription": "この保存されたオブジェクトと他の保存されたオブジェクトとの関係性を表示します",
+    "savedObjectsManagement.objectsTable.table.columnActions.viewRelationshipsActionName": "関係性",
+    "savedObjectsManagement.objectsTable.table.columnActionsName": "アクション",
+    "savedObjectsManagement.objectsTable.table.columnTitleDescription": "保存されたオブジェクトのタイトルです",
+    "savedObjectsManagement.objectsTable.table.columnTitleName": "タイトル",
+    "savedObjectsManagement.objectsTable.table.columnTypeDescription": "保存されたオブジェクトのタイプです",
+    "savedObjectsManagement.objectsTable.table.columnTypeName": "タイプ",
+    "savedObjectsManagement.objectsTable.table.deleteButtonLabel": "削除",
+    "savedObjectsManagement.objectsTable.table.deleteButtonTitle": "保存されたオブジェクトを削除できません",
+    "savedObjectsManagement.objectsTable.table.exportButtonLabel": "エクスポート",
+    "savedObjectsManagement.objectsTable.table.exportPopoverButtonLabel": "エクスポート",
+    "savedObjectsManagement.objectsTable.table.typeFilterName": "タイプ",
+    "savedObjectsManagement.objectsTable.unableFindSavedObjectsNotificationMessage": "保存されたオブジェクトが見つかりません",
+    "savedObjectsManagement.parsingFieldErrorMessage": "{fieldName} をインデックスパターン {indexName} 用にパース中にエラーが発生しました: {errorMessage}",
+    "savedObjectsManagement.managementSectionLabel": "保存されたオブジェクト",
+    "savedObjectsManagement.view.cancelButtonAriaLabel": "キャンセル",
+    "savedObjectsManagement.view.cancelButtonLabel": "キャンセル",
+    "savedObjectsManagement.view.deleteItemButtonLabel": "{title} を削除",
+    "savedObjectsManagement.view.editItemTitle": "{title} の編集",
+    "savedObjectsManagement.view.fieldDoesNotExistErrorMessage": "このオブジェクトに関連付けられたフィールドは、現在このインデックスパターンに存在しません。",
+    "savedObjectsManagement.view.howToFixErrorDescription": "このエラーの原因がわかる場合は修正してください。わからない場合は上の削除ボタンをクリックしてください。",
+    "savedObjectsManagement.view.howToModifyObjectDescription": " オブジェクトの編集は上級ユーザー向けです。オブジェクトのプロパティが検証されておらず、無効なオブジェクトはエラー、データ損失、またはそれ以上の問題の原因となります。コードを熟知した人に指示されていない限り、この設定は変更しない方が無難です。",
+    "savedObjectsManagement.view.howToModifyObjectTitle": "十分ご注意ください！",
+    "savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage": "このオブジェクトに関連付けられたインデックスパターンは現在存在しません。",
+    "savedObjectsManagement.view.saveButtonAriaLabel": "{ title }  オブジェクトを保存",
+    "savedObjectsManagement.view.saveButtonLabel": "{ title }  オブジェクトを保存",
+    "savedObjectsManagement.view.savedObjectProblemErrorMessage": "この保存されたオブジェクトに問題があります",
+    "savedObjectsManagement.view.savedSearchDoesNotExistErrorMessage": "このオブジェクトに関連付けられた保存された検索は現在存在しません。",
+    "savedObjectsManagement.view.viewItemButtonLabel": "{title} を表示",
+    "savedObjectsManagement.view.viewItemTitle": "{title} を表示",
+    "savedObjectsManagement.breadcrumb.edit": "{savedObjectType} を編集",
+    "savedObjectsManagement.breadcrumb.index": "保存されたオブジェクト",
+    "savedObjectsManagement.field.offLabel": "オフ",
+    "savedObjectsManagement.field.onLabel": "オン",
     "kbn.managementTitle": "管理",
     "kbn.topNavMenu.openInspectorButtonLabel": "検査",
     "kbn.topNavMenu.refreshButtonLabel": "更新",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index fd2a92c2c402f..75f48fb11823a 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2012,7 +2012,6 @@
     "kbn.dashboard.listing.table.descriptionColumnName": "描述",
     "kbn.dashboard.panel.unableToMigratePanelDataForSixOneZeroErrorMessage": "无法迁移用于“6.1.0”向后兼容的面板数据，面板不包含所需的列和/或行字段",
     "kbn.dashboard.panel.unableToMigratePanelDataForSixThreeZeroErrorMessage": "无法迁移用于“6.3.0”向后兼容的面板数据，面板不包含预期字段：{key}",
-    "kbn.dashboard.savedDashboardsTitle": "仪表板",
     "kbn.dashboardTitle": "仪表板",
     "kbn.devToolsTitle": "开发工具",
     "kbn.discover.backToTopLinkText": "返至顶部。",
@@ -2282,9 +2281,6 @@
     "kbn.management.editIndexPattern.timeFilterLabel.mappingAPILink": "映射 API",
     "kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail": "此页根据 Elasticsearch 的记录列出“{indexPatternTitle}”索引中的每个字段以及字段的关联核心类型。要更改字段类型，请使用 Elasticsearch",
     "kbn.management.editIndexPatternLiveRegionAriaLabel": "索引模式",
-    "kbn.management.indexPattern.confirmOverwriteButton": "覆盖",
-    "kbn.management.indexPattern.confirmOverwriteLabel": "确定要覆盖 “{title}”？",
-    "kbn.management.indexPattern.confirmOverwriteTitle": "覆盖“{type}”？",
     "kbn.management.indexPattern.goToPatternButtonLabel": "前往现有模式",
     "kbn.management.indexPattern.sectionsHeader": "索引模式",
     "kbn.management.indexPattern.titleExistsLabel": "具有标题 “{title}” 的索引模式已存在。",
@@ -2308,124 +2304,127 @@
     "kbn.management.landing.header": "Kibana {version} 管理",
     "kbn.management.landing.subhead": "管理您的索引、索引模式、已保存对象、Kibana 设置等等。",
     "kbn.management.landing.text": "应用的完整列表位于左侧菜单中。",
-    "kbn.management.objects.confirmModalOptions.deleteButtonLabel": "删除",
-    "kbn.management.objects.confirmModalOptions.modalDescription": "此操作会将对象从 Kibana 永久移除。",
-    "kbn.management.objects.confirmModalOptions.modalTitle": "删除“{title}”？",
-    "kbn.management.objects.deleteSavedObjectsConfirmModalDescription": "此操作将删除以下已保存对象：",
-    "kbn.management.objects.field.offLabel": "关闭",
-    "kbn.management.objects.field.onLabel": "开启",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "取消",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel": "删除",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel": "正在删除……",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.idColumnName": "ID",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName": "标题",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName": "类型",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModalTitle": "删除已保存对象",
-    "kbn.management.objects.objectsTable.export.dangerNotification": "无法生成报告",
-    "kbn.management.objects.objectsTable.export.successNotification": "您的文件正在后台下载",
-    "kbn.management.objects.objectsTable.export.successWithMissingRefsNotification": "您的文件正在后台下载。找不到某些相关对象。有关缺失对象列表，请查看导出文件的最后一行。",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "取消",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "全部导出",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "选项",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel": "包括相关对象",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModalDescription": "选择要导出的类型。",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModalTitle": "导出 {filteredItemCount, plural, one{# 个对象} other {# 个对象}}",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage": "正在解决冲突……",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "正在重试失败的对象……",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "确保已保存搜索已正确链接……",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "正在保存冲突……",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteBody": "确定要覆盖 “{title}”？",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteCancelButtonText": "取消",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "覆盖",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteTitle": "覆盖“{type}”？",
-    "kbn.management.objects.objectsTable.flyout.errorCalloutTitle": "抱歉，出现了错误",
-    "kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel": "取消",
-    "kbn.management.objects.objectsTable.flyout.import.confirmButtonLabel": "导入",
-    "kbn.management.objects.objectsTable.flyout.importFailedDescription": "无法导入 {failedImportCount} 个对象，共 {totalImportCount} 个。导入失败",
-    "kbn.management.objects.objectsTable.flyout.importFailedMissingReference": "{type} [id={id}] 无法找到 {refType} [id={refId}]",
-    "kbn.management.objects.objectsTable.flyout.importFailedTitle": "导入失败",
-    "kbn.management.objects.objectsTable.flyout.importFailedUnsupportedType": "{type} [id={id}] 不受支持的类型",
-    "kbn.management.objects.objectsTable.flyout.importFileErrorMessage": "无法处理该文件。",
-    "kbn.management.objects.objectsTable.flyout.importLegacyFileErrorMessage": "无法处理该文件。",
-    "kbn.management.objects.objectsTable.flyout.importPromptText": "导入",
-    "kbn.management.objects.objectsTable.flyout.importSavedObjectTitle": "导入已保存对象",
-    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "确认所有更改",
-    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完成",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle": "未导入任何对象",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulDescription": "已成功导入 {importCount} 个对象。",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulTitle": "导入成功",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "创建新的索引模式",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription": "以下已保存对象使用不存在的索引模式。请选择要重新关联的索引模式。必要时，您可以{indexPatternLink}。",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle": "索引模式冲突",
-    "kbn.management.objects.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "已保存对象文件格式无效，无法导入。",
-    "kbn.management.objects.objectsTable.flyout.legacyFileUsedBody": "只需使用更新的导出功能生成 NDJSON 文件，便万事俱备。",
-    "kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle": "将不再支持 JSON 文件",
-    "kbn.management.objects.objectsTable.flyout.overwriteSavedObjectsLabel": "自动覆盖所有已保存对象？",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountDescription": "受影响对象数目",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountName": "计数",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdDescription": "索引模式的 ID",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdName": "ID",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新建索引模式",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "受影响对象样例",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "受影响对象样例",
-    "kbn.management.objects.objectsTable.flyout.resolveImportErrorsFileErrorMessage": "无法处理该文件。",
-    "kbn.management.objects.objectsTable.flyout.selectFileToImportFormRowLabel": "请选择要导入的文件",
-    "kbn.management.objects.objectsTable.header.exportButtonLabel": "导出 {filteredCount, plural, one{# 个对象} other {# 个对象}}",
-    "kbn.management.objects.objectsTable.header.importButtonLabel": "导入",
-    "kbn.management.objects.objectsTable.header.refreshButtonLabel": "刷新",
-    "kbn.management.objects.objectsTable.header.savedObjectsTitle": "已保存对象",
-    "kbn.management.objects.objectsTable.howToDeleteSavedObjectsDescription": "从这里您可以删除已保存对象，如已保存搜索。还可以编辑已保存对象的原始数据。通常，对象只能通过其关联的应用程序进行修改；或许您应该遵循这一原则，而非使用此屏幕进行修改。",
-    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionDescription": "检查此已保存对象",
-    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionName": "检查",
-    "kbn.management.objects.objectsTable.relationships.columnActionsName": "操作",
-    "kbn.management.objects.objectsTable.relationships.columnRelationship.childAsValue": "子项",
-    "kbn.management.objects.objectsTable.relationships.columnRelationship.parentAsValue": "父项",
-    "kbn.management.objects.objectsTable.relationships.columnRelationshipName": "直接关系",
-    "kbn.management.objects.objectsTable.relationships.columnTitleDescription": "已保存对象的标题",
-    "kbn.management.objects.objectsTable.relationships.columnTitleName": "标题",
-    "kbn.management.objects.objectsTable.relationships.columnTypeDescription": "已保存对象的类型",
-    "kbn.management.objects.objectsTable.relationships.columnTypeName": "类型",
-    "kbn.management.objects.objectsTable.relationships.relationshipsTitle": "以下是与 {title} 相关的已保存对象。删除此{type}将影响其父级对象，但不会影响其子级对象。",
-    "kbn.management.objects.objectsTable.relationships.renderErrorMessage": "错误",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.childAsValue.view": "子项",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.name": "直接关系",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.parentAsValue.view": "父项",
-    "kbn.management.objects.objectsTable.relationships.search.filters.type.name": "类型",
-    "kbn.management.objects.objectsTable.searchBar.unableToParseQueryErrorMessage": "无法解析查询",
-    "kbn.management.objects.objectsTable.table.columnActions.inspectActionDescription": "检查此已保存对象",
-    "kbn.management.objects.objectsTable.table.columnActions.inspectActionName": "检查",
-    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionDescription": "查看此已保存对象与其他已保存对象的关系",
-    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionName": "关系",
-    "kbn.management.objects.objectsTable.table.columnActionsName": "操作",
-    "kbn.management.objects.objectsTable.table.columnTitleDescription": "已保存对象的标题",
-    "kbn.management.objects.objectsTable.table.columnTitleName": "标题",
-    "kbn.management.objects.objectsTable.table.columnTypeDescription": "已保存对象的类型",
-    "kbn.management.objects.objectsTable.table.columnTypeName": "类型",
-    "kbn.management.objects.objectsTable.table.deleteButtonLabel": "删除",
-    "kbn.management.objects.objectsTable.table.deleteButtonTitle": "无法删除已保存对象",
-    "kbn.management.objects.objectsTable.table.exportButtonLabel": "导出",
-    "kbn.management.objects.objectsTable.table.exportPopoverButtonLabel": "导出",
-    "kbn.management.objects.objectsTable.table.typeFilterName": "类型",
-    "kbn.management.objects.objectsTable.unableFindSavedObjectsNotificationMessage": "找不到已保存对象",
-    "kbn.management.objects.parsingFieldErrorMessage": "为索引模式 “{indexName}” 解析 “{fieldName}” 时发生错误：{errorMessage}",
-    "kbn.management.objects.savedObjectsSectionLabel": "已保存对象",
-    "kbn.management.objects.view.cancelButtonAriaLabel": "取消",
-    "kbn.management.objects.view.cancelButtonLabel": "取消",
-    "kbn.management.objects.view.deleteItemButtonLabel": "删除“{title}”",
-    "kbn.management.objects.view.editItemTitle": "编辑“{title}",
-    "kbn.management.objects.view.fieldDoesNotExistErrorMessage": "与此对象关联的字段在该索引模式中已不存在。",
-    "kbn.management.objects.view.howToFixErrorDescription": "如果您清楚此错误的含义，请修复该错误 — 否则单击上面的删除按钮。",
-    "kbn.management.objects.view.howToModifyObjectDescription": "修改对象仅适用于高级用户。对象属性未得到验证，无效的对象可能会导致错误、数据丢失或更坏的情况发生。除非熟悉该代码的人让您来这里，否则您可能不应该来这里。",
-    "kbn.management.objects.view.howToModifyObjectTitle": "谨慎操作！",
-    "kbn.management.objects.view.indexPatternDoesNotExistErrorMessage": "与此对象关联的索引模式已不存在。",
-    "kbn.management.objects.view.saveButtonAriaLabel": "保存 { title } 对象",
-    "kbn.management.objects.view.saveButtonLabel": "保存 { title } 对象",
-    "kbn.management.objects.view.savedObjectProblemErrorMessage": "此已保存对象有问题",
-    "kbn.management.objects.view.savedSearchDoesNotExistErrorMessage": "与此对象关联的已保存搜索已不存在。",
-    "kbn.management.objects.view.viewItemButtonLabel": "查看“{title}”",
-    "kbn.management.objects.view.viewItemTitle": "查看“{title}”",
-    "kbn.management.savedObjects.editBreadcrumb": "编辑 {savedObjectType}",
-    "kbn.management.savedObjects.indexBreadcrumb": "已保存对象",
+    "savedObjectsManagement.indexPattern.confirmOverwriteButton": "覆盖",
+    "savedObjectsManagement.indexPattern.confirmOverwriteLabel": "确定要覆盖 “{title}”？",
+    "savedObjectsManagement.indexPattern.confirmOverwriteTitle": "覆盖“{type}”？",
+    "savedObjectsManagement.deleteConfirm.modalDeleteButtonLabel": "删除",
+    "savedObjectsManagement.deleteConfirm.modalDescription": "此操作会将对象从 Kibana 永久移除。",
+    "savedObjectsManagement.deleteConfirm.modalTitle": "删除“{title}”？",
+    "savedObjectsManagement.deleteSavedObjectsConfirmModalDescription": "此操作将删除以下已保存对象：",
+    "savedObjectsManagement.field.offLabel": "关闭",
+    "savedObjectsManagement.field.onLabel": "开启",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "取消",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel": "删除",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel": "正在删除……",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.idColumnName": "ID",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName": "标题",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName": "类型",
+    "savedObjectsManagement.objectsTable.deleteSavedObjectsConfirmModalTitle": "删除已保存对象",
+    "savedObjectsManagement.objectsTable.export.dangerNotification": "无法生成报告",
+    "savedObjectsManagement.objectsTable.export.successNotification": "您的文件正在后台下载",
+    "savedObjectsManagement.objectsTable.export.successWithMissingRefsNotification": "您的文件正在后台下载。找不到某些相关对象。有关缺失对象列表，请查看导出文件的最后一行。",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "取消",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "全部导出",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "选项",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel": "包括相关对象",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModalDescription": "选择要导出的类型。",
+    "savedObjectsManagement.objectsTable.exportObjectsConfirmModalTitle": "导出 {filteredItemCount, plural, one{# 个对象} other {# 个对象}}",
+    "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage": "正在解决冲突……",
+    "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "正在重试失败的对象……",
+    "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "确保已保存搜索已正确链接……",
+    "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "正在保存冲突……",
+    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteBody": "确定要覆盖 “{title}”？",
+    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteCancelButtonText": "取消",
+    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "覆盖",
+    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteTitle": "覆盖“{type}”？",
+    "savedObjectsManagement.objectsTable.flyout.errorCalloutTitle": "抱歉，出现了错误",
+    "savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel": "取消",
+    "savedObjectsManagement.objectsTable.flyout.import.confirmButtonLabel": "导入",
+    "savedObjectsManagement.objectsTable.flyout.importFailedDescription": "无法导入 {failedImportCount} 个对象，共 {totalImportCount} 个。导入失败",
+    "savedObjectsManagement.objectsTable.flyout.importFailedMissingReference": "{type} [id={id}] 无法找到 {refType} [id={refId}]",
+    "savedObjectsManagement.objectsTable.flyout.importFailedTitle": "导入失败",
+    "savedObjectsManagement.objectsTable.flyout.importFailedUnsupportedType": "{type} [id={id}] 不受支持的类型",
+    "savedObjectsManagement.objectsTable.flyout.importFileErrorMessage": "无法处理该文件。",
+    "savedObjectsManagement.objectsTable.flyout.importLegacyFileErrorMessage": "无法处理该文件。",
+    "savedObjectsManagement.objectsTable.flyout.importPromptText": "导入",
+    "savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle": "导入已保存对象",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "确认所有更改",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完成",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle": "未导入任何对象",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessfulDescription": "已成功导入 {importCount} 个对象。",
+    "savedObjectsManagement.objectsTable.flyout.importSuccessfulTitle": "导入成功",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "创建新的索引模式",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "以下已保存对象使用不存在的索引模式。请选择要重新关联的索引模式。必要时，您可以{indexPatternLink}。",
+    "savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "索引模式冲突",
+    "savedObjectsManagement.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "已保存对象文件格式无效，无法导入。",
+    "savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody": "只需使用更新的导出功能生成 NDJSON 文件，便万事俱备。",
+    "savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle": "将不再支持 JSON 文件",
+    "savedObjectsManagement.objectsTable.flyout.overwriteSavedObjectsLabel": "自动覆盖所有已保存对象？",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "受影响对象数目",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "计数",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "索引模式的 ID",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdName": "ID",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新建索引模式",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "受影响对象样例",
+    "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "受影响对象样例",
+    "savedObjectsManagement.objectsTable.flyout.resolveImportErrorsFileErrorMessage": "无法处理该文件。",
+    "savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel": "请选择要导入的文件",
+    "savedObjectsManagement.objectsTable.header.exportButtonLabel": "导出 {filteredCount, plural, one{# 个对象} other {# 个对象}}",
+    "savedObjectsManagement.objectsTable.header.importButtonLabel": "导入",
+    "savedObjectsManagement.objectsTable.header.refreshButtonLabel": "刷新",
+    "savedObjectsManagement.objectsTable.header.savedObjectsTitle": "已保存对象",
+    "savedObjectsManagement.objectsTable.howToDeleteSavedObjectsDescription": "从这里您可以删除已保存对象，如已保存搜索。还可以编辑已保存对象的原始数据。通常，对象只能通过其关联的应用程序进行修改；或许您应该遵循这一原则，而非使用此屏幕进行修改。",
+    "savedObjectsManagement.objectsTable.relationships.columnActions.inspectActionDescription": "检查此已保存对象",
+    "savedObjectsManagement.objectsTable.relationships.columnActions.inspectActionName": "检查",
+    "savedObjectsManagement.objectsTable.relationships.columnActionsName": "操作",
+    "savedObjectsManagement.objectsTable.relationships.columnRelationship.childAsValue": "子项",
+    "savedObjectsManagement.objectsTable.relationships.columnRelationship.parentAsValue": "父项",
+    "savedObjectsManagement.objectsTable.relationships.columnRelationshipName": "直接关系",
+    "savedObjectsManagement.objectsTable.relationships.columnTitleDescription": "已保存对象的标题",
+    "savedObjectsManagement.objectsTable.relationships.columnTitleName": "标题",
+    "savedObjectsManagement.objectsTable.relationships.columnTypeDescription": "已保存对象的类型",
+    "savedObjectsManagement.objectsTable.relationships.columnTypeName": "类型",
+    "savedObjectsManagement.objectsTable.relationships.relationshipsTitle": "以下是与 {title} 相关的已保存对象。删除此{type}将影响其父级对象，但不会影响其子级对象。",
+    "savedObjectsManagement.objectsTable.relationships.renderErrorMessage": "错误",
+    "savedObjectsManagement.objectsTable.relationships.search.filters.relationship.childAsValue.view": "子项",
+    "savedObjectsManagement.objectsTable.relationships.search.filters.relationship.name": "直接关系",
+    "savedObjectsManagement.objectsTable.relationships.search.filters.relationship.parentAsValue.view": "父项",
+    "savedObjectsManagement.objectsTable.relationships.search.filters.type.name": "类型",
+    "savedObjectsManagement.objectsTable.searchBar.unableToParseQueryErrorMessage": "无法解析查询",
+    "savedObjectsManagement.objectsTable.table.columnActions.inspectActionDescription": "检查此已保存对象",
+    "savedObjectsManagement.objectsTable.table.columnActions.inspectActionName": "检查",
+    "savedObjectsManagement.objectsTable.table.columnActions.viewRelationshipsActionDescription": "查看此已保存对象与其他已保存对象的关系",
+    "savedObjectsManagement.objectsTable.table.columnActions.viewRelationshipsActionName": "关系",
+    "savedObjectsManagement.objectsTable.table.columnActionsName": "操作",
+    "savedObjectsManagement.objectsTable.table.columnTitleDescription": "已保存对象的标题",
+    "savedObjectsManagement.objectsTable.table.columnTitleName": "标题",
+    "savedObjectsManagement.objectsTable.table.columnTypeDescription": "已保存对象的类型",
+    "savedObjectsManagement.objectsTable.table.columnTypeName": "类型",
+    "savedObjectsManagement.objectsTable.table.deleteButtonLabel": "删除",
+    "savedObjectsManagement.objectsTable.table.deleteButtonTitle": "无法删除已保存对象",
+    "savedObjectsManagement.objectsTable.table.exportButtonLabel": "导出",
+    "savedObjectsManagement.objectsTable.table.exportPopoverButtonLabel": "导出",
+    "savedObjectsManagement.objectsTable.table.typeFilterName": "类型",
+    "savedObjectsManagement.objectsTable.unableFindSavedObjectsNotificationMessage": "找不到已保存对象",
+    "savedObjectsManagement.parsingFieldErrorMessage": "为索引模式 “{indexName}” 解析 “{fieldName}” 时发生错误：{errorMessage}",
+    "savedObjectsManagement.managementSectionLabel": "已保存对象",
+    "savedObjectsManagement.view.cancelButtonAriaLabel": "取消",
+    "savedObjectsManagement.view.cancelButtonLabel": "取消",
+    "savedObjectsManagement.view.deleteItemButtonLabel": "删除“{title}”",
+    "savedObjectsManagement.view.editItemTitle": "编辑“{title}",
+    "savedObjectsManagement.view.fieldDoesNotExistErrorMessage": "与此对象关联的字段在该索引模式中已不存在。",
+    "savedObjectsManagement.view.howToFixErrorDescription": "如果您清楚此错误的含义，请修复该错误 — 否则单击上面的删除按钮。",
+    "savedObjectsManagement.view.howToModifyObjectDescription": " 修改对象仅适用于高级用户。对象属性未得到验证，无效的对象可能会导致错误、数据丢失或更坏的情况发生。除非熟悉该代码的人让您来这里，否则您可能不应该来这里。",
+    "savedObjectsManagement.view.howToModifyObjectTitle": "谨慎操作！",
+    "savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage": "与此对象关联的索引模式已不存在。",
+    "savedObjectsManagement.view.saveButtonAriaLabel": "保存 { title } 对象",
+    "savedObjectsManagement.view.saveButtonLabel": "保存 { title } 对象",
+    "savedObjectsManagement.view.savedObjectProblemErrorMessage": "此已保存对象有问题",
+    "savedObjectsManagement.view.savedSearchDoesNotExistErrorMessage": "与此对象关联的已保存搜索已不存在。",
+    "savedObjectsManagement.view.viewItemButtonLabel": "查看“{title}”",
+    "savedObjectsManagement.view.viewItemTitle": "查看“{title}”",
+    "savedObjectsManagement.breadcrumb.edit": "编辑 {savedObjectType}",
+    "savedObjectsManagement.breadcrumb.index": "已保存对象",
     "kbn.managementTitle": "管理",
     "kbn.topNavMenu.openInspectorButtonLabel": "检查",
     "kbn.topNavMenu.refreshButtonLabel": "刷新",

From 61271c0652a8393f9af6972a46b31759d8b81c7d Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Mon, 13 Apr 2020 13:44:10 +0200
Subject: [PATCH 34/36] [Uptime] Simplify monitor param usage (#63121)

* add useMonitorId hook

* update url param hook

* update type

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../connected/charts/monitor_duration.tsx     |  5 ++--
 .../connected/charts/ping_histogram.tsx       |  5 ++--
 .../connected/charts/snapshot_container.tsx   |  5 ++--
 .../monitor/list_drawer_container.tsx         |  5 ++--
 .../monitor/status_bar_container.tsx          |  5 ++--
 .../monitor/status_details_container.tsx      |  5 ++--
 .../monitor_list_drawer/most_recent_error.tsx |  5 ++--
 .../monitor_details/ml/manage_ml_job.tsx      | 10 +++----
 .../ml/ml_flyout_container.tsx                | 10 +++----
 .../monitor_details/ml/ml_integeration.tsx    |  6 ++---
 .../contexts/uptime_settings_context.tsx      |  6 ++---
 .../hooks/__tests__/use_url_params.test.tsx   |  3 ++-
 .../uptime/public/hooks/use_monitor.ts        | 14 ++++++++++
 .../uptime/public/hooks/use_telemetry.ts      | 10 ++++---
 .../uptime/public/hooks/use_url_params.ts     | 27 +++++++++----------
 .../plugins/uptime/public/pages/monitor.tsx   |  6 ++---
 .../plugins/uptime/public/pages/overview.tsx  |  5 ++--
 17 files changed, 66 insertions(+), 66 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/public/hooks/use_monitor.ts

diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/charts/monitor_duration.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/charts/monitor_duration.tsx
index 7d1cb08cb8b1c..40480905350af 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/charts/monitor_duration.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/charts/monitor_duration.tsx
@@ -6,7 +6,7 @@
 
 import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { useUrlParams } from '../../../hooks';
+import { useGetUrlParams } from '../../../hooks';
 import {
   getAnomalyRecordsAction,
   getMLCapabilitiesAction,
@@ -28,13 +28,12 @@ interface Props {
 }
 
 export const DurationChart: React.FC<Props> = ({ monitorId }: Props) => {
-  const [getUrlParams] = useUrlParams();
   const {
     dateRangeStart,
     dateRangeEnd,
     absoluteDateRangeStart,
     absoluteDateRangeEnd,
-  } = getUrlParams();
+  } = useGetUrlParams();
 
   const { durationLines, loading } = useSelector(selectDurationLines);
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/charts/ping_histogram.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/charts/ping_histogram.tsx
index 50f91be4ff09f..6428ddfd10f8c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/charts/ping_histogram.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/charts/ping_histogram.tsx
@@ -15,7 +15,7 @@ import { getPingHistogram } from '../../../state/actions';
 import { selectPingHistogram } from '../../../state/selectors';
 import { withResponsiveWrapper, ResponsiveWrapperProps } from '../../higher_order';
 import { GetPingHistogramParams, HistogramResult } from '../../../../common/types';
-import { useUrlParams } from '../../../hooks';
+import { useGetUrlParams } from '../../../hooks';
 
 type Props = ResponsiveWrapperProps &
   Pick<PingHistogramComponentProps, 'height' | 'data' | 'loading'> &
@@ -30,14 +30,13 @@ const PingHistogramContainer: React.FC<Props> = ({
   loading,
   esKuery,
 }) => {
-  const [getUrlParams] = useUrlParams();
   const {
     absoluteDateRangeStart,
     absoluteDateRangeEnd,
     dateRangeStart: dateStart,
     dateRangeEnd: dateEnd,
     statusFilter,
-  } = getUrlParams();
+  } = useGetUrlParams();
 
   useEffect(() => {
     loadData({ monitorId, dateStart, dateEnd, statusFilter, filters: esKuery });
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/charts/snapshot_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/charts/snapshot_container.tsx
index ac8ff13d1edce..39ead242527f8 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/charts/snapshot_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/charts/snapshot_container.tsx
@@ -6,7 +6,7 @@
 
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
-import { useUrlParams } from '../../../hooks';
+import { useGetUrlParams } from '../../../hooks';
 import { AppState } from '../../../state';
 import { getSnapshotCountAction } from '../../../state/actions';
 import { SnapshotComponent } from '../../functional/snapshot';
@@ -54,8 +54,7 @@ export const Container: React.FC<Props> = ({
   esKuery,
   loadSnapshotCount,
 }: Props) => {
-  const [getUrlParams] = useUrlParams();
-  const { dateRangeStart, dateRangeEnd, statusFilter } = getUrlParams();
+  const { dateRangeStart, dateRangeEnd, statusFilter } = useGetUrlParams();
 
   useEffect(() => {
     loadSnapshotCount({ dateRangeStart, dateRangeEnd, filters: esKuery, statusFilter });
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/list_drawer_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/list_drawer_container.tsx
index ceeaa7026059f..70da62d5833af 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/list_drawer_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/list_drawer_container.tsx
@@ -11,7 +11,7 @@ import { monitorDetailsSelector } from '../../../state/selectors';
 import { MonitorDetailsActionPayload } from '../../../state/actions/types';
 import { getMonitorDetailsAction } from '../../../state/actions/monitor';
 import { MonitorListDrawerComponent } from '../../functional/monitor_list/monitor_list_drawer/monitor_list_drawer';
-import { useUrlParams } from '../../../hooks';
+import { useGetUrlParams } from '../../../hooks';
 import { MonitorSummary } from '../../../../common/graphql/types';
 import { MonitorDetails } from '../../../../common/runtime_types/monitor';
 
@@ -24,8 +24,7 @@ interface ContainerProps {
 const Container: React.FC<ContainerProps> = ({ summary, loadMonitorDetails, monitorDetails }) => {
   const monitorId = summary?.monitor_id;
 
-  const [getUrlParams] = useUrlParams();
-  const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = getUrlParams();
+  const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = useGetUrlParams();
 
   useEffect(() => {
     loadMonitorDetails({
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
index dd6f7a89cf9a3..00cfd02d8dc32 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
@@ -11,7 +11,7 @@ import { AppState } from '../../../state';
 import { monitorLocationsSelector, monitorStatusSelector } from '../../../state/selectors';
 import { MonitorStatusBarComponent } from '../../functional/monitor_status_details/monitor_status_bar';
 import { getMonitorStatusAction } from '../../../state/actions';
-import { useUrlParams } from '../../../hooks';
+import { useGetUrlParams } from '../../../hooks';
 import { Ping } from '../../../../common/graphql/types';
 import { MonitorLocations } from '../../../../common/runtime_types/monitor';
 import { UptimeRefreshContext } from '../../../contexts';
@@ -39,8 +39,7 @@ const Container: React.FC<Props> = ({
 }: Props) => {
   const { lastRefresh } = useContext(UptimeRefreshContext);
 
-  const [getUrlParams] = useUrlParams();
-  const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = getUrlParams();
+  const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = useGetUrlParams();
 
   useEffect(() => {
     loadMonitorStatus({ dateStart, dateEnd, monitorId });
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_details_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_details_container.tsx
index 3ced251dfab8c..9d2e48830fbfe 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_details_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_details_container.tsx
@@ -7,7 +7,7 @@
 import React, { useContext, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
-import { useUrlParams } from '../../../hooks';
+import { useGetUrlParams } from '../../../hooks';
 import { AppState } from '../../../state';
 import { monitorLocationsSelector } from '../../../state/selectors';
 import { getMonitorLocationsAction, MonitorLocationsPayload } from '../../../state/actions/monitor';
@@ -36,8 +36,7 @@ export const Container: React.FC<Props> = ({
 }: Props) => {
   const { lastRefresh } = useContext(UptimeRefreshContext);
 
-  const [getUrlParams] = useUrlParams();
-  const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = getUrlParams();
+  const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = useGetUrlParams();
 
   useEffect(() => {
     loadMonitorLocations({ dateStart, dateEnd, monitorId });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/most_recent_error.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/most_recent_error.tsx
index 036882b49359f..1963a9c852b11 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/most_recent_error.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/most_recent_error.tsx
@@ -8,7 +8,7 @@ import { EuiText, EuiSpacer } from '@elastic/eui';
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { MonitorPageLink } from '../monitor_page_link';
-import { useUrlParams } from '../../../../hooks';
+import { useGetUrlParams } from '../../../../hooks';
 import { stringifyUrlParams } from '../../../../lib/helper/stringify_url_params';
 import { MonitorError } from '../../../../../common/runtime_types';
 
@@ -30,8 +30,7 @@ interface MostRecentErrorProps {
 }
 
 export const MostRecentError = ({ error, monitorId, timestamp }: MostRecentErrorProps) => {
-  const [getUrlParams] = useUrlParams();
-  const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
+  const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = useGetUrlParams();
   params.selectedPingStatus = 'down';
   const linkParameters = stringifyUrlParams(params, true);
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
index 29f003437f7cb..1abda87abf73a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
@@ -7,13 +7,13 @@
 import React, { useContext, useState } from 'react';
 
 import { EuiButtonEmpty, EuiContextMenu, EuiIcon, EuiPopover } from '@elastic/eui';
-import { useParams } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import { canDeleteMLJobSelector } from '../../../state/selectors';
 import { UptimeSettingsContext } from '../../../contexts';
 import * as labels from './translations';
 import { getMLJobLinkHref } from './ml_job_link';
-import { useUrlParams } from '../../../hooks';
+import { useGetUrlParams } from '../../../hooks';
+import { useMonitorId } from '../../../hooks/use_monitor';
 
 interface Props {
   hasMLJob: boolean;
@@ -28,11 +28,9 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
 
   const canDeleteMLJob = useSelector(canDeleteMLJobSelector);
 
-  const [getUrlParams] = useUrlParams();
-  const { dateRangeStart, dateRangeEnd } = getUrlParams();
+  const { dateRangeStart, dateRangeEnd } = useGetUrlParams();
 
-  let { monitorId } = useParams();
-  monitorId = atob(monitorId || '');
+  const monitorId = useMonitorId();
 
   const button = (
     <EuiButtonEmpty
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
index 9eed24e2810d8..6953618d92213 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
@@ -6,7 +6,6 @@
 
 import React, { useContext, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { useParams } from 'react-router-dom';
 import {
   canCreateMLJobSelector,
   hasMLJobSelector,
@@ -24,8 +23,9 @@ import {
 import { MLFlyoutView } from './ml_flyout';
 import { ML_JOB_ID } from '../../../../common/constants';
 import { UptimeRefreshContext, UptimeSettingsContext } from '../../../contexts';
-import { useUrlParams } from '../../../hooks';
+import { useGetUrlParams } from '../../../hooks';
 import { getDynamicSettings } from '../../../state/actions/dynamic_settings';
+import { useMonitorId } from '../../../hooks/use_monitor';
 
 interface Props {
   onClose: () => void;
@@ -77,8 +77,7 @@ export const MachineLearningFlyout: React.FC<Props> = ({ onClose }) => {
 
   const { refreshApp } = useContext(UptimeRefreshContext);
 
-  let { monitorId } = useParams();
-  monitorId = atob(monitorId || '');
+  const monitorId = useMonitorId();
 
   const canCreateMLJob = useSelector(canCreateMLJobSelector) && heartbeatIndices !== '';
 
@@ -93,8 +92,7 @@ export const MachineLearningFlyout: React.FC<Props> = ({ onClose }) => {
 
   const [isCreatingJob, setIsCreatingJob] = useState(false);
 
-  const [getUrlParams] = useUrlParams();
-  const { dateRangeStart, dateRangeEnd } = getUrlParams();
+  const { dateRangeStart, dateRangeEnd } = useGetUrlParams();
 
   useEffect(() => {
     if (isCreatingJob && !isMLJobCreating) {
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
index a27796167091e..e65a2510ea6f2 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
@@ -5,8 +5,6 @@
  */
 
 import React, { useContext, useEffect, useState } from 'react';
-
-import { useParams } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { MachineLearningFlyout } from './ml_flyout_container';
 import {
@@ -23,6 +21,7 @@ import * as labels from './translations';
 import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ManageMLJobComponent } from './manage_ml_job';
 import { JobStat } from '../../../../../../../plugins/ml/common/types/data_recognizer';
+import { useMonitorId } from '../../../hooks/use_monitor';
 
 export const MLIntegrationComponent = () => {
   const [isMlFlyoutOpen, setIsMlFlyoutOpen] = useState(false);
@@ -32,8 +31,7 @@ export const MLIntegrationComponent = () => {
 
   const { notifications } = useKibana();
 
-  let { monitorId } = useParams();
-  monitorId = atob(monitorId || '');
+  const monitorId = useMonitorId();
 
   const dispatch = useDispatch();
 
diff --git a/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx b/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx
index 44a87d310c9c7..c5a0ec4831798 100644
--- a/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx
+++ b/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx
@@ -8,7 +8,7 @@ import React, { createContext, useMemo } from 'react';
 import { UptimeAppProps } from '../uptime_app';
 import { CLIENT_DEFAULTS, CONTEXT_DEFAULTS } from '../../common/constants';
 import { CommonlyUsedRange } from '../components/functional/uptime_date_picker';
-import { useUrlParams } from '../hooks';
+import { useGetUrlParams } from '../hooks';
 import { ILicense } from '../../../../../plugins/licensing/common/types';
 
 export interface UptimeSettingsContextValues {
@@ -50,9 +50,7 @@ export const UptimeSettingsContextProvider: React.FC<UptimeAppProps> = ({ childr
     plugins,
   } = props;
 
-  const [getUrlParams] = useUrlParams();
-
-  const { dateRangeStart, dateRangeEnd } = getUrlParams();
+  const { dateRangeStart, dateRangeEnd } = useGetUrlParams();
 
   let license: ILicense | null = null;
 
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_url_params.test.tsx b/x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_url_params.test.tsx
index a8999a50927d2..deb1f163c1326 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_url_params.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_url_params.test.tsx
@@ -19,6 +19,7 @@ interface MockUrlParamsComponentProps {
 const UseUrlParamsTestComponent = ({ hook, updateParams }: MockUrlParamsComponentProps) => {
   const [params, setParams] = useState({});
   const [getUrlParams, updateUrlParams] = hook();
+  const queryParams = getUrlParams();
   return (
     <Fragment>
       {Object.keys(params).length > 0 ? <div>{JSON.stringify(params)}</div> : null}
@@ -30,7 +31,7 @@ const UseUrlParamsTestComponent = ({ hook, updateParams }: MockUrlParamsComponen
       >
         Set url params
       </button>
-      <button id="getUrlParams" onClick={() => setParams(getUrlParams())}>
+      <button id="getUrlParams" onClick={() => setParams(queryParams)}>
         Get url params
       </button>
     </Fragment>
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_monitor.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_monitor.ts
new file mode 100644
index 0000000000000..8080ce2696a3c
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_monitor.ts
@@ -0,0 +1,14 @@
+/*
+ * 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 { useParams } from 'react-router-dom';
+
+export const useMonitorId = (): string => {
+  const { monitorId } = useParams();
+
+  // decode 64 base string, it was decoded to make it a valid url, since monitor id can be a url
+  return atob(monitorId || '');
+};
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
index 13fe523332ae5..a2012b8ac5636 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
@@ -5,7 +5,7 @@
  */
 
 import { useEffect } from 'react';
-import { useUrlParams } from './use_url_params';
+import { useGetUrlParams } from './use_url_params';
 import { apiService } from '../state/api/utils';
 import { API_URLS } from '../../common/constants';
 
@@ -17,8 +17,12 @@ export enum UptimePage {
 }
 
 export const useUptimeTelemetry = (page?: UptimePage) => {
-  const [getUrlParams] = useUrlParams();
-  const { dateRangeStart, dateRangeEnd, autorefreshInterval, autorefreshIsPaused } = getUrlParams();
+  const {
+    dateRangeStart,
+    dateRangeEnd,
+    autorefreshInterval,
+    autorefreshIsPaused,
+  } = useGetUrlParams();
 
   useEffect(() => {
     if (!apiService.http) throw new Error('Core http services are not defined');
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts
index 20063b2c1bc93..8b13e9e480559 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts
@@ -15,27 +15,26 @@ export type UpdateUrlParams = (updatedParams: {
 
 export type UptimeUrlParamsHook = () => [GetUrlParams, UpdateUrlParams];
 
-export const useUrlParams: UptimeUrlParamsHook = () => {
+const getParsedParams = (search: string) => {
+  return search ? parse(search[0] === '?' ? search.slice(1) : search, { sort: false }) : {};
+};
+
+export const useGetUrlParams: GetUrlParams = () => {
   const location = useLocation();
-  const history = useHistory();
 
-  const getUrlParams: GetUrlParams = () => {
-    let search: string | undefined;
-    if (location) {
-      search = location.search;
-    }
+  const params = getParsedParams(location?.search);
 
-    const params = search
-      ? parse(search[0] === '?' ? search.slice(1) : search, { sort: false })
-      : {};
+  return getSupportedUrlParams(params);
+};
 
-    return getSupportedUrlParams(params);
-  };
+export const useUrlParams: UptimeUrlParamsHook = () => {
+  const location = useLocation();
+  const history = useHistory();
 
   const updateUrlParams: UpdateUrlParams = updatedParams => {
     if (!history || !location) return;
     const { pathname, search } = location;
-    const currentParams = parse(search[0] === '?' ? search.slice(1) : search, { sort: false });
+    const currentParams = getParsedParams(search);
     const mergedParams = {
       ...currentParams,
       ...updatedParams,
@@ -60,5 +59,5 @@ export const useUrlParams: UptimeUrlParamsHook = () => {
     });
   };
 
-  return [getUrlParams, updateUrlParams];
+  return [useGetUrlParams, updateUrlParams];
 };
diff --git a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
index 21124b7323d68..5016ccebbab54 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
@@ -6,7 +6,6 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import React, { useContext, useState } from 'react';
-import { useParams } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import { MonitorCharts, PingList } from '../components/functional';
 import { UptimeRefreshContext } from '../contexts';
@@ -16,11 +15,10 @@ import { MonitorStatusDetails } from '../components/connected';
 import { monitorStatusSelector } from '../state/selectors';
 import { PageHeader } from './page_header';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
+import { useMonitorId } from '../hooks/use_monitor';
 
 export const MonitorPage: React.FC = () => {
-  // decode 64 base string, it was decoded to make it a valid url, since monitor id can be a url
-  let { monitorId } = useParams();
-  monitorId = atob(monitorId || '');
+  const monitorId = useMonitorId();
 
   const [pingListPageCount, setPingListPageCount] = useState<number>(10);
   const { refreshApp } = useContext(UptimeRefreshContext);
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index 943dbd6bd57ba..5550facaf42e9 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -13,7 +13,7 @@ import {
   OverviewPageParsingErrorCallout,
   StatusPanel,
 } from '../components/functional';
-import { useUrlParams, useUptimeTelemetry, UptimePage } from '../hooks';
+import { useUptimeTelemetry, UptimePage, useGetUrlParams } from '../hooks';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { useTrackPageview } from '../../../../../plugins/observability/public';
 import { DataPublicPluginSetup, IIndexPattern } from '../../../../../../src/plugins/data/public';
@@ -55,12 +55,11 @@ const getMonitorListPageSizeValue = () => {
 
 export const OverviewPageComponent = ({ autocomplete, indexPattern, setEsKueryFilters }: Props) => {
   const { colors } = useContext(UptimeThemeContext);
-  const [getUrlParams] = useUrlParams();
   // TODO: this is temporary until we migrate the monitor list to our Redux implementation
   const [monitorListPageSize, setMonitorListPageSize] = useState<number>(
     getMonitorListPageSizeValue()
   );
-  const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
+  const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = useGetUrlParams();
   const {
     dateRangeStart,
     dateRangeEnd,

From c7f61f956a581bf39be01f9e0c263577c2165b6b Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Mon, 13 Apr 2020 13:49:46 +0200
Subject: [PATCH 35/36] [Uptime] Update Ml functional test (#62562)

* update test

* added test

* updated type

* updated test

* updated test

* update test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../connected/empty_state/empty_state.tsx     |  6 +-
 .../confirm_delete.test.tsx.snap              |  2 +
 .../__snapshots__/license_info.test.tsx.snap  |  2 +
 .../__snapshots__/ml_flyout.test.tsx.snap     |  5 ++
 .../ml_integerations.test.tsx.snap            |  1 +
 .../__snapshots__/ml_manage_job.test.tsx.snap |  1 +
 .../monitor_details/ml/confirm_delete.tsx     |  1 +
 .../monitor_details/ml/license_info.tsx       |  1 +
 .../monitor_details/ml/manage_ml_job.tsx      |  8 ++-
 .../monitor_details/ml/ml_flyout.tsx          |  3 +-
 .../ml/ml_flyout_container.tsx                |  6 +-
 .../monitor_details/ml/ml_integeration.tsx    |  2 +-
 .../plugins/uptime/public/pages/settings.tsx  |  2 +-
 x-pack/test/functional/apps/uptime/index.ts   |  5 +-
 .../test/functional/apps/uptime/ml_anomaly.ts | 51 ++++++++++++++++
 x-pack/test/functional/apps/uptime/monitor.ts |  7 +--
 .../test/functional/apps/uptime/overview.ts   | 24 ++++----
 .../functional/page_objects/uptime_page.ts    | 39 ++++++------
 .../test/functional/services/uptime/common.ts | 15 +++++
 .../functional/services/uptime/ml_anomaly.ts  | 59 +++++++++++++++++++
 .../functional/services/uptime/navigation.ts  | 52 +++++++++++-----
 .../test/functional/services/uptime/uptime.ts |  3 +
 22 files changed, 235 insertions(+), 60 deletions(-)
 create mode 100644 x-pack/test/functional/apps/uptime/ml_anomaly.ts
 create mode 100644 x-pack/test/functional/services/uptime/ml_anomaly.ts

diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
index b383a696095a3..55c92e70b6066 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
@@ -4,20 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useEffect } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { indexStatusAction } from '../../../state/actions';
 import { indexStatusSelector } from '../../../state/selectors';
 import { EmptyStateComponent } from '../../functional/empty_state/empty_state';
+import { UptimeRefreshContext } from '../../../contexts';
 
 export const EmptyState: React.FC = ({ children }) => {
   const { data, loading, error } = useSelector(indexStatusSelector);
+  const { lastRefresh } = useContext(UptimeRefreshContext);
 
   const dispatch = useDispatch();
 
   useEffect(() => {
     dispatch(indexStatusAction.get());
-  }, [dispatch]);
+  }, [dispatch, lastRefresh]);
 
   return (
     <EmptyStateComponent
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
index 24ef7eda0d129..d83e45fea1aec 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`ML Confirm Job Delete shallow renders without errors 1`] = `
     buttonColor="danger"
     cancelButtonText="Cancel"
     confirmButtonText="Delete"
+    data-test-subj="uptimeMLJobDeleteConfirmModel"
     defaultFocusedButton="confirm"
     onCancel={[MockFunction]}
     onConfirm={[MockFunction]}
@@ -35,6 +36,7 @@ exports[`ML Confirm Job Delete shallow renders without errors while loading 1`]
     buttonColor="danger"
     cancelButtonText="Cancel"
     confirmButtonText="Delete"
+    data-test-subj="uptimeMLJobDeleteConfirmModel"
     defaultFocusedButton="confirm"
     onCancel={[MockFunction]}
     onConfirm={[MockFunction]}
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/license_info.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/license_info.test.tsx.snap
index 2457488c4facc..fb40a42e47f75 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/license_info.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/license_info.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`ShowLicenseInfo renders without errors 1`] = `
 Array [
   <div
     class="euiCallOut euiCallOut--primary license-info-trial"
+    data-test-subj="uptimeMLLicenseInfo"
   >
     <div
       class="euiCallOutHeader"
@@ -54,6 +55,7 @@ exports[`ShowLicenseInfo shallow renders without errors 1`] = `
   <EuiCallOut
     className="license-info-trial"
     color="primary"
+    data-test-subj="uptimeMLLicenseInfo"
     iconType="help"
     title="Start free 14-day trial"
   >
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
index ead27425c26f3..a83a1d99d7bb0 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`ML Flyout component renders without errors 1`] = `
 <EuiFlyout
   closeButtonAriaLabel="Closes this dialog"
+  data-test-subj="uptimeMLFlyout"
   hideCloseButton={false}
   maxWidth={false}
   onClose={[Function]}
@@ -69,6 +70,7 @@ exports[`ML Flyout component renders without errors 1`] = `
         grow={false}
       >
         <EuiButton
+          data-test-subj="uptimeMLCreateJobBtn"
           disabled={true}
           fill={true}
           isLoading={false}
@@ -99,6 +101,7 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
   >
     <div
       class="euiFlyout euiFlyout--small"
+      data-test-subj="uptimeMLFlyout"
       role="dialog"
       tabindex="0"
     >
@@ -137,6 +140,7 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
           >
             <div
               class="euiCallOut euiCallOut--primary license-info-trial"
+              data-test-subj="uptimeMLLicenseInfo"
             >
               <div
                 class="euiCallOutHeader"
@@ -240,6 +244,7 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
           >
             <button
               class="euiButton euiButton--primary euiButton--fill"
+              data-test-subj="uptimeMLCreateJobBtn"
               disabled=""
               type="button"
             >
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
index ac4630f4e69a8..fa9b59e13c34e 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`ML Integrations renders without errors 1`] = `
   >
     <button
       class="euiButtonEmpty euiButtonEmpty--primary"
+      data-test-subj="uptimeEnableAnomalyBtn"
       type="button"
     >
       <span
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
index 6eb2930c4875a..91bd9fa3d86b5 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`Manage ML Job renders without errors 1`] = `
   >
     <button
       class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--iconRight"
+      data-test-subj="uptimeManageMLJobBtn"
       type="button"
     >
       <span
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/confirm_delete.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/confirm_delete.tsx
index 6754676765fb6..628f943ef2e08 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/confirm_delete.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/confirm_delete.tsx
@@ -25,6 +25,7 @@ export const ConfirmJobDeletion: React.FC<Props> = ({ loading, onConfirm, onCanc
         confirmButtonText="Delete"
         buttonColor="danger"
         defaultFocusedButton="confirm"
+        data-test-subj="uptimeMLJobDeleteConfirmModel"
       >
         {!loading ? (
           <p>
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/license_info.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/license_info.tsx
index 92badb4043ed6..fae81177a728c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/license_info.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/license_info.tsx
@@ -13,6 +13,7 @@ export const ShowLicenseInfo = () => {
   return (
     <>
       <EuiCallOut
+        data-test-subj="uptimeMLLicenseInfo"
         className="license-info-trial"
         title={labels.START_TRAIL}
         color="primary"
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
index 1abda87abf73a..ec3e8bb2b9f68 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/manage_ml_job.tsx
@@ -34,6 +34,7 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
 
   const button = (
     <EuiButtonEmpty
+      data-test-subj={hasMLJob ? 'uptimeManageMLJobBtn' : 'uptimeEnableAnomalyBtn'}
       iconType={hasMLJob ? 'arrowDown' : 'machineLearningApp'}
       iconSide={hasMLJob ? 'right' : 'left'}
       onClick={hasMLJob ? () => setIsPopOverOpen(true) : onEnableJob}
@@ -60,6 +61,7 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
         },
         {
           name: labels.DISABLE_ANOMALY_DETECTION,
+          'data-test-subj': 'uptimeDeleteMLJobBtn',
           icon: <EuiIcon type="trash" size="m" />,
           onClick: () => {
             setIsPopOverOpen(false);
@@ -72,7 +74,11 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
 
   return (
     <EuiPopover button={button} isOpen={isPopOverOpen} closePopover={() => setIsPopOverOpen(false)}>
-      <EuiContextMenu initialPanelId={0} panels={panels} />
+      <EuiContextMenu
+        initialPanelId={0}
+        panels={panels}
+        data-test-subj="uptimeManageMLContextMenu"
+      />
     </EuiPopover>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout.tsx
index fdecfbf20810c..8c3f814e841f7 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout.tsx
@@ -39,7 +39,7 @@ export function MLFlyoutView({ isCreatingJob, onClickCreate, onClose, canCreateM
   const hasPlatinumLicense = license?.getFeature('ml')?.isAvailable;
 
   return (
-    <EuiFlyout onClose={onClose} size="s">
+    <EuiFlyout onClose={onClose} size="s" data-test-subj="uptimeMLFlyout">
       <EuiFlyoutHeader>
         <EuiTitle>
           <h2>{labels.ENABLE_ANOMALY_DETECTION}</h2>
@@ -76,6 +76,7 @@ export function MLFlyoutView({ isCreatingJob, onClickCreate, onClose, canCreateM
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
+              data-test-subj="uptimeMLCreateJobBtn"
               onClick={() => onClickCreate()}
               fill
               isLoading={isCreatingJob}
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
index 6953618d92213..a13de192cc443 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_flyout_container.tsx
@@ -41,7 +41,9 @@ const showMLJobNotification = (
 ) => {
   if (success) {
     notifications.toasts.success({
-      title: <p>{labels.JOB_CREATED_SUCCESS_TITLE}</p>,
+      title: (
+        <p data-test-subj="uptimeMLJobSuccessfullyCreated">{labels.JOB_CREATED_SUCCESS_TITLE}</p>
+      ),
       body: (
         <p>
           {labels.JOB_CREATED_SUCCESS_MESSAGE}
@@ -54,7 +56,7 @@ const showMLJobNotification = (
     });
   } else {
     notifications.toasts.danger({
-      title: <p>{labels.JOB_CREATION_FAILED}</p>,
+      title: <p data-test-subj="uptimeMLJobCreationFailed">{labels.JOB_CREATION_FAILED}</p>,
       body: message ?? <p>{labels.JOB_CREATION_FAILED_MESSAGE}</p>,
       toastLifeTimeMs: 10000,
     });
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
index e65a2510ea6f2..e053ca733cb8c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/monitor_details/ml/ml_integeration.tsx
@@ -57,7 +57,7 @@ export const MLIntegrationComponent = () => {
     if (isConfirmDeleteJobOpen && jobDeletionSuccess?.[getMLJobId(monitorId as string)]?.deleted) {
       setIsConfirmDeleteJobOpen(false);
       notifications.toasts.success({
-        title: <p>{labels.JOB_DELETION}</p>,
+        title: <p data-test-subj="uptimeMLJobSuccessfullyDeleted">{labels.JOB_DELETION}</p>,
         body: <p>{labels.JOB_DELETION_SUCCESS}</p>,
         toastLifeTimeMs: 3000,
       });
diff --git a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
index d3e17a15ee0e0..765b0e3c664bc 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
@@ -112,7 +112,7 @@ export const SettingsPageComponent = ({
 
   return (
     <>
-      <Link to={OVERVIEW_ROUTE}>
+      <Link to={OVERVIEW_ROUTE} data-test-subj="uptimeSettingsToOverviewLink">
         <EuiButtonEmpty size="s" color="primary" iconType="arrowLeft">
           {i18n.translate('xpack.uptime.settings.returnToOverviewLinkLabel', {
             defaultMessage: 'Return to overview',
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index 3789351263b98..f47214dc2ad2f 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -16,6 +16,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const server = getService('kibanaServer');
+  const uptime = getService('uptime');
 
   describe('Uptime app', function() {
     this.tags('ciGroup6');
@@ -58,12 +59,14 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
         await esArchiver.unload(ARCHIVE);
         await esArchiver.load(ARCHIVE);
         await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' });
+        await uptime.navigation.goToUptime();
       });
       after(async () => await esArchiver.unload(ARCHIVE));
 
-      loadTestFile(require.resolve('./feature_controls'));
       loadTestFile(require.resolve('./overview'));
       loadTestFile(require.resolve('./monitor'));
+      loadTestFile(require.resolve('./ml_anomaly'));
+      loadTestFile(require.resolve('./feature_controls'));
     });
   });
 };
diff --git a/x-pack/test/functional/apps/uptime/ml_anomaly.ts b/x-pack/test/functional/apps/uptime/ml_anomaly.ts
new file mode 100644
index 0000000000000..bcd165cc1afb7
--- /dev/null
+++ b/x-pack/test/functional/apps/uptime/ml_anomaly.ts
@@ -0,0 +1,51 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default ({ getService }: FtrProviderContext) => {
+  const uptime = getService('uptime');
+  const log = getService('log');
+
+  describe('uptime ml anomaly', function() {
+    this.tags(['skipFirefox']);
+    const dateStart = 'Sep 10, 2019 @ 12:40:08.078';
+    const dateEnd = 'Sep 11, 2019 @ 19:40:08.078';
+    const monitorId = '0000-intermittent';
+
+    before(async () => {
+      if (!(await uptime.navigation.checkIfOnMonitorPage(monitorId))) {
+        await uptime.navigation.loadDataAndGoToMonitorPage(dateStart, dateEnd, monitorId);
+      }
+      if (await uptime.ml.alreadyHasJob()) {
+        log.info('Jon already exists so lets delete it to start fresh.');
+        await uptime.ml.deleteMLJob();
+      }
+    });
+
+    it('can open ml flyout', async () => {
+      await uptime.ml.openMLFlyout();
+    });
+
+    it('has permission to  create job', async () => {
+      expect(uptime.ml.canCreateJob()).to.eql(true);
+      expect(uptime.ml.hasNoLicenseInfo()).to.eql(false);
+    });
+
+    it('can create job successfully', async () => {
+      await uptime.ml.createMLJob();
+      // await uptime.navigation.refreshApp();
+    });
+
+    it('can open ML Manage Menu', async () => {
+      await uptime.ml.openMLManageMenu();
+    });
+
+    it('can delete job successfully', async () => {
+      await uptime.ml.deleteMLJob();
+    });
+  });
+};
diff --git a/x-pack/test/functional/apps/uptime/monitor.ts b/x-pack/test/functional/apps/uptime/monitor.ts
index e15750eb6157b..90ad1836c69d3 100644
--- a/x-pack/test/functional/apps/uptime/monitor.ts
+++ b/x-pack/test/functional/apps/uptime/monitor.ts
@@ -17,19 +17,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     const dateStart = 'Sep 10, 2019 @ 12:40:08.078';
     const dateEnd = 'Sep 11, 2019 @ 19:40:08.078';
     const monitorId = '0000-intermittent';
-    const monitorName = '0000-intermittent';
 
     before(async () => {
       await esArchiver.loadIfNeeded(archive);
       await uptimeService.navigation.goToUptime();
     });
 
-    after(async () => {
-      await esArchiver.unload(archive);
-    });
-
     it('loads and displays uptime data based on date range', async () => {
-      await uptime.loadDataAndGoToMonitorPage(dateStart, dateEnd, monitorId, monitorName);
+      await uptime.loadDataAndGoToMonitorPage(dateStart, dateEnd, monitorId);
     });
   });
 };
diff --git a/x-pack/test/functional/apps/uptime/overview.ts b/x-pack/test/functional/apps/uptime/overview.ts
index 8195e6bbb6035..d0dfca64634f6 100644
--- a/x-pack/test/functional/apps/uptime/overview.ts
+++ b/x-pack/test/functional/apps/uptime/overview.ts
@@ -14,6 +14,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   describe('overview page', function() {
     const DEFAULT_DATE_START = 'Sep 10, 2019 @ 12:40:08.078';
     const DEFAULT_DATE_END = 'Sep 11, 2019 @ 19:40:08.078';
+
+    beforeEach(async () => {
+      await uptime.goToRoot();
+      await uptime.setDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
+      await uptime.resetFilters();
+    });
+
     it('loads and displays uptime data based on date range', async () => {
       await uptime.goToUptimeOverviewAndLoadData(
         DEFAULT_DATE_START,
@@ -22,13 +29,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       );
     });
 
-    it('runs filter query without issues', async () => {
-      await uptime.inputFilterQuery('monitor.status:up and monitor.id:"0000-intermittent"');
-      await uptime.pageHasExpectedIds(['0000-intermittent']);
-    });
-
     it('applies filters for multiple fields', async () => {
-      await uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
       await uptime.selectFilterItems({
         location: ['mpls'],
         port: ['5678'],
@@ -49,7 +50,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     });
 
     it('pagination is cleared when filter criteria changes', async () => {
-      await uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
       await uptime.changePage('next');
       await uptime.pageHasExpectedIds([
         '0010-down',
@@ -83,7 +83,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     });
 
     it('clears pagination parameters when size changes', async () => {
-      await uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
       await uptime.changePage('next');
       await uptime.pageUrlContains('pagination');
       await uptime.setMonitorListPageSize(50);
@@ -92,7 +91,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     });
 
     it('pagination size updates to reflect current selection', async () => {
-      await uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
       await uptime.pageHasExpectedIds([
         '0000-intermittent',
         '0001-up',
@@ -162,7 +160,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
     describe('snapshot counts', () => {
       it('updates the snapshot count when status filter is set to down', async () => {
-        await uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
         await uptime.setStatusFilter('down');
 
         await retry.tryForTime(12000, async () => {
@@ -172,13 +169,18 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
 
       it('updates the snapshot count when status filter is set to up', async () => {
-        await uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
         await uptime.setStatusFilter('up');
         await retry.tryForTime(12000, async () => {
           const counts = await uptime.getSnapshotCount();
           expect(counts).to.eql({ up: '93', down: '0' });
         });
       });
+
+      it('runs filter query without issues', async () => {
+        await uptime.inputFilterQuery('monitor.status:up and monitor.id:"0000-intermittent"');
+        await uptime.pageHasExpectedIds(['0000-intermittent']);
+        await uptime.resetFilters();
+      });
     });
   });
 };
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index 39c3c46adddbb..7157bbfb3811b 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -14,37 +14,33 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
 
   return new (class UptimePage {
     public async goToRoot() {
-      await pageObjects.common.navigateToApp('uptime');
+      await navigation.goToUptime();
     }
 
-    public async goToUptimePageAndSetDateRange(
-      datePickerStartValue: string,
-      datePickerEndValue: string
-    ) {
-      await pageObjects.common.navigateToApp('uptime');
-      await pageObjects.timePicker.setAbsoluteRange(datePickerStartValue, datePickerEndValue);
+    public async setDateRange(start: string, end: string) {
+      const { start: prevStart, end: prevEnd } = await pageObjects.timePicker.getTimeConfig();
+      if (start !== prevStart || prevEnd !== end) {
+        await pageObjects.timePicker.setAbsoluteRange(start, end);
+      } else {
+        await navigation.refreshApp();
+      }
     }
 
     public async goToUptimeOverviewAndLoadData(
-      datePickerStartValue: string,
-      datePickerEndValue: string,
+      dateStart: string,
+      dateEnd: string,
       monitorIdToCheck?: string
     ) {
-      await pageObjects.common.navigateToApp('uptime');
-      await pageObjects.timePicker.setAbsoluteRange(datePickerStartValue, datePickerEndValue);
+      await navigation.goToUptime();
+      await this.setDateRange(dateStart, dateEnd);
       if (monitorIdToCheck) {
         await commonService.monitorIdExists(monitorIdToCheck);
       }
     }
 
-    public async loadDataAndGoToMonitorPage(
-      datePickerStartValue: string,
-      datePickerEndValue: string,
-      monitorId: string,
-      monitorName?: string
-    ) {
-      await pageObjects.timePicker.setAbsoluteRange(datePickerStartValue, datePickerEndValue);
-      await navigation.goToMonitor(monitorId, monitorName);
+    public async loadDataAndGoToMonitorPage(dateStart: string, dateEnd: string, monitorId: string) {
+      await this.setDateRange(dateStart, dateEnd);
+      await navigation.goToMonitor(monitorId);
     }
 
     public async inputFilterQuery(filterQuery: string) {
@@ -140,5 +136,10 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
       await commonService.openPageSizeSelectPopover();
       return commonService.clickPageSizeSelectPopoverItem(size);
     }
+
+    public async resetFilters() {
+      await this.inputFilterQuery('');
+      await commonService.resetStatusFilter();
+    }
   })();
 }
diff --git a/x-pack/test/functional/services/uptime/common.ts b/x-pack/test/functional/services/uptime/common.ts
index ed465eee343f9..b5be1e29a0e8c 100644
--- a/x-pack/test/functional/services/uptime/common.ts
+++ b/x-pack/test/functional/services/uptime/common.ts
@@ -10,6 +10,7 @@ export function UptimeCommonProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
   const retry = getService('retry');
+  const find = getService('find');
 
   return {
     async assertExists(key: string) {
@@ -52,6 +53,20 @@ export function UptimeCommonProvider({ getService }: FtrProviderContext) {
     async setStatusFilterDown() {
       await testSubjects.click('xpack.uptime.filterBar.filterStatusDown');
     },
+    async resetStatusFilter() {
+      const upFilter = await find.byCssSelector(
+        '[data-test-subj="xpack.uptime.filterBar.filterStatusUp"]'
+      );
+      if (await upFilter.elementHasClass('euiFilterButton-hasActiveFilters')) {
+        this.setStatusFilterUp();
+      }
+      const downFilter = await find.byCssSelector(
+        '[data-test-subj="xpack.uptime.filterBar.filterStatusDown"]'
+      );
+      if (await downFilter.elementHasClass('euiFilterButton-hasActiveFilters')) {
+        this.setStatusFilterDown();
+      }
+    },
     async selectFilterItem(filterType: string, option: string) {
       const popoverId = `filter-popover_${filterType}`;
       const optionId = `filter-popover-item_${option}`;
diff --git a/x-pack/test/functional/services/uptime/ml_anomaly.ts b/x-pack/test/functional/services/uptime/ml_anomaly.ts
new file mode 100644
index 0000000000000..e15f47ddd9709
--- /dev/null
+++ b/x-pack/test/functional/services/uptime/ml_anomaly.ts
@@ -0,0 +1,59 @@
+/*
+ * 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 { FtrProviderContext } from '../../ftr_provider_context';
+
+export function UptimeMLAnomalyProvider({ getService }: FtrProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const log = getService('log');
+
+  return {
+    async openMLFlyout() {
+      return retry.tryForTime(15000, async () => {
+        await testSubjects.click('uptimeEnableAnomalyBtn');
+        await testSubjects.existOrFail('uptimeMLFlyout');
+      });
+    },
+
+    async openMLManageMenu() {
+      return retry.tryForTime(30000, async () => {
+        await testSubjects.click('uptimeManageMLJobBtn');
+        await testSubjects.existOrFail('uptimeManageMLContextMenu');
+      });
+    },
+
+    async alreadyHasJob() {
+      return await testSubjects.exists('uptimeManageMLJobBtn');
+    },
+
+    async createMLJob() {
+      await testSubjects.click('uptimeMLCreateJobBtn');
+      return retry.tryForTime(10000, async () => {
+        await testSubjects.existOrFail('uptimeMLJobSuccessfullyCreated');
+        log.info('Job successfully created');
+      });
+    },
+
+    async deleteMLJob() {
+      await testSubjects.click('uptimeDeleteMLJobBtn');
+      return retry.tryForTime(10000, async () => {
+        await testSubjects.click('uptimeMLJobDeleteConfirmModel > confirmModalConfirmButton');
+        await testSubjects.existOrFail('uptimeMLJobSuccessfullyDeleted');
+        log.info('Job successfully deleted');
+      });
+    },
+
+    async canCreateJob() {
+      const createJobBtn = await testSubjects.find('uptimeMLCreateJobBtn');
+      return !!(await createJobBtn.getAttribute('disabled'));
+    },
+
+    async hasNoLicenseInfo() {
+      return await testSubjects.missingOrFail('uptimeMLLicenseInfo', { timeout: 1000 });
+    },
+  };
+}
diff --git a/x-pack/test/functional/services/uptime/navigation.ts b/x-pack/test/functional/services/uptime/navigation.ts
index 15ee869da1e6a..36a5d7c9702f8 100644
--- a/x-pack/test/functional/services/uptime/navigation.ts
+++ b/x-pack/test/functional/services/uptime/navigation.ts
@@ -9,17 +9,27 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export function UptimeNavigationProvider({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['common', 'header']);
+  const PageObjects = getPageObjects(['common', 'timePicker', 'header']);
 
   const goToUptimeRoot = async () => {
-    await retry.tryForTime(30 * 1000, async () => {
-      await PageObjects.common.navigateToApp('uptime');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await testSubjects.existOrFail('uptimeOverviewPage', { timeout: 2000 });
+    // Check if are already on overview uptime page, we don't need to repeat the step
+    await retry.tryForTime(60 * 1000, async () => {
+      if (await testSubjects.exists('uptimeSettingsToOverviewLink', { timeout: 0 })) {
+        await testSubjects.click('uptimeSettingsToOverviewLink');
+        await testSubjects.existOrFail('uptimeOverviewPage', { timeout: 2000 });
+      } else if (!(await testSubjects.exists('uptimeOverviewPage', { timeout: 0 }))) {
+        await PageObjects.common.navigateToApp('uptime');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await testSubjects.existOrFail('uptimeOverviewPage', { timeout: 2000 });
+      }
     });
   };
 
   return {
+    async refreshApp() {
+      await testSubjects.click('superDatePickerApplyTimeButton');
+    },
+
     async goToUptime() {
       await goToUptimeRoot();
     },
@@ -30,17 +40,29 @@ export function UptimeNavigationProvider({ getService, getPageObjects }: FtrProv
       await testSubjects.existOrFail('uptimeSettingsPage', { timeout: 2000 });
     },
 
-    goToMonitor: async (monitorId: string, monitorName?: string) => {
-      await testSubjects.click(`monitor-page-link-${monitorId}`, 5000);
-      if (
-        monitorName &&
-        (await testSubjects.getVisibleText('monitor-page-title')) !== monitorName
-      ) {
-        throw new Error('Expected monitor name not found');
+    checkIfOnMonitorPage: async (monitorId: string) => {
+      const monitorPage = await testSubjects.exists('uptimeMonitorPage', { timeout: 1000 });
+      if (monitorId && monitorPage) {
+        const thisMonitorPage =
+          (await testSubjects.getVisibleText('monitor-page-title')) === monitorId;
+        return monitorPage && thisMonitorPage;
+      } else {
+        return monitorPage;
+      }
+    },
+
+    goToMonitor: async (monitorId: string) => {
+      if (!(await testSubjects.exists('uptimeMonitorPage', { timeout: 0 }))) {
+        await testSubjects.click(`monitor-page-link-${monitorId}`);
+        await testSubjects.existOrFail('uptimeMonitorPage', {
+          timeout: 30000,
+        });
       }
-      await testSubjects.existOrFail('uptimeMonitorPage', {
-        timeout: 30000,
-      });
+    },
+
+    async loadDataAndGoToMonitorPage(dateStart: string, dateEnd: string, monitorId: string) {
+      await PageObjects.timePicker.setAbsoluteRange(dateStart, dateEnd);
+      await this.goToMonitor(monitorId);
     },
   };
 }
diff --git a/x-pack/test/functional/services/uptime/uptime.ts b/x-pack/test/functional/services/uptime/uptime.ts
index c96bd0e0c4675..601feb6b0646e 100644
--- a/x-pack/test/functional/services/uptime/uptime.ts
+++ b/x-pack/test/functional/services/uptime/uptime.ts
@@ -11,6 +11,7 @@ import { UptimeCommonProvider } from './common';
 import { UptimeMonitorProvider } from './monitor';
 import { UptimeNavigationProvider } from './navigation';
 import { UptimeAlertsProvider } from './alerts';
+import { UptimeMLAnomalyProvider } from './ml_anomaly';
 
 export function UptimeProvider(context: FtrProviderContext) {
   const common = UptimeCommonProvider(context);
@@ -18,6 +19,7 @@ export function UptimeProvider(context: FtrProviderContext) {
   const monitor = UptimeMonitorProvider(context);
   const navigation = UptimeNavigationProvider(context);
   const alerts = UptimeAlertsProvider(context);
+  const ml = UptimeMLAnomalyProvider(context);
 
   return {
     common,
@@ -25,5 +27,6 @@ export function UptimeProvider(context: FtrProviderContext) {
     monitor,
     navigation,
     alerts,
+    ml,
   };
 }

From 36b4ad98883442c329f455d0d6ddd54ebf5e1b86 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Mon, 13 Apr 2020 14:06:20 +0200
Subject: [PATCH 36/36] [APM] Separate count/retainment telemetry requests
 (#63225)

Separate count/retainment telemetry requests to make them less prone to timing out.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../collect_data_telemetry/tasks.ts           | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
index 85f233de2086d..e9801272cd57b 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -61,10 +61,10 @@ export const tasks: TelemetryTask[] = [
         return prevJob.then(async data => {
           const { processorEvent, timeRange } = current;
 
-          const response = await search({
+          const totalHitsResponse = await search({
             index: indicesByProcessorEvent[processorEvent],
             body: {
-              size: 1,
+              size: 0,
               query: {
                 bool: {
                   filter: [
@@ -83,25 +83,43 @@ export const tasks: TelemetryTask[] = [
                   ]
                 }
               },
-              sort: {
-                '@timestamp': 'asc'
-              },
-              _source: ['@timestamp'],
               track_total_hits: true
             }
           });
 
-          const event = response.hits.hits[0]?._source as {
-            '@timestamp': number;
-          };
+          const retainmentResponse =
+            timeRange === 'all'
+              ? await search({
+                  index: indicesByProcessorEvent[processorEvent],
+                  body: {
+                    query: {
+                      bool: {
+                        filter: [
+                          { term: { [PROCESSOR_EVENT]: processorEvent } }
+                        ]
+                      }
+                    },
+                    sort: {
+                      '@timestamp': 'asc'
+                    },
+                    _source: ['@timestamp']
+                  }
+                })
+              : null;
+
+          const event = retainmentResponse?.hits.hits[0]?._source as
+            | {
+                '@timestamp': number;
+              }
+            | undefined;
 
           return merge({}, data, {
             counts: {
               [processorEvent]: {
-                [timeRange]: response.hits.total.value
+                [timeRange]: totalHitsResponse.hits.total.value
               }
             },
-            ...(timeRange === 'all' && event
+            ...(event
               ? {
                   retainment: {
                     [processorEvent]: {