Merge remote-tracking branch 'upstream/master' into move-index-patterns-to-new-plugins-2

Author: Liza K

packages/eslint-config-kibana/typescript.js

@@ -116,6 +116,7 @@ module.exports = {
           }],
           '@typescript-eslint/consistent-type-assertions': 'error',
           '@typescript-eslint/no-empty-interface': 'error',
+          '@typescript-eslint/no-extra-non-null-assertion': 'error',
           '@typescript-eslint/no-misused-new': 'error',
           '@typescript-eslint/no-namespace': 'error',
           '@typescript-eslint/triple-slash-reference': ['error', {
@@ -167,6 +168,7 @@ module.exports = {
           'object-shorthand': 'error',
           'one-var': [ 'error', 'never' ],
           'prefer-const': 'error',
+          'prefer-rest-params': 'error',
           'quotes': ['error', 'double', { 'avoidEscape': true }],
           'quote-props': ['error', 'consistent-as-needed'],
           'radix': 'error',

src/legacy/core_plugins/kibana/index.js

@@ -62,11 +62,11 @@ export default function (kibana) {
 
     uiExports: {
       hacks: [
+        'plugins/kibana/discover',
         'plugins/kibana/dev_tools',
       ],
       savedObjectTypes: [
         'plugins/kibana/visualize/saved_visualizations/saved_visualization_register',
-        'plugins/kibana/discover/saved_searches/saved_search_register',
         'plugins/kibana/dashboard/saved_dashboard/saved_dashboard_register',
       ],
       app: {

src/legacy/core_plugins/kibana/public/dashboard/dashboard_config.js

@@ -20,24 +20,26 @@
 import { uiModules } from 'ui/modules';
 import { capabilities } from 'ui/capabilities';
 
-uiModules.get('kibana')
-  .provider('dashboardConfig', () => {
-    let hideWriteControls = !capabilities.get().dashboard.showWriteControls;
+export function dashboardConfigProvider() {
+  let hideWriteControls = !capabilities.get().dashboard.showWriteControls;
+
+  return {
+    /**
+     * Part of the exposed plugin API - do not remove without careful consideration.
+     * @type {boolean}
+     */
+    turnHideWriteControlsOn() {
+      hideWriteControls = true;
+    },
+    $get() {
+      return {
+        getHideWriteControls() {
+          return hideWriteControls;
+        }
+      };
+    }
+  };
+}
 
-    return {
-      /**
-       * Part of the exposed plugin API - do not remove without careful consideration.
-       * @type {boolean}
-       */
-      turnHideWriteControlsOn() {
-        hideWriteControls = true;
-      },
-      $get() {
-        return {
-          getHideWriteControls() {
-            return hideWriteControls;
-          }
-        };
-      }
-    };
-  });
+uiModules.get('kibana')
+  .provider('dashboardConfig', dashboardConfigProvider);

src/legacy/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js

@@ -23,7 +23,7 @@ import _ from 'lodash';
 import sinon from 'sinon';
 import ngMock from 'ng_mock';
 import expect from '@kbn/expect';
-import '../../components/field_chooser/discover_field';
+import { pluginInstance } from 'plugins/kibana/discover/index';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 // Load the kibana app dependencies.
@@ -32,8 +32,9 @@ describe('discoverField', function () {
   let $scope;
   let indexPattern;
   let $elem;
-
-  beforeEach(ngMock.module('kibana'));
+  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeInnerAngular());
+  beforeEach(ngMock.module('app/discover'));
   beforeEach(ngMock.inject(function (Private, $rootScope, $compile) {
     $elem = angular.element(`
       <discover-field

src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js

@@ -19,6 +19,7 @@
 
 
 import _ from 'lodash';
+import { pluginInstance } from 'plugins/kibana/discover/index';
 import ngMock from 'ng_mock';
 import { fieldCalculator } from '../../components/field_chooser/lib/field_calculator';
 import expect from '@kbn/expect';
@@ -29,7 +30,8 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta
 let indexPattern;
 
 describe('fieldCalculator', function () {
-  beforeEach(ngMock.module('kibana'));
+  beforeEach(() => pluginInstance.initializeInnerAngular());
+  beforeEach(ngMock.module('app/discover'));
   beforeEach(ngMock.inject(function (Private) {
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
   }));

src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_chooser.js

@@ -23,7 +23,7 @@ import _ from 'lodash';
 import sinon from 'sinon';
 import expect from '@kbn/expect';
 import $ from 'jquery';
-import '../../components/field_chooser/field_chooser';
+import { pluginInstance } from 'plugins/kibana/discover/index';
 import FixturesHitsProvider from 'fixtures/hits';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { SimpleSavedObject } from '../../../../../../../core/public';
@@ -70,8 +70,10 @@ describe('discover field chooser directives', function () {
       on-remove-field="removeField"
     ></disc-field-chooser>
   `);
+  beforeEach(() => pluginInstance.initializeServices(true));
+  beforeEach(() => pluginInstance.initializeInnerAngular());
 
-  beforeEach(ngMock.module('kibana', ($provide) => {
+  beforeEach(ngMock.module('app/discover', ($provide) => {
     $provide.decorator('config', ($delegate) => {
       // disable shortDots for these tests
       $delegate.get = _.wrap($delegate.get, function (origGet, name) {

src/legacy/core_plugins/kibana/public/discover/_index.scss

@@ -20,7 +20,7 @@
 @import 'embeddable/index';
 
 // Doc Viewer
-@import 'doc_viewer/index';
+@import 'components/doc_viewer/index';
 
 // Context styles
 @import 'angular/context/index';

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

@@ -19,12 +19,13 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { getServices, subscribeWithScope } from './../kibana_services';
+import { getAngularModule, getServices, subscribeWithScope } from './../kibana_services';
 
 import './context_app';
 import contextAppRouteTemplate from './context.html';
-import { getRootBreadcrumbs } from '../breadcrumbs';
-const { FilterBarQueryFilterProvider, uiRoutes, chrome } = getServices();
+import { getRootBreadcrumbs } from '../helpers/breadcrumbs';
+import { FilterStateManager } from '../../../../data/public/filter/filter_manager';
+const { chrome } = getServices();
 
 const k7Breadcrumbs = $route => {
   const { indexPattern } = $route.current.locals;
@@ -44,26 +45,33 @@ const k7Breadcrumbs = $route => {
   ];
 };
 
-uiRoutes
-  // deprecated route, kept for compatibility
-  // should be removed in the future
-  .when('/context/:indexPatternId/:type/:id*', {
-    redirectTo: '/context/:indexPatternId/:id',
-  })
-  .when('/context/:indexPatternId/:id*', {
-    controller: ContextAppRouteController,
-    k7Breadcrumbs,
-    controllerAs: 'contextAppRoute',
-    resolve: {
-      indexPattern: function ($route, indexPatterns) {
-        return indexPatterns.get($route.current.params.indexPatternId);
+getAngularModule().config($routeProvider => {
+  $routeProvider
+    // deprecated route, kept for compatibility
+    // should be removed in the future
+    .when('/discover/context/:indexPatternId/:type/:id*', {
+      redirectTo: '/discover/context/:indexPatternId/:id',
+    })
+    .when('/discover/context/:indexPatternId/:id*', {
+      controller: ContextAppRouteController,
+      k7Breadcrumbs,
+      controllerAs: 'contextAppRoute',
+      resolve: {
+        indexPattern: ($route, Promise) => {
+          const indexPattern = getServices().indexPatterns.get(
+            $route.current.params.indexPatternId
+          );
+          return Promise.props({ ip: indexPattern });
+        },
       },
-    },
-    template: contextAppRouteTemplate,
-  });
+      template: contextAppRouteTemplate,
+    });
+});
 
-function ContextAppRouteController($routeParams, $scope, AppState, config, indexPattern, Private) {
-  const queryFilter = Private(FilterBarQueryFilterProvider);
+function ContextAppRouteController($routeParams, $scope, AppState, config, $route, getAppState, globalState) {
+  const filterManager = getServices().filterManager;
+  const filterStateManager = new FilterStateManager(globalState, getAppState, filterManager);
+  const indexPattern = $route.current.locals.indexPattern.ip;
 
   this.state = new AppState(createDefaultAppState(config, indexPattern));
   this.state.save(true);
@@ -77,19 +85,20 @@ function ContextAppRouteController($routeParams, $scope, AppState, config, index
     () => this.state.save(true)
   );
 
-  const updateSubsciption = subscribeWithScope($scope, queryFilter.getUpdates$(), {
+  const updateSubsciption = subscribeWithScope($scope, filterManager.getUpdates$(), {
     next: () => {
-      this.filters = _.cloneDeep(queryFilter.getFilters());
+      this.filters = _.cloneDeep(filterManager.getFilters());
     },
   });
 
-  $scope.$on('$destroy', function () {
+  $scope.$on('$destroy', () => {
+    filterStateManager.destroy();
     updateSubsciption.unsubscribe();
   });
   this.anchorId = $routeParams.id;
   this.indexPattern = indexPattern;
   this.discoverUrl = chrome.navLinks.get('kibana:discover').url;
-  this.filters = _.cloneDeep(queryFilter.getFilters());
+  this.filters = _.cloneDeep(filterManager.getFilters());
 }
 
 function createDefaultAppState(config, indexPattern) {

src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/anchor.js

@@ -19,13 +19,15 @@
 
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
+import { pluginInstance } from 'plugins/kibana/discover/index';
 
 import { createIndexPatternsStub, createSearchSourceStub } from './_stubs';
 
 import { fetchAnchorProvider } from '../anchor';
 
 describe('context app', function () {
-  beforeEach(ngMock.module('kibana'));
+  beforeEach(() => pluginInstance.initializeInnerAngular());
+  beforeEach(ngMock.module('app/discover'));
 
   describe('function fetchAnchor', function () {
     let fetchAnchor;
@@ -35,11 +37,11 @@ describe('context app', function () {
       $provide.value('indexPatterns', createIndexPatternsStub());
     }));
 
-    beforeEach(ngMock.inject(function createPrivateStubs(Private) {
+    beforeEach(ngMock.inject(function createPrivateStubs() {
       searchSourceStub = createSearchSourceStub([
         { _id: 'hit1' },
       ]);
-      fetchAnchor = Private(fetchAnchorProvider);
+      fetchAnchor = fetchAnchorProvider(createIndexPatternsStub(), searchSourceStub);
     }));
 
     afterEach(() => {

src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/predecessors.js

@@ -21,6 +21,7 @@ import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import moment from 'moment';
 import * as _ from 'lodash';
+import { pluginInstance } from 'plugins/kibana/discover/index';
 
 import { createIndexPatternsStub, createContextSearchSourceStub } from './_stubs';
 
@@ -33,7 +34,8 @@ const ANCHOR_TIMESTAMP_1000 = (new Date(MS_PER_DAY * 1000)).toJSON();
 const ANCHOR_TIMESTAMP_3000 = (new Date(MS_PER_DAY * 3000)).toJSON();
 
 describe('context app', function () {
-  beforeEach(ngMock.module('kibana'));
+  beforeEach(() => pluginInstance.initializeInnerAngular());
+  beforeEach(ngMock.module('app/discover'));
 
   describe('function fetchPredecessors', function () {
     let fetchPredecessors;
@@ -43,7 +45,7 @@ describe('context app', function () {
       $provide.value('indexPatterns', createIndexPatternsStub());
     }));
 
-    beforeEach(ngMock.inject(function createPrivateStubs(Private) {
+    beforeEach(ngMock.inject(function createPrivateStubs() {
       searchSourceStub = createContextSearchSourceStub([], '@timestamp', MS_PER_DAY * 8);
       fetchPredecessors = (indexPatternId, timeField, sortDir, timeValIso, timeValNr, tieBreakerField, tieBreakerValue, size) => {
         const anchor = {
@@ -53,7 +55,7 @@ describe('context app', function () {
           sort: [timeValNr, tieBreakerValue]
         };
 
-        return Private(fetchContextProvider).fetchSurroundingDocs(
+        return fetchContextProvider(createIndexPatternsStub()).fetchSurroundingDocs(
           'predecessors',
           indexPatternId,
           anchor,