Merge branch 'master' into np/tsvb

.eslintrc.js

@@ -109,7 +109,7 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/legacy/plugins/lens/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/lens/**/*.{js,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
         'react-hooks/rules-of-hooks': 'off',
@@ -728,7 +728,7 @@ module.exports = {
      * Lens overrides
      */
     {
-      files: ['x-pack/legacy/plugins/lens/**/*.{ts,tsx}', 'x-pack/plugins/lens/**/*.{ts,tsx}'],
+      files: ['x-pack/plugins/lens/**/*.{ts,tsx}'],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
       },

.github/CODEOWNERS

@@ -3,7 +3,7 @@
 # For more info, see https://help.github.com/articles/about-codeowners/
 
 # App
-/x-pack/legacy/plugins/lens/ @elastic/kibana-app
+/x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/legacy/plugins/graph/ @elastic/kibana-app
 /src/legacy/server/url_shortening/ @elastic/kibana-app
 /src/legacy/server/sample_data/ @elastic/kibana-app

.sass-lint.yml

@@ -8,9 +8,9 @@ files:
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
     - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
+    - 'x-pack/plugins/lens/**/*.s+(a|c)ss'
   ignore:
     - 'x-pack/legacy/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
-    - 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
 rules:
   quotes:

package.json

@@ -43,6 +43,7 @@
     "test:karma": "grunt test:karma",
     "test:karma:debug": "grunt test:karmaDebug",
     "test:jest": "node scripts/jest",
+    "test:jest_integration": "node scripts/jest_integration",
     "test:mocha": "node scripts/mocha",
     "test:mocha:coverage": "grunt test:mochaCoverage",
     "test:ftr": "node scripts/functional_tests",

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html

@@ -140,6 +140,7 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
                         position="'top'"
                       ></icon-tip>
                       <span
+                        data-test-subj="discoverIntervalSelectScaledToDesc"
                         i18n-id="kbn.discover.scaledToDescription"
                         i18n-default-message="Scaled to {bucketIntervalDescription}"
                         i18n-values="{

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js

@@ -675,17 +675,6 @@ function discoverController(
         }
       });
 
