Merge remote-tracking branch 'upstream/master' into feature/translations/timelion

Author: LeanidShutau

package.json

@@ -13,6 +13,7 @@
   "private": true,
   "version": "7.0.0-alpha1",
   "branch": "master",
+  "types": "./target/types/type_exports.d.ts",
   "build": {
     "number": 8467,
     "sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9"
@@ -52,7 +53,9 @@
     "uiFramework:build": "cd packages/kbn-ui-framework && yarn docSiteBuild",
     "uiFramework:createComponent": "cd packages/kbn-ui-framework && yarn createComponent",
     "uiFramework:documentComponent": "cd packages/kbn-ui-framework && yarn documentComponent",
-    "kbn:watch": "node scripts/kibana --dev --logging.json=false"
+    "kbn:watch": "node scripts/kibana --dev --logging.json=false",
+    "build:types": "tsc --p tsconfig.types.json",
+    "kbn:bootstrap": "yarn build:types"
   },
   "repository": {
     "type": "git",

packages/kbn-config-schema/tsconfig.json

@@ -4,7 +4,8 @@
     "declaration": true,
     "declarationDir": "./target/types",
     "outDir": "./target/out",
-    "stripInternal": true
+    "stripInternal": true,
+    "declarationMap": true
   },
   "include": [
     "./types/joi.d.ts",

packages/kbn-i18n/GUIDELINE.md

@@ -18,7 +18,7 @@ The following types are supported:
 - ToggleSwitch
 - LinkLabel and etc.
 
-There is one more complex case, when we have to divide a single expression into different labels. 
+There is one more complex case, when we have to divide a single expression into different labels.
 
 For example the message before translation looks like:
 
@@ -221,8 +221,8 @@ For example:
 
   ```js
   <button
-      aria-label="{{'kbn.management.editIndexPattern.removeAriaLabel' | i18n: {defaultMessage: 'Remove index pattern'} }}"
-      tooltip="{{'kbn.management.editIndexPattern.removeTooltip' | i18n: {defaultMessage: 'Remove index pattern'} }}"
+      aria-label="{{ ::'kbn.management.editIndexPattern.removeAriaLabel' | i18n: {defaultMessage: 'Remove index pattern'} }}"
+      tooltip="{{ ::'kbn.management.editIndexPattern.removeTooltip' | i18n: {defaultMessage: 'Remove index pattern'} }}"
       >
   </button>
   ```
@@ -333,4 +333,3 @@ it('should render normally', async () => {
 });
 // ...
 ```
-

packages/kbn-i18n/README.md

@@ -188,7 +188,7 @@ import { i18n } from '@kbn/i18n';
 i18n.init(messages);
 ```
 
-One common use-case is that of internationalizing a string constant. Here's an 
+One common use-case is that of internationalizing a string constant. Here's an
 example of how we'd do that:
 
 ```js
@@ -399,7 +399,7 @@ In order to translate attributes in Angular we should use `i18nFilter`:
 ```html
 <input
   type="text"
-  placeholder="{{'KIBANA-MANAGEMENT-OBJECTS-SEARCH_PLACEHOLDER' | i18n: {
+  placeholder="{{ ::'KIBANA-MANAGEMENT-OBJECTS-SEARCH_PLACEHOLDER' | i18n: {
     defaultMessage: 'Search'
   } }}"
 >

packages/kbn-i18n/src/angular/__snapshots__/directive.test.ts.snap

@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`i18nDirective inserts correct translation html content with values 1`] = `"default-message word"`;
+
+exports[`i18nDirective inserts correct translation html content with values 2`] = `"default-message anotherWord"`;

packages/kbn-i18n/src/angular/directive.test.ts

@@ -30,14 +30,15 @@ angular
 
 describe('i18nDirective', () => {
   let compile: angular.ICompileService;
-  let scope: angular.IRootScopeService;
+  let scope: angular.IRootScopeService & { word?: string };
 
   beforeEach(angular.mock.module('app'));
   beforeEach(
     angular.mock.inject(
       ($compile: angular.ICompileService, $rootScope: angular.IRootScopeService) => {
         compile = $compile;
         scope = $rootScope.$new();
+        scope.word = 'word';
       }
     )
   );
@@ -62,19 +63,23 @@ describe('i18nDirective', () => {
   test('inserts correct translation html content with values', () => {
     const id = 'id';
     const defaultMessage = 'default-message {word}';
-    const compiledContent = 'default-message word';
 
     const element = angular.element(
       `<div
         i18n-id="${id}"
         i18n-default-message="${defaultMessage}"
-        i18n-values="{ word: 'word' }"
+        i18n-values="{ word }"
       />`
     );
 
     compile(element)(scope);
     scope.$digest();
 
-    expect(element.html()).toEqual(compiledContent);
+    expect(element.html()).toMatchSnapshot();
+
+    scope.word = 'anotherWord';
+    scope.$digest();
+
+    expect(element.html()).toMatchSnapshot();
   });
 });

packages/kbn-i18n/src/angular/directive.ts

@@ -21,26 +21,37 @@ import { IDirective, IRootElementService, IScope } from 'angular';
 
 import { I18nServiceType } from './provider';
 
-export function i18nDirective(i18n: I18nServiceType): IDirective {
+interface I18nScope extends IScope {
+  values?: Record<string, any>;
+  defaultMessage: string;
+  id: string;
+}
+
+export function i18nDirective(i18n: I18nServiceType): IDirective<I18nScope> {
   return {
     restrict: 'A',
     scope: {
       id: '@i18nId',
       defaultMessage: '@i18nDefaultMessage',
-      values: '=i18nValues',
+      values: '<?i18nValues',
     },
-    link($scope: IScope, $element: IRootElementService) {
-      $scope.$watchGroup(
-        ['id', 'defaultMessage', 'values'],
-        ([id, defaultMessage = '', values = {}]) => {
-          $element.html(
-            i18n(id, {
-              values,
-              defaultMessage,
-            })
-          );
-        }
-      );
+    link($scope, $element) {
+      if ($scope.values) {
+        $scope.$watchCollection('values', () => {
+          setHtmlContent($element, $scope, i18n);
+        });
+      } else {
+        setHtmlContent($element, $scope, i18n);
+      }
     },
   };
 }
+
+function setHtmlContent($element: IRootElementService, $scope: I18nScope, i18n: I18nServiceType) {
+  $element.html(
+    i18n($scope.id, {
+      values: $scope.values,
+      defaultMessage: $scope.defaultMessage,
+    })
+  );
+}

src/core/server/logging/index.ts

@@ -19,5 +19,7 @@
 
 export { Logger } from './logger';
 export { LoggerFactory } from './logger_factory';
+/** @internal */
 export { LoggingConfig } from './logging_config';
+/** @internal */
 export { LoggingService } from './logging_service';

src/core/server/logging/logging_service.ts

@@ -26,6 +26,7 @@ import { LoggerConfigType, LoggingConfig } from './logging_config';
 
 /**
  * Service that is responsible for maintaining loggers and logger appenders.
+ * @internal
  */
 export class LoggingService implements LoggerFactory {
   private config?: LoggingConfig;

src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js

@@ -59,8 +59,8 @@ function getFieldValueCounts(params) {
 
     if (params.hits.length - missing === 0) {
       return {
-        error: 'This field is present in your elasticsearch mapping' +
-          ' but not in any documents in the search results.' +
+        error: 'This field is present in your Elasticsearch mapping' +
+          ' but not in the ' + params.hits.length + ' documents shown in the doc table.' +
           ' You may still be able to visualize or search on it.'
       };
     }