From db6d5467e40dfeea7c685d669596a4b62543f601 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Tue, 28 Jan 2020 11:34:03 +0100
Subject: [PATCH 1/9] Migrate field_name directive

---
 .../kibana/public/discover/get_inner_angular.ts             | 4 ++--
 .../core_plugins/kibana/public/discover/kibana_services.ts  | 5 +++--
 .../discover/np_ready/angular}/directives/field_name.js     | 6 +-----
 .../field_name/__snapshots__/field_name.test.tsx.snap       | 0
 .../angular}/directives/field_name/field_name.test.tsx      | 0
 .../np_ready/angular}/directives/field_name/field_name.tsx  | 4 ++--
 .../angular}/directives/field_name/field_type_name.ts       | 0
 7 files changed, 8 insertions(+), 11 deletions(-)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular}/directives/field_name.js (86%)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular}/directives/field_name/__snapshots__/field_name.test.tsx.snap (100%)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular}/directives/field_name/field_name.test.tsx (100%)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular}/directives/field_name/field_name.tsx (91%)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular}/directives/field_name/field_type_name.ts (100%)

diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index fea834686eb4f0..41e5c8de9cb7db 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -42,8 +42,6 @@ import { registerListenEventListener } from 'ui/directives/listen/listen';
 // @ts-ignore
 import { KbnAccessibleClickProvider } from 'ui/accessibility/kbn_accessible_click';
 // @ts-ignore
-import { FieldNameDirectiveProvider } from 'ui/directives/field_name';
-// @ts-ignore
 import { CollapsibleSidebarProvider } from 'ui/collapsible_sidebar/collapsible_sidebar';
 // @ts-ignore
 import { CssTruncateProvide } from 'ui/directives/css_truncate';
@@ -81,6 +79,8 @@ import { createFieldSearchDirective } from './np_ready/components/field_chooser/
 import { createIndexPatternSelectDirective } from './np_ready/components/field_chooser/discover_index_pattern_directive';
 import { createStringFieldProgressBarDirective } from './np_ready/components/field_chooser/string_progress_bar';
 // @ts-ignore
+import { FieldNameDirectiveProvider } from './np_ready/angular/directives/field_name';
+// @ts-ignore
 import { createFieldChooserDirective } from './np_ready/components/field_chooser/field_chooser';
 
 // @ts-ignore
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index 27aa920c98aad2..e72edba8e1ae3d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -49,7 +49,7 @@ export function setServices(newServices: any) {
 
 // import directives that
 import 'ui/directives/css_truncate';
-import 'ui/directives/field_name';
+import './np_ready/angular/directives/field_name';
 
 // EXPORT legacy static dependencies, should be migrated when available in a new version;
 export { angular };
@@ -94,7 +94,8 @@ export {
 export { ElasticSearchHit } from './np_ready/doc_views/doc_views_types';
 export { Adapters } from 'ui/inspector/types';
 export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
-export { FieldName } from 'ui/directives/field_name/field_name';
+// @ts-ignore
+export { FieldName } from './np_ready/angular/directives/field_name';
 export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 // @ts-ignore
 export { buildPointSeriesData } from 'ui/agg_response/point_series/point_series';
diff --git a/src/legacy/ui/public/directives/field_name.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js
similarity index 86%
rename from src/legacy/ui/public/directives/field_name.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js
index aff849fc5602f3..4bc498928be52a 100644
--- a/src/legacy/ui/public/directives/field_name.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js
@@ -17,9 +17,7 @@
  * under the License.
  */
 import { FieldName } from './field_name/field_name';
-import { uiModules } from '../modules';
-import { wrapInI18nContext } from 'ui/i18n';
-const module = uiModules.get('kibana');
+import { wrapInI18nContext } from '../../../kibana_services';
 
 export function FieldNameDirectiveProvider(config, reactDirective) {
   return reactDirective(
@@ -35,5 +33,3 @@ export function FieldNameDirectiveProvider(config, reactDirective) {
     }
   );
 }
-
-module.directive('fieldName', FieldNameDirectiveProvider);
diff --git a/src/legacy/ui/public/directives/field_name/__snapshots__/field_name.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/__snapshots__/field_name.test.tsx.snap
similarity index 100%
rename from src/legacy/ui/public/directives/field_name/__snapshots__/field_name.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/__snapshots__/field_name.test.tsx.snap
diff --git a/src/legacy/ui/public/directives/field_name/field_name.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.test.tsx
similarity index 100%
rename from src/legacy/ui/public/directives/field_name/field_name.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.test.tsx
diff --git a/src/legacy/ui/public/directives/field_name/field_name.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
similarity index 91%
rename from src/legacy/ui/public/directives/field_name/field_name.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
index 0340ce9cb5d1b2..d2ed06594094d8 100644
--- a/src/legacy/ui/public/directives/field_name/field_name.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
@@ -19,8 +19,8 @@
 import React from 'react';
 import classNames from 'classnames';
 // @ts-ignore
-import { shortenDottedString } from '../../../../core_plugins/kibana/common/utils/shorten_dotted_string';
-import { FieldIcon } from '../../../../../../src/plugins/kibana_react/public';
+import { shortenDottedString } from '../../../../../../common/utils/shorten_dotted_string';
+import { FieldIcon } from '../../../../../../../../../plugins/kibana_react/public';
 import { getFieldTypeName } from './field_type_name';
 
 // property field is provided at discover's field chooser
diff --git a/src/legacy/ui/public/directives/field_name/field_type_name.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts
similarity index 100%
rename from src/legacy/ui/public/directives/field_name/field_type_name.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts

From 50a011f5d94764fa7aa7eac304d5fee274521c0f Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Tue, 28 Jan 2020 13:24:27 +0100
Subject: [PATCH 2/9] Migrate collapsible_sidebar directive

---
 .../public/discover/get_inner_angular.ts      |  4 +---
 .../kibana/public/discover/kibana_services.ts |  2 --
 .../np_ready/angular/directives/_index.scss   |  3 ++-
 .../_collapsible_sidebar.scss                 |  0
 .../collapsible_sidebar}/_depth.scss          |  0
 .../collapsible_sidebar/_index.scss           |  2 ++
 .../collapsible_sidebar.ts}                   | 14 +++++++------
 src/legacy/ui/public/_index.scss              |  1 -
 .../ui/public/collapsible_sidebar/_index.scss |  3 ---
 .../ui/public/collapsible_sidebar/index.js    | 20 -------------------
 .../ui/public/styles/_legacy/_index.scss      |  1 -
 11 files changed, 13 insertions(+), 37 deletions(-)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular/directives}/collapsible_sidebar/_collapsible_sidebar.scss (100%)
 rename src/legacy/{ui/public/styles/_legacy => core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar}/_depth.scss (100%)
 create mode 100644 src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/_index.scss
 rename src/legacy/{ui/public/collapsible_sidebar/collapsible_sidebar.js => core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/collapsible_sidebar.ts} (91%)
 delete mode 100644 src/legacy/ui/public/collapsible_sidebar/_index.scss
 delete mode 100644 src/legacy/ui/public/collapsible_sidebar/index.js

diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index 41e5c8de9cb7db..b2c1819e726654 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -42,8 +42,6 @@ import { registerListenEventListener } from 'ui/directives/listen/listen';
 // @ts-ignore
 import { KbnAccessibleClickProvider } from 'ui/accessibility/kbn_accessible_click';
 // @ts-ignore
-import { CollapsibleSidebarProvider } from 'ui/collapsible_sidebar/collapsible_sidebar';
-// @ts-ignore
 import { CssTruncateProvide } from 'ui/directives/css_truncate';
 // @ts-ignore
 import { FixedScrollProvider } from 'ui/fixed_scroll';
@@ -82,9 +80,9 @@ import { createStringFieldProgressBarDirective } from './np_ready/components/fie
 import { FieldNameDirectiveProvider } from './np_ready/angular/directives/field_name';
 // @ts-ignore
 import { createFieldChooserDirective } from './np_ready/components/field_chooser/field_chooser';
-
 // @ts-ignore
 import { createDiscoverFieldDirective } from './np_ready/components/field_chooser/discover_field';
+import { CollapsibleSidebarProvider } from './np_ready/angular/directives/collapsible_sidebar/collapsible_sidebar';
 import { DiscoverStartPlugins } from './plugin';
 
 /**
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index e72edba8e1ae3d..73f456d44d279f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -94,8 +94,6 @@ export {
 export { ElasticSearchHit } from './np_ready/doc_views/doc_views_types';
 export { Adapters } from 'ui/inspector/types';
 export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
-// @ts-ignore
-export { FieldName } from './np_ready/angular/directives/field_name';
 export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 // @ts-ignore
 export { buildPointSeriesData } from 'ui/agg_response/point_series/point_series';
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_index.scss
index c65243d99c8f49..2bfc74ffa02790 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_index.scss
@@ -1,2 +1,3 @@
 @import 'no_results';
-@import 'histogram';
\ No newline at end of file
+@import 'histogram';
+@import './collapsible_sidebar/index';
diff --git a/src/legacy/ui/public/collapsible_sidebar/_collapsible_sidebar.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/_collapsible_sidebar.scss
similarity index 100%
rename from src/legacy/ui/public/collapsible_sidebar/_collapsible_sidebar.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/_collapsible_sidebar.scss
diff --git a/src/legacy/ui/public/styles/_legacy/_depth.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/_depth.scss
similarity index 100%
rename from src/legacy/ui/public/styles/_legacy/_depth.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/_depth.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/_index.scss
new file mode 100644
index 00000000000000..1409920d11aa7f
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/_index.scss
@@ -0,0 +1,2 @@
+@import 'depth';
+@import 'collapsible_sidebar';
diff --git a/src/legacy/ui/public/collapsible_sidebar/collapsible_sidebar.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/collapsible_sidebar.ts
similarity index 91%
rename from src/legacy/ui/public/collapsible_sidebar/collapsible_sidebar.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/collapsible_sidebar.ts
index 98b8f310bb82f0..5b6de7f16d4446 100644
--- a/src/legacy/ui/public/collapsible_sidebar/collapsible_sidebar.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/collapsible_sidebar/collapsible_sidebar.ts
@@ -19,7 +19,11 @@
 
 import _ from 'lodash';
 import $ from 'jquery';
-import { uiModules } from '../modules';
+import { IScope } from 'angular';
+
+interface LazyScope extends IScope {
+  [key: string]: any;
+}
 
 export function CollapsibleSidebarProvider() {
   // simply a list of all of all of angulars .col-md-* classes except 12
@@ -29,7 +33,7 @@ export function CollapsibleSidebarProvider() {
 
   return {
     restrict: 'C',
-    link: function($scope, $elem) {
+    link: ($scope: LazyScope, $elem: any) => {
       let isCollapsed = false;
       const $collapser = $(
         `<button
@@ -48,10 +52,10 @@ export function CollapsibleSidebarProvider() {
       $collapser.append($icon);
       const $siblings = $elem.siblings();
 
-      const siblingsClass = listOfWidthClasses.reduce(function(prev, className) {
+      const siblingsClass = listOfWidthClasses.reduce((prev: string, className: string) => {
         if (prev) return prev;
         return $siblings.hasClass(className) && className;
-      }, false);
+      }, '');
 
       // If there is are only two elements we can assume the other one will take 100% of the width.
       const hasSingleSibling = $siblings.length === 1 && siblingsClass;
@@ -82,5 +86,3 @@ export function CollapsibleSidebarProvider() {
     },
   };
 }
-
-uiModules.get('kibana').directive('collapsibleSidebar', CollapsibleSidebarProvider);
diff --git a/src/legacy/ui/public/_index.scss b/src/legacy/ui/public/_index.scss
index e4e58019dda691..e990ba2a46de53 100644
--- a/src/legacy/ui/public/_index.scss
+++ b/src/legacy/ui/public/_index.scss
@@ -10,7 +10,6 @@
 
 @import './accessibility/index';
 @import './chrome/index';
-@import './collapsible_sidebar/index';
 @import './directives/index';
 @import './error_auto_create_index/index';
 @import './error_url_overflow/index';
diff --git a/src/legacy/ui/public/collapsible_sidebar/_index.scss b/src/legacy/ui/public/collapsible_sidebar/_index.scss
deleted file mode 100644
index 84b759f66720ed..00000000000000
--- a/src/legacy/ui/public/collapsible_sidebar/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import '../styles/_legacy/depth';
-
-@import './collapsible_sidebar';
diff --git a/src/legacy/ui/public/collapsible_sidebar/index.js b/src/legacy/ui/public/collapsible_sidebar/index.js
deleted file mode 100644
index 9f818922f71360..00000000000000
--- a/src/legacy/ui/public/collapsible_sidebar/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.
- */
-
-import './collapsible_sidebar';
diff --git a/src/legacy/ui/public/styles/_legacy/_index.scss b/src/legacy/ui/public/styles/_legacy/_index.scss
index 106730fecd2b8e..a0b1a98b09b7dd 100644
--- a/src/legacy/ui/public/styles/_legacy/_index.scss
+++ b/src/legacy/ui/public/styles/_legacy/_index.scss
@@ -1,6 +1,5 @@
 // //
 // // KIBANA THEME
