Merge branch 'master' into graph_saved_objects

elastic · Mar 20, 2020 · f4c91bb · f4c91bb
2 parents bcce9a7 + 9b07ddc
commit f4c91bb
Show file tree

Hide file tree

Showing 28 changed files with 196 additions and 133 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_chooser.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_chooser.js
@@ -73,22 +73,7 @@ describe('discover field chooser directives', function() {
   beforeEach(() => pluginInstance.initializeServices());
   beforeEach(() => pluginInstance.initializeInnerAngular());
 
-  beforeEach(
-    ngMock.module('app/discover', $provide => {
-      $provide.decorator('config', $delegate => {
-        // disable shortDots for these tests
-        $delegate.get = _.wrap($delegate.get, function(origGet, name) {
-          if (name === 'shortDots:enable') {
-            return false;
-          } else {
-            return origGet.call(this, name);
-          }
-        });
-
-        return $delegate;
-      });
-    })
-  );
+  beforeEach(ngMock.module('app/discover'));
 
   beforeEach(
     ngMock.inject(function(Private) {

diff --git a/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/rows_headers.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/rows_headers.js
@@ -30,7 +30,6 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta
 describe('Doc Table', function() {
   let $parentScope;
   let $scope;
-  let config;
 
   // Stub out a minimal mapping of 4 fields
   let mapping;
@@ -41,8 +40,7 @@ describe('Doc Table', function() {
   beforeEach(() => pluginInstance.initializeInnerAngular());
   beforeEach(ngMock.module('app/discover'));
   beforeEach(
-    ngMock.inject(function(_config_, $rootScope, Private) {
-      config = _config_;
+    ngMock.inject(function($rootScope, Private) {
       $parentScope = $rootScope;
       $parentScope.indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       mapping = $parentScope.indexPattern.fields;
@@ -144,12 +142,6 @@ describe('Doc Table', function() {
         filter: sinon.spy(),
         maxLength: 50,
       });
-
-      // Ignore the metaFields (_id, _type, etc) since we don't have a mapping for them
-      sinon
-        .stub(config, 'get')
-        .withArgs('metaFields')
-        .returns([]);
     });
     afterEach(function() {
       destroy();
@@ -215,11 +207,6 @@ describe('Doc Table', function() {
         maxLength: 50,
       });
 
-      sinon
-        .stub(config, 'get')
-        .withArgs('metaFields')
-        .returns(['_id']);
-
       // Open the row
       $scope.toggleRow();
       $scope.$digest();

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
@@ -23,9 +23,7 @@
 import angular from 'angular';
 import { EuiIcon } from '@elastic/eui';
 import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
-import { CoreStart, LegacyCoreStart, IUiSettingsClient } from 'kibana/public';
-// @ts-ignore
-import { StateManagementConfigProvider } from 'ui/state_management/config_provider';
+import { CoreStart, LegacyCoreStart } from 'kibana/public';
 // @ts-ignore
 import { KbnUrlProvider } from 'ui/url';
 import { DataPublicPluginStart } from '../../../../../plugins/data/public';
@@ -108,7 +106,6 @@ export function initializeInnerAngularModule(
     createLocalI18nModule();
     createLocalPrivateModule();
     createLocalPromiseModule();
-    createLocalConfigModule(core.uiSettings);
     createLocalKbnUrlModule();
     createLocalTopNavModule(navigation);
     createLocalStorageModule();
@@ -143,7 +140,6 @@ export function initializeInnerAngularModule(
       'ngRoute',
       'react',
       'ui.bootstrap',
-      'discoverConfig',
       'discoverI18n',
       'discoverPrivate',
       'discoverPromise',
@@ -176,21 +172,6 @@ function createLocalKbnUrlModule() {
     .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider));
 }
 
-function createLocalConfigModule(uiSettings: IUiSettingsClient) {
-  angular
-    .module('discoverConfig', ['discoverPrivate'])
-    .provider('stateManagementConfig', StateManagementConfigProvider)
-    .provider('config', () => {
-      return {
-        $get: () => ({
-          get: (value: string) => {
-            return uiSettings ? uiSettings.get(value) : undefined;
-          },
-        }),
-      };
-    });
-}
-
 function createLocalPromiseModule() {
   angular.module('discoverPromise', []).service('Promise', PromiseServiceCreator);
 }
@@ -229,7 +210,7 @@ const createLocalStorageService = function(type: string) {
 
 function createElasticSearchModule(data: DataPublicPluginStart) {
   angular
-    .module('discoverEs', ['discoverConfig'])
+    .module('discoverEs', [])
     // Elasticsearch client used for requesting data.  Connects to the /elasticsearch proxy
     .service('es', () => {
       return data.search.__LEGACY.esClient;
@@ -242,12 +223,7 @@ function createPagerFactoryModule() {
 
 function createDocTableModule() {
   angular
-    .module('discoverDocTable', [
-      'discoverKbnUrl',
-      'discoverConfig',
-      'discoverPagerFactory',
-      'react',
-    ])
+    .module('discoverDocTable', ['discoverKbnUrl', 'discoverPagerFactory', 'react'])
     .directive('docTable', createDocTableDirective)
     .directive('kbnTableHeader', createTableHeaderDirective)
     .directive('toolBarPagerText', createToolBarPagerTextDirective)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js
@@ -66,7 +66,7 @@ getAngularModule().config($routeProvider => {
     });
 });
 
-function ContextAppRouteController($routeParams, $scope, config, $route) {
+function ContextAppRouteController($routeParams, $scope, $route) {
   const filterManager = getServices().filterManager;
   const indexPattern = $route.current.locals.indexPattern.ip;
   const {
@@ -77,9 +77,9 @@ function ContextAppRouteController($routeParams, $scope, config, $route) {
     setFilters,
     setAppState,
   } = getState({
-    defaultStepSize: config.get('context:defaultSize'),
+    defaultStepSize: getServices().uiSettings.get('context:defaultSize'),
     timeFieldName: indexPattern.timeFieldName,
-    storeInSessionStorage: config.get('state:storeInSessionStorage'),
+    storeInSessionStorage: getServices().uiSettings.get('state:storeInSessionStorage'),
   });
   this.state = { ...appState.getState() };
   this.anchorId = $routeParams.id;

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.js
@@ -57,13 +57,13 @@ module.directive('contextApp', function ContextApp() {
   };
 });
 
-function ContextAppController($scope, config, Private) {
-  const { filterManager, indexpatterns } = getServices();
+function ContextAppController($scope, Private) {
+  const { filterManager, indexpatterns, uiSettings } = getServices();
   const queryParameterActions = getQueryParameterActions(filterManager, indexpatterns);
   const queryActions = Private(QueryActionsProvider);
   this.state = createInitialState(
-    parseInt(config.get('context:step'), 10),
-    getFirstSortableField(this.indexPattern, config.get('context:tieBreakerFields')),
+    parseInt(uiSettings.get('context:step'), 10),
+    getFirstSortableField(this.indexPattern, uiSettings.get('context:tieBreakerFields')),
     this.discoverUrl
   );
 

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name.js
@@ -17,9 +17,9 @@
  * under the License.
  */
 import { FieldName } from './field_name/field_name';
-import { wrapInI18nContext } from '../../../kibana_services';
+import { getServices, wrapInI18nContext } from '../../../kibana_services';
 
-export function FieldNameDirectiveProvider(config, reactDirective) {
+export function FieldNameDirectiveProvider(reactDirective) {
   return reactDirective(
     wrapInI18nContext(FieldName),
     [
@@ -29,7 +29,7 @@ export function FieldNameDirectiveProvider(config, reactDirective) {
     ],
     { restrict: 'AE' },
     {
-      useShortDots: config.get('shortDots:enable'),
+      useShortDots: getServices().uiSettings.get('shortDots:enable'),
     }
   );
 }
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -64,7 +64,7 @@ const {
   share,
   timefilter,
   toastNotifications,
-  uiSettings,
+  uiSettings: config,
   visualizations,
 } = getServices();
 
@@ -131,7 +131,7 @@ app.config($routeProvider => {
                *
                *  @type {State}
                */
-              const id = getIndexPatternId(index, indexPatternList, uiSettings.get('defaultIndex'));
+              const id = getIndexPatternId(index, indexPatternList, config.get('defaultIndex'));
               return Promise.props({
                 list: indexPatternList,
                 loaded: indexPatterns.get(id),
@@ -184,7 +184,6 @@ function discoverController(
   $timeout,
   $window,
   Promise,
-  config,
   kbnUrl,
   localStorage,
   uiCapabilities

diff --git a/...core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header.ts b/...core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header.ts
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IUiSettingsClient } from 'kibana/public';
 import { TableHeader } from './table_header/table_header';
-import { wrapInI18nContext } from '../../../../kibana_services';
+import { wrapInI18nContext, getServices } from '../../../../kibana_services';
+
+export function createTableHeaderDirective(reactDirective: any) {
+  const { uiSettings: config } = getServices();
 
-export function createTableHeaderDirective(reactDirective: any, config: IUiSettingsClient) {
   return reactDirective(
     wrapInI18nContext(TableHeader),
     [

diff --git a/...cy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts b/...cy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
@@ -19,7 +19,6 @@
 
 import _ from 'lodash';
 import $ from 'jquery';
-import { IUiSettingsClient } from 'kibana/public';
 // @ts-ignore
 import rison from 'rison-node';
 import '../../doc_viewer';
@@ -45,8 +44,7 @@ interface LazyScope extends ng.IScope {
 export function createTableRowDirective(
   $compile: ng.ICompileService,
   $httpParamSerializer: any,
-  kbnUrl: any,
-  config: IUiSettingsClient
+  kbnUrl: any
 ) {
   const cellTemplate = _.template(noWhiteSpace(cellTemplateHtml));
   const truncateByHeightTemplate = _.template(noWhiteSpace(truncateByHeightTemplateHtml));
@@ -140,7 +138,7 @@ export function createTableRowDirective(
         const newHtmls = [openRowHtml];
 
         const mapping = indexPattern.fields.getByName;
-        const hideTimeColumn = config.get('doc_table:hideTimeColumn');
+        const hideTimeColumn = getServices().uiSettings.get('doc_table:hideTimeColumn');
         if (indexPattern.timeFieldName && !hideTimeColumn) {
           newHtmls.push(
             cellTemplate({

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.ts
@@ -17,21 +17,17 @@
  * under the License.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
 import html from './doc_table.html';
 import { dispatchRenderComplete } from '../../../../../../../../plugins/kibana_utils/public';
 // @ts-ignore
 import { getLimitedSearchResultsMessage } from './doc_table_strings';
+import { getServices } from '../../../kibana_services';
 
 interface LazyScope extends ng.IScope {
   [key: string]: any;
 }
 
-export function createDocTableDirective(
-  config: IUiSettingsClient,
-  pagerFactory: any,
-  $filter: any
-) {
+export function createDocTableDirective(pagerFactory: any, $filter: any) {
   return {
     restrict: 'E',
     template: html,
@@ -68,7 +64,7 @@ export function createDocTableDirective(
       };
 
       $scope.limitedResultsWarning = getLimitedSearchResultsMessage(
-        config.get('discover:sampleSize')
+        getServices().uiSettings.get('discover:sampleSize')
       );
 
       $scope.addRows = function() {

diff --git a/...cy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js b/...cy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
@@ -29,8 +29,9 @@ import {
   KBN_FIELD_TYPES,
 } from '../../../../../../../../plugins/data/public';
 import { getMapsAppUrl, isFieldVisualizable, isMapsAppRegistered } from './lib/visualize_url_utils';
+import { getServices } from '../../../kibana_services';
 
-export function createFieldChooserDirective($location, config) {
+export function createFieldChooserDirective($location) {
   return {
     restrict: 'E',
     scope: {
@@ -49,6 +50,7 @@ export function createFieldChooserDirective($location, config) {
       $scope.showFilter = false;
       $scope.toggleShowFilter = () => ($scope.showFilter = !$scope.showFilter);
       $scope.indexPatternList = _.sortBy($scope.indexPatternList, o => o.get('title'));
+      const config = getServices().uiSettings;
 
       const filter = ($scope.filter = {
         props: ['type', 'aggregatable', 'searchable', 'missing', 'name'],