-      $scope.$watch('vis.aggs', function() {
-        // no timefield, no vis, nothing to update
-        if (!getTimeField() || !$scope.vis) return;
-
-        const buckets = $scope.vis.data.aggs.byTypeName('buckets');
-
-        if (buckets && buckets.length === 1) {
-          $scope.bucketInterval = buckets[0].buckets.getInterval();
-        }
-      });
-
       $scope.$watchMulti(
         ['rows', 'fetchStatus'],
         (function updateResultState() {
@@ -891,6 +880,9 @@ function discoverController(
         tabifiedData,
         getDimensions($scope.vis.data.aggs.aggs, $scope.timeRange)
       );
+      if ($scope.vis.data.aggs.aggs[1]) {
+        $scope.bucketInterval = $scope.vis.data.aggs.aggs[1].buckets.getInterval();
+      }
     }
 
     $scope.hits = resp.hits.total;

src/legacy/ui/public/new_platform/new_platform.karma_mock.js

@@ -453,6 +453,7 @@ export const npStart = {
           createAggConfigs: (indexPattern, configStates = []) => {
             return new AggConfigs(indexPattern, configStates, {
               typesRegistry: aggTypesRegistry.start(),
+              fieldFormats: getFieldFormatsRegistry(mockCoreStart),
             });
           },
           types: aggTypesRegistry.start(),

src/plugins/data/public/plugin.ts

@@ -155,7 +155,7 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
     const query = this.queryService.start(savedObjects);
     setQueryService(query);
 
-    const search = this.searchService.start(core, indexPatterns);
+    const search = this.searchService.start(core, { fieldFormats, indexPatterns });
     setSearchService(search);
 
     uiActions.attachAction(APPLY_FILTER_TRIGGER, uiActions.getAction(ACTION_GLOBAL_APPLY_FILTER));

src/plugins/data/public/search/aggs/agg_config.test.ts

@@ -26,10 +26,12 @@ import { AggTypesRegistryStart } from './agg_types_registry';
 import { mockDataServices, mockAggTypesRegistry } from './test_helpers';
 import { Field as IndexPatternField, IndexPattern } from '../../index_patterns';
 import { stubIndexPatternWithFields } from '../../../public/stubs';
+import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 describe('AggConfig', () => {
   let indexPattern: IndexPattern;
   let typesRegistry: AggTypesRegistryStart;
+  const fieldFormats = fieldFormatsServiceMock.createStartContract();
 
   beforeEach(() => {
     jest.restoreAllMocks();
@@ -40,7 +42,7 @@ describe('AggConfig', () => {
 
   describe('#toDsl', () => {
     it('calls #write()', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -55,7 +57,7 @@ describe('AggConfig', () => {
     });
 
     it('uses the type name as the agg name', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -70,7 +72,7 @@ describe('AggConfig', () => {
     });
 
     it('uses the params from #write() output as the agg params', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -100,7 +102,7 @@ describe('AggConfig', () => {
           params: {},
         },
       ];
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
 
       const histoConfig = ac.byName('date_histogram')[0];
       const avgConfig = ac.byName('avg')[0];
@@ -210,8 +212,8 @@ describe('AggConfig', () => {
 
     testsIdentical.forEach((configState, index) => {
       it(`identical aggregations (${index})`, () => {
-        const ac1 = new AggConfigs(indexPattern, configState, { typesRegistry });
-        const ac2 = new AggConfigs(indexPattern, configState, { typesRegistry });
+        const ac1 = new AggConfigs(indexPattern, configState, { typesRegistry, fieldFormats });
+        const ac2 = new AggConfigs(indexPattern, configState, { typesRegistry, fieldFormats });
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(true);
       });
     });
@@ -251,8 +253,8 @@ describe('AggConfig', () => {
 
     testsIdenticalDifferentOrder.forEach((test, index) => {
       it(`identical aggregations (${index}) - init json is in different order`, () => {
-        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry });
-        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry });
+        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry, fieldFormats });
+        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry, fieldFormats });
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(true);
       });
     });
@@ -316,16 +318,16 @@ describe('AggConfig', () => {
 
     testsDifferent.forEach((test, index) => {
       it(`different aggregations (${index})`, () => {
-        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry });
-        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry });
+        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry, fieldFormats });
+        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry, fieldFormats });
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(false);
       });
     });
   });
 
   describe('#toJSON', () => {
     it('includes the aggs id, params, type and schema', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -356,8 +358,8 @@ describe('AggConfig', () => {
           params: {},
         },
       ];
-      const ac1 = new AggConfigs(indexPattern, configStates, { typesRegistry });
-      const ac2 = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      const ac1 = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac2 = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
 
       // this relies on the assumption that js-engines consistently loop over properties in insertion order.
       // most likely the case, but strictly speaking not guaranteed by the JS and JSON specifications.
@@ -369,7 +371,7 @@ describe('AggConfig', () => {
     let aggConfig: AggConfig;
 
     beforeEach(() => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
       aggConfig = ac.createAggConfig({ type: 'count' } as CreateAggConfigParams);
     });
 
@@ -398,7 +400,7 @@ describe('AggConfig', () => {
 
   describe('#fieldFormatter - custom getFormat handler', () => {
     it('returns formatter from getFormat handler', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
       const configStates = {
         enabled: true,
         type: 'count',
@@ -439,7 +441,7 @@ describe('AggConfig', () => {
           },
         },
       };
-      const ac = new AggConfigs(indexPattern, [configStates], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [configStates], { typesRegistry, fieldFormats });
       aggConfig = ac.createAggConfig(configStates);
     });
 

src/plugins/data/public/search/aggs/agg_config.ts

@@ -25,7 +25,7 @@ import { IAggConfigs } from './agg_configs';
 import { FetchOptions } from '../fetch';
 import { ISearchSource } from '../search_source';
 import { FieldFormatsContentType, KBN_FIELD_TYPES } from '../../../common';
-import { getFieldFormats } from '../../../public/services';
+import { FieldFormatsStart } from '../../field_formats';
 
 export interface AggConfigOptions {
   type: IAggType;
@@ -35,6 +35,10 @@ export interface AggConfigOptions {
   schema?: string;
 }
 
+export interface AggConfigDependencies {
+  fieldFormats: FieldFormatsStart;
+}
+
 /**
  * @name AggConfig
  *
@@ -93,8 +97,13 @@ export class AggConfig {
   private __type: IAggType;
   private __typeDecorations: any;
   private subAggs: AggConfig[] = [];
+  private readonly fieldFormats: FieldFormatsStart;
 
-  constructor(aggConfigs: IAggConfigs, opts: AggConfigOptions) {
+  constructor(
+    aggConfigs: IAggConfigs,
+    opts: AggConfigOptions,
+    { fieldFormats }: AggConfigDependencies
+  ) {
     this.aggConfigs = aggConfigs;
     this.id = String(opts.id || AggConfig.nextId(aggConfigs.aggs as any));
     this.enabled = typeof opts.enabled === 'boolean' ? opts.enabled : true;
@@ -115,6 +124,8 @@ export class AggConfig {
 
     // @ts-ignore
     this.__type = this.__type;
+
+    this.fieldFormats = fieldFormats;
   }
 
   /**
@@ -341,12 +352,10 @@ export class AggConfig {
   }
 
   fieldOwnFormatter(contentType?: FieldFormatsContentType, defaultFormat?: any) {
-    const fieldFormatsService = getFieldFormats();
-
     const field = this.getField();
     let format = field && field.format;
     if (!format) format = defaultFormat;
-    if (!format) format = fieldFormatsService.getDefaultInstance(KBN_FIELD_TYPES.STRING);
+    if (!format) format = this.fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.STRING);
     return format.getConverterFor(contentType);
   }