-@import './depth';
 @import './base';
 @import './mixins';
 

From fc68ebc720d8e5819e87b91d586839a5e74ac929 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Tue, 28 Jan 2020 13:27:44 +0100
Subject: [PATCH 3/9] Fix FieldName import at table_row.tsx

---
 .../public/discover/np_ready/components/table/table_row.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
index d1b05f20a6cb0d..7a78e894163613 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
@@ -18,7 +18,6 @@
  */
 import classNames from 'classnames';
 import React, { ReactNode } from 'react';
-import { FieldName } from '../../../kibana_services';
 import { FieldMapping, DocViewFilterFn } from '../../doc_views/doc_views_types';
 import { DocViewTableRowBtnFilterAdd } from './table_row_btn_filter_add';
 import { DocViewTableRowBtnFilterRemove } from './table_row_btn_filter_remove';
@@ -27,6 +26,7 @@ import { DocViewTableRowBtnCollapse } from './table_row_btn_collapse';
 import { DocViewTableRowBtnFilterExists } from './table_row_btn_filter_exists';
 import { DocViewTableRowIconNoMapping } from './table_row_icon_no_mapping';
 import { DocViewTableRowIconUnderscore } from './table_row_icon_underscore';
+import { FieldName } from '../../angular/directives/field_name/field_name';
 
 export interface Props {
   field: string;

From a5f3f6a864162dabe46a2b940eafa209703f1fb9 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 29 Jan 2020 09:26:24 +0100
Subject: [PATCH 4/9] Migrate css_truncate directive

---
 .../discover/__tests__/directives}/css_truncate.js     |  0
 .../kibana/public/discover/get_inner_angular.ts        |  5 ++---
 .../kibana/public/discover/kibana_services.ts          |  4 ----
 .../np_ready/angular/directives/css_truncate.ts}       | 10 ++--------
 4 files changed, 4 insertions(+), 15 deletions(-)
 rename src/legacy/{ui/public/directives/__tests__ => core_plugins/kibana/public/discover/__tests__/directives}/css_truncate.js (100%)
 rename src/legacy/{ui/public/directives/css_truncate.js => core_plugins/kibana/public/discover/np_ready/angular/directives/css_truncate.ts} (89%)

diff --git a/src/legacy/ui/public/directives/__tests__/css_truncate.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/css_truncate.js
similarity index 100%
rename from src/legacy/ui/public/directives/__tests__/css_truncate.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/directives/css_truncate.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index b2c1819e726654..bcdef7070355d9 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -42,8 +42,6 @@ import { registerListenEventListener } from 'ui/directives/listen/listen';
 // @ts-ignore
 import { KbnAccessibleClickProvider } from 'ui/accessibility/kbn_accessible_click';
 // @ts-ignore
-import { CssTruncateProvide } from 'ui/directives/css_truncate';
-// @ts-ignore
 import { FixedScrollProvider } from 'ui/fixed_scroll';
 // @ts-ignore
 import { DebounceProviderTimeout } from 'ui/directives/debounce/debounce';
@@ -84,6 +82,7 @@ import { createFieldChooserDirective } from './np_ready/components/field_chooser
 import { createDiscoverFieldDirective } from './np_ready/components/field_chooser/discover_field';
 import { CollapsibleSidebarProvider } from './np_ready/angular/directives/collapsible_sidebar/collapsible_sidebar';
 import { DiscoverStartPlugins } from './plugin';
+import { createCssTruncateDirective } from './np_ready/angular/directives/css_truncate';
 
 /**
  * returns the main inner angular module, it contains all the parts of Angular Discover
@@ -179,7 +178,7 @@ export function initializeInnerAngularModule(
     .directive('kbnAccessibleClick', KbnAccessibleClickProvider)
     .directive('fieldName', FieldNameDirectiveProvider)
     .directive('collapsibleSidebar', CollapsibleSidebarProvider)
-    .directive('cssTruncate', CssTruncateProvide)
+    .directive('cssTruncate', createCssTruncateDirective)
     .directive('fixedScroll', FixedScrollProvider)
     .directive('renderComplete', createRenderCompleteDirective)
     .directive('discoverFieldSearch', createFieldSearchDirective)
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index 73f456d44d279f..ac83d6307e657e 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -47,10 +47,6 @@ export function setServices(newServices: any) {
   services = newServices;
 }
 
-// import directives that
-import 'ui/directives/css_truncate';
-import './np_ready/angular/directives/field_name';
-
 // EXPORT legacy static dependencies, should be migrated when available in a new version;
 export { angular };
 export { wrapInI18nContext } from 'ui/i18n';
diff --git a/src/legacy/ui/public/directives/css_truncate.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/css_truncate.ts
similarity index 89%
rename from src/legacy/ui/public/directives/css_truncate.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/css_truncate.ts
index 9b2c8a49f719f8..6aa645ea9368ec 100644
--- a/src/legacy/ui/public/directives/css_truncate.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/css_truncate.ts
@@ -16,15 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { uiModules } from '../modules';
-const module = uiModules.get('kibana');
-
-export function CssTruncateProvide() {
+export function createCssTruncateDirective() {
   return {
     restrict: 'A',
     scope: {},
-    link: function($scope, $elem, attrs) {
+    link: ($scope: any, $elem: any, attrs: any) => {
       $elem.css({
         overflow: 'hidden',
         'white-space': 'nowrap',
@@ -63,5 +59,3 @@ export function CssTruncateProvide() {
     },
   };
 }
-
-module.directive('cssTruncate', CssTruncateProvide);

From 3f86f32ed78af2efbef30f5eca7b36fc6a4f8e53 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 29 Jan 2020 10:52:04 +0100
Subject: [PATCH 5/9] Migrate fixed_scroll & debounce directives

---
 .../__tests__/directives}/fixed_scroll.js         |  7 ++++---
 .../kibana/public/discover/get_inner_angular.ts   |  8 ++++----
 .../directives/debounce/__tests__/debounce.js     |  7 +++++--
 .../angular}/directives/debounce/debounce.js      |  5 -----
 .../angular}/directives/debounce/index.js         |  0
 .../np_ready/angular/directives}/fixed_scroll.js  | 15 ++++++---------
 6 files changed, 19 insertions(+), 23 deletions(-)
 rename src/legacy/{ui/public/directives/__tests__ => core_plugins/kibana/public/discover/__tests__/directives}/fixed_scroll.js (96%)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular}/directives/debounce/__tests__/debounce.js (95%)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular}/directives/debounce/debounce.js (92%)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular}/directives/debounce/index.js (100%)
 rename src/legacy/{ui/public => core_plugins/kibana/public/discover/np_ready/angular/directives}/fixed_scroll.js (96%)

diff --git a/src/legacy/ui/public/directives/__tests__/fixed_scroll.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/fixed_scroll.js
similarity index 96%
rename from src/legacy/ui/public/directives/__tests__/fixed_scroll.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/directives/fixed_scroll.js
index b35836967c3f38..49a0df54079ea5 100644
--- a/src/legacy/ui/public/directives/__tests__/fixed_scroll.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/fixed_scroll.js
@@ -18,8 +18,8 @@
  */
 
 import expect from '@kbn/expect';
+import { pluginInstance } from 'plugins/kibana/discover/legacy';
 import ngMock from 'ng_mock';
-import '../../fixed_scroll';
 import $ from 'jquery';
 import sinon from 'sinon';
 
@@ -29,8 +29,9 @@ describe('FixedScroll directive', function() {
   let compile;
   let flushPendingTasks;
   const trash = [];
-
-  beforeEach(ngMock.module('kibana'));
+  beforeEach(() => pluginInstance.initializeServices());
+  beforeEach(() => pluginInstance.initializeInnerAngular());
+  beforeEach(ngMock.module('app/discover'));
   beforeEach(
     ngMock.inject(function($compile, $rootScope, $timeout) {
       flushPendingTasks = function flushPendingTasks() {
diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index bcdef7070355d9..a7b1dc2c1dfe82 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -42,10 +42,6 @@ import { registerListenEventListener } from 'ui/directives/listen/listen';
 // @ts-ignore
 import { KbnAccessibleClickProvider } from 'ui/accessibility/kbn_accessible_click';
 // @ts-ignore
-import { FixedScrollProvider } from 'ui/fixed_scroll';
-// @ts-ignore
-import { DebounceProviderTimeout } from 'ui/directives/debounce/debounce';
-// @ts-ignore
 import { AppStateProvider } from 'ui/state_management/app_state';
 // @ts-ignore
 import { GlobalStateProvider } from 'ui/state_management/global_state';
@@ -83,6 +79,10 @@ import { createDiscoverFieldDirective } from './np_ready/components/field_choose
 import { CollapsibleSidebarProvider } from './np_ready/angular/directives/collapsible_sidebar/collapsible_sidebar';
 import { DiscoverStartPlugins } from './plugin';
 import { createCssTruncateDirective } from './np_ready/angular/directives/css_truncate';
+// @ts-ignore
+import { FixedScrollProvider } from './np_ready/angular/directives/fixed_scroll';
+// @ts-ignore
+import { DebounceProviderTimeout } from './np_ready/angular/directives/debounce/debounce';
 
 /**
  * returns the main inner angular module, it contains all the parts of Angular Discover
diff --git a/src/legacy/ui/public/directives/debounce/__tests__/debounce.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/debounce/__tests__/debounce.js
similarity index 95%
rename from src/legacy/ui/public/directives/debounce/__tests__/debounce.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/debounce/__tests__/debounce.js
index bfbe809139204f..43fa5ffbf299a2 100644
--- a/src/legacy/ui/public/directives/debounce/__tests__/debounce.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/debounce/__tests__/debounce.js
@@ -20,14 +20,17 @@
 import sinon from 'sinon';
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import { DebounceProvider } from '..';
+import { DebounceProvider } from '../index';
+import { pluginInstance } from 'plugins/kibana/discover/legacy';
 
 let debounce;
 let debounceFromProvider;
 let $timeout;
 
 function init() {
-  ngMock.module('kibana');
+  pluginInstance.initializeServices();
+  pluginInstance.initializeInnerAngular();
+  ngMock.module('app/discover');
 
   ngMock.inject(function($injector, _$timeout_, Private) {
     $timeout = _$timeout_;
diff --git a/src/legacy/ui/public/directives/debounce/debounce.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/debounce/debounce.js
similarity index 92%
rename from src/legacy/ui/public/directives/debounce/debounce.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/debounce/debounce.js
index 7515ff4c007851..54507f673c2d6a 100644
--- a/src/legacy/ui/public/directives/debounce/debounce.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/debounce/debounce.js
@@ -18,12 +18,9 @@
  */
 
 import _ from 'lodash';
-import { uiModules } from '../../modules';
 // Debounce service, angularized version of lodash debounce
 // borrowed heavily from https://github.com/shahata/angular-debounce
 
-const module = uiModules.get('kibana');
-
 export function DebounceProviderTimeout($timeout) {
   return function(func, wait, options) {
     let timeout;
@@ -70,8 +67,6 @@ export function DebounceProviderTimeout($timeout) {
   };
 }
 
-module.service('debounce', ['$timeout', DebounceProviderTimeout]);
-
 export function DebounceProvider(debounce) {
   return debounce;
 }
diff --git a/src/legacy/ui/public/directives/debounce/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/debounce/index.js
similarity index 100%
rename from src/legacy/ui/public/directives/debounce/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/debounce/index.js
diff --git a/src/legacy/ui/public/fixed_scroll.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/fixed_scroll.js
similarity index 96%
rename from src/legacy/ui/public/fixed_scroll.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/fixed_scroll.js
index 228ba3f8aaa99a..bc159c14a16a71 100644
--- a/src/legacy/ui/public/fixed_scroll.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/fixed_scroll.js
@@ -19,11 +19,15 @@
 
 import $ from 'jquery';
 import _ from 'lodash';
-import { uiModules } from './modules';
-import { DebounceProvider } from 'ui/directives/debounce';
+import { DebounceProvider } from './debounce';
 
 const SCROLLER_HEIGHT = 20;
 
+/**
+ * This directive adds a fixed horizontal scrollbar to the bottom of the window that proxies its scroll events
+ * to the target element's real scrollbar. This is useful when the target element's horizontal scrollbar
+ * might be waaaay down the page, like the doc table on Discover.
+ */
 export function FixedScrollProvider(Private) {
   const debounce = Private(DebounceProvider);
 
@@ -145,10 +149,3 @@ export function FixedScrollProvider(Private) {
     },
   };
 }
-
-/**
- * This directive adds a fixed horizontal scrollbar to the bottom of the window that proxies its scroll events
- * to the target element's real scrollbar. This is useful when the target element's horizontal scrollbar
- * might be waaaay down the page, like the doc table on Discover.
- */
-uiModules.get('kibana').directive('fixedScroll', FixedScrollProvider);

From f33ff2d25fcbc62d210b642f8b7dae7ea99012ad Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 29 Jan 2020 10:59:50 +0100
Subject: [PATCH 6/9] Migrate render_complete directive

---
 .../kibana/public/discover/get_inner_angular.ts          | 3 +--
 .../np_ready/angular/directives/render_complete.ts}      | 9 +++------
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename src/legacy/{ui/public/render_complete/directive.js => core_plugins/kibana/public/discover/np_ready/angular/directives/render_complete.ts} (81%)

diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index a7b1dc2c1dfe82..36a6c8eaef40ec 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -46,8 +46,6 @@ import { AppStateProvider } from 'ui/state_management/app_state';
 // @ts-ignore
 import { GlobalStateProvider } from 'ui/state_management/global_state';
 // @ts-ignore
-import { createRenderCompleteDirective } from 'ui/render_complete/directive';
-// @ts-ignore
 import { StateManagementConfigProvider } from 'ui/state_management/config_provider';
 // @ts-ignore
 import { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
@@ -83,6 +81,7 @@ import { createCssTruncateDirective } from './np_ready/angular/directives/css_tr
 import { FixedScrollProvider } from './np_ready/angular/directives/fixed_scroll';
 // @ts-ignore
 import { DebounceProviderTimeout } from './np_ready/angular/directives/debounce/debounce';
+import { createRenderCompleteDirective } from './np_ready/angular/directives/render_complete';
 
 /**
  * returns the main inner angular module, it contains all the parts of Angular Discover
diff --git a/src/legacy/ui/public/render_complete/directive.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/render_complete.ts
similarity index 81%
rename from src/legacy/ui/public/render_complete/directive.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/render_complete.ts
index 961a07f58293a0..7757deb806a18e 100644
--- a/src/legacy/ui/public/render_complete/directive.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/render_complete.ts
@@ -16,18 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { uiModules } from '../modules';
-import { RenderCompleteHelper } from '../../../../plugins/kibana_utils/public';
+import { IScope } from 'angular';
+import { RenderCompleteHelper } from '../../../../../../../../plugins/kibana_utils/public';
 
 export function createRenderCompleteDirective() {
   return {
-    controller($scope, $element) {
+    controller($scope: IScope, $element: JQLite) {
       const el = $element[0];
       const renderCompleteHelper = new RenderCompleteHelper(el);
       $scope.$on('$destroy', renderCompleteHelper.destroy);
     },
   };
 }
-
-uiModules.get('kibana').directive('renderComplete', createRenderCompleteDirective);

From 9d0b2387b0fbc4aa24f8988d2d9e49a2309b6dd8 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 29 Jan 2020 15:36:58 +0100
Subject: [PATCH 7/9] Fix i18n

---
 .../directives/field_name/field_type_name.ts  | 24 +++++++++----------
 .../translations/translations/ja-JP.json      | 24 +++++++++----------
 .../translations/translations/zh-CN.json      | 24 +++++++++----------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts
index c8c886015cea32..0cf428ee48b9d8 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_type_name.ts
@@ -21,52 +21,52 @@ import { i18n } from '@kbn/i18n';
 export function getFieldTypeName(type: string) {
   switch (type) {
     case 'boolean':
-      return i18n.translate('common.ui.directives.fieldNameIcons.booleanAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.booleanAriaLabel', {
         defaultMessage: 'Boolean field',
       });
     case 'conflict':
-      return i18n.translate('common.ui.directives.fieldNameIcons.conflictFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.conflictFieldAriaLabel', {
         defaultMessage: 'Conflicting field',
       });
     case 'date':
-      return i18n.translate('common.ui.directives.fieldNameIcons.dateFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.dateFieldAriaLabel', {
         defaultMessage: 'Date field',
       });
     case 'geo_point':
-      return i18n.translate('common.ui.directives.fieldNameIcons.geoPointFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.geoPointFieldAriaLabel', {
         defaultMessage: 'Geo point field',
       });
     case 'geo_shape':
-      return i18n.translate('common.ui.directives.fieldNameIcons.geoShapeFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.geoShapeFieldAriaLabel', {
         defaultMessage: 'Geo shape field',
       });
     case 'ip':
-      return i18n.translate('common.ui.directives.fieldNameIcons.ipAddressFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.ipAddressFieldAriaLabel', {
         defaultMessage: 'IP address field',
       });
     case 'murmur3':
-      return i18n.translate('common.ui.directives.fieldNameIcons.murmur3FieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.murmur3FieldAriaLabel', {
         defaultMessage: 'Murmur3 field',
       });
     case 'number':
-      return i18n.translate('common.ui.directives.fieldNameIcons.numberFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.numberFieldAriaLabel', {
         defaultMessage: 'Number field',
       });
     case 'source':
       // Note that this type is currently not provided, type for _source is undefined
-      return i18n.translate('common.ui.directives.fieldNameIcons.sourceFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.sourceFieldAriaLabel', {
         defaultMessage: 'Source field',
       });
     case 'string':
-      return i18n.translate('common.ui.directives.fieldNameIcons.stringFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.stringFieldAriaLabel', {
         defaultMessage: 'String field',
       });
     case 'nested':
-      return i18n.translate('common.ui.directives.fieldNameIcons.nestedFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.nestedFieldAriaLabel', {
         defaultMessage: 'Nested field',
       });
     default:
-      return i18n.translate('common.ui.directives.fieldNameIcons.unknownFieldAriaLabel', {
+      return i18n.translate('kbn.discover.fieldNameIcons.unknownFieldAriaLabel', {
         defaultMessage: 'Unknown field',
       });
   }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 408845449adc84..6c7c755973d835 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -268,17 +268,6 @@
     "common.ui.chrome.bigUrlWarningNotificationMessage": "{advancedSettingsLink}で{storeInSessionStorageParam}オプションを有効にするか、オンスクリーンビジュアルを簡素化してください。",
     "common.ui.chrome.bigUrlWarningNotificationMessage.advancedSettingsLinkText": "高度な設定",
     "common.ui.chrome.bigUrlWarningNotificationTitle": "URLが大きく、Kibanaの動作が停止する可能性があります",
-    "common.ui.directives.fieldNameIcons.booleanAriaLabel": "ブールフィールド",
-    "common.ui.directives.fieldNameIcons.conflictFieldAriaLabel": "矛盾フィールド",
-    "common.ui.directives.fieldNameIcons.dateFieldAriaLabel": "日付フィールド",
-    "common.ui.directives.fieldNameIcons.geoPointFieldAriaLabel": "地理ポイント",
-    "common.ui.directives.fieldNameIcons.geoShapeFieldAriaLabel": "地理情報図形",
-    "common.ui.directives.fieldNameIcons.ipAddressFieldAriaLabel": "IP アドレスフィールド",
-    "common.ui.directives.fieldNameIcons.murmur3FieldAriaLabel": "Murmur3 フィールド",
-    "common.ui.directives.fieldNameIcons.numberFieldAriaLabel": "数値フィールド",
-    "common.ui.directives.fieldNameIcons.sourceFieldAriaLabel": "ソースフィールド",
-    "common.ui.directives.fieldNameIcons.stringFieldAriaLabel": "文字列フィールド",
-    "common.ui.directives.fieldNameIcons.unknownFieldAriaLabel": "不明なフィールド",
     "common.ui.directives.paginate.size.allDropDownOptionLabel": "すべて",
     "common.ui.dualRangeControl.mustSetBothErrorMessage": "下と上の値の両方を設定する必要があります",
     "common.ui.dualRangeControl.outsideOfRangeErrorMessage": "値は {min} と {max} の間でなければなりません",
@@ -1231,6 +1220,17 @@
     "kbn.discover.fieldChooser.searchPlaceHolder": "検索フィールド",
     "kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "フィールド設定を非表示",
     "kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "フィールド設定を表示",
+    "kbn.discover.fieldNameIcons.booleanAriaLabel": "ブールフィールド",
+    "kbn.discover.fieldNameIcons.conflictFieldAriaLabel": "矛盾フィールド",
+    "kbn.discover.fieldNameIcons.dateFieldAriaLabel": "日付フィールド",
+    "kbn.discover.fieldNameIcons.geoPointFieldAriaLabel": "地理ポイント",
+    "kbn.discover.fieldNameIcons.geoShapeFieldAriaLabel": "地理情報図形",
+    "kbn.discover.fieldNameIcons.ipAddressFieldAriaLabel": "IP アドレスフィールド",
+    "kbn.discover.fieldNameIcons.murmur3FieldAriaLabel": "Murmur3 フィールド",
+    "kbn.discover.fieldNameIcons.numberFieldAriaLabel": "数値フィールド",
+    "kbn.discover.fieldNameIcons.sourceFieldAriaLabel": "ソースフィールド",
+    "kbn.discover.fieldNameIcons.stringFieldAriaLabel": "文字列フィールド",
+    "kbn.discover.fieldNameIcons.unknownFieldAriaLabel": "不明なフィールド",
     "kbn.discover.histogram.partialData.bucketTooltipText": "選択された時間範囲にはこのバケット全体は含まれていませんが、一部データが含まれている可能性があります。",
     "kbn.discover.histogramOfFoundDocumentsAriaLabel": "発見されたドキュメントのヒストグラム",
     "kbn.discover.hitsPluralTitle": "{hits, plural, one {ヒット} other {ヒット}}",
@@ -13201,4 +13201,4 @@
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。",
     "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 58b6a96793ccbb..9a22281697f9ab 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -268,17 +268,6 @@
     "common.ui.chrome.bigUrlWarningNotificationMessage": "在{advancedSettingsLink}中启用“{storeInSessionStorageParam}”选项或简化屏幕视觉效果。",
     "common.ui.chrome.bigUrlWarningNotificationMessage.advancedSettingsLinkText": "高级设置",
     "common.ui.chrome.bigUrlWarningNotificationTitle": "URL 过长，Kibana 可能无法工作",
-    "common.ui.directives.fieldNameIcons.booleanAriaLabel": "布尔字段",
-    "common.ui.directives.fieldNameIcons.conflictFieldAriaLabel": "冲突字段",
-    "common.ui.directives.fieldNameIcons.dateFieldAriaLabel": "日期字段",
-    "common.ui.directives.fieldNameIcons.geoPointFieldAriaLabel": "地理位置点字段",
-    "common.ui.directives.fieldNameIcons.geoShapeFieldAriaLabel": "几何形状字段",
-    "common.ui.directives.fieldNameIcons.ipAddressFieldAriaLabel": "IP 地址字段",
-    "common.ui.directives.fieldNameIcons.murmur3FieldAriaLabel": "Murmur3 字段",
-    "common.ui.directives.fieldNameIcons.numberFieldAriaLabel": "数字字段",
-    "common.ui.directives.fieldNameIcons.sourceFieldAriaLabel": "源字段",
-    "common.ui.directives.fieldNameIcons.stringFieldAriaLabel": "字符串字段",
-    "common.ui.directives.fieldNameIcons.unknownFieldAriaLabel": "未知字段",
     "common.ui.directives.paginate.size.allDropDownOptionLabel": "全部",
     "common.ui.dualRangeControl.mustSetBothErrorMessage": "下限值和上限值都须设置",
     "common.ui.dualRangeControl.outsideOfRangeErrorMessage": "值必须是在 {min} 到 {max} 的范围内",
@@ -1231,6 +1220,17 @@
     "kbn.discover.fieldChooser.searchPlaceHolder": "搜索字段",
     "kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "隐藏字段设置",
     "kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "显示字段设置",
+    "kbn.discover.fieldNameIcons.booleanAriaLabel": "布尔字段",
+    "kbn.discover.fieldNameIcons.conflictFieldAriaLabel": "冲突字段",
+    "kbn.discover.fieldNameIcons.dateFieldAriaLabel": "日期字段",
+    "kbn.discover.fieldNameIcons.geoPointFieldAriaLabel": "地理位置点字段",
+    "kbn.discover.fieldNameIcons.geoShapeFieldAriaLabel": "几何形状字段",
+    "kbn.discover.fieldNameIcons.ipAddressFieldAriaLabel": "IP 地址字段",
+    "kbn.discover.fieldNameIcons.murmur3FieldAriaLabel": "Murmur3 字段",
+    "kbn.discover.fieldNameIcons.numberFieldAriaLabel": "数字字段",
+    "kbn.discover.fieldNameIcons.sourceFieldAriaLabel": "源字段",
+    "kbn.discover.fieldNameIcons.stringFieldAriaLabel": "字符串字段",
+    "kbn.discover.fieldNameIcons.unknownFieldAriaLabel": "未知字段",
     "kbn.discover.histogram.partialData.bucketTooltipText": "选定的时间范围不包括此整个存储桶，其可能包含部分数据。",
     "kbn.discover.histogramOfFoundDocumentsAriaLabel": "已找到文档的直方图",
     "kbn.discover.hitsPluralTitle": "{hits, plural, one {次命中} other {次命中}}",
@@ -13200,4 +13200,4 @@
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。",
     "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
   }
-}
\ No newline at end of file
+}

From ef7fd1f58d356c086475a7eb82a2a085d3c7759f Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Thu, 30 Jan 2020 07:59:57 +0100
Subject: [PATCH 8/9] Fix css_truncate test

---
 .../public/discover/__tests__/directives/css_truncate.js    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/css_truncate.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/css_truncate.js
index bf102f5a29fdb9..8dea9c61475dbe 100644
--- a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/css_truncate.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/css_truncate.js
@@ -20,7 +20,7 @@
 import angular from 'angular';
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import 'plugins/kibana/discover/legacy';
+import { pluginInstance } from 'plugins/kibana/discover/legacy';
 
 let $parentScope;
 
@@ -30,7 +30,9 @@ let $elem;
 
 const init = function(expandable) {
   // Load the application
-  ngMock.module('kibana');
+  pluginInstance.initializeServices();
+  pluginInstance.initializeInnerAngular();
+  ngMock.module('app/discover');
 
   // Create the scope
   ngMock.inject(function($rootScope, $compile) {

From 8285b2acd12367f291ab7ab7a8bea0a7ca1eb670 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Fri, 31 Jan 2020 14:42:34 +0100
Subject: [PATCH 9/9] Use shortenDottedString in the TypesScript version

---
 .../np_ready/angular/directives/field_name/field_name.tsx      | 3 +--
 .../angular/doc_table/components/table_header/helpers.tsx      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
index d2ed06594094d8..95720bee38df8d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
@@ -18,9 +18,8 @@
  */
 import React from 'react';
 import classNames from 'classnames';
-// @ts-ignore
-import { shortenDottedString } from '../../../../../../common/utils/shorten_dotted_string';
 import { FieldIcon } from '../../../../../../../../../plugins/kibana_react/public';
+import { shortenDottedString } from '../../../../../../../../../plugins/data/common/utils';
 import { getFieldTypeName } from './field_type_name';
 
 // property field is provided at discover's field chooser
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
index 990ace32e64491..68ba508ffebdd6 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
@@ -17,8 +17,7 @@
  * under the License.
  */
 import { IndexPattern } from '../../../../../kibana_services';
-// @ts-ignore
-import { shortenDottedString } from '../../../../../../../common/utils/shorten_dotted_string';
+import { shortenDottedString } from '../../../../../../../../../../plugins/data/common/utils';
 
 export type SortOrder = [string, string];
 export interface ColumnProps {