removes angular from fieldFormatts (#17581)

elastic · Apr 12, 2018 · adabbf3 · adabbf3
1 parent d6d4ce8
commit adabbf3
Show file tree

Hide file tree

Showing 30 changed files with 186 additions and 228 deletions.
diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_boolean.js b/src/core_plugins/kibana/public/field_formats/__tests__/_boolean.js
@@ -1,15 +1,9 @@
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 
 describe('Boolean Format', function () {
 
-  let boolean;
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    const fieldFormats = Private(RegistryFieldFormatsProvider);
-    boolean = fieldFormats.getInstance('boolean');
-  }));
+  const boolean = fieldFormats.getInstance('boolean');
 
 
   [

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_color.js b/src/core_plugins/kibana/public/field_formats/__tests__/_color.js
@@ -1,15 +1,8 @@
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 describe('Color Format', function () {
-  let fieldFormats;
-  let ColorFormat;
 
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    fieldFormats = Private(RegistryFieldFormatsProvider);
-    ColorFormat = fieldFormats.getType('color');
-  }));
+  const ColorFormat = fieldFormats.getType('color');
 
   describe('field is a number', () => {
     it('should add colors if the value is in range', function () {

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_conformance.js b/src/core_plugins/kibana/public/field_formats/__tests__/_conformance.js
@@ -1,12 +1,11 @@
 import _ from 'lodash';
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import chrome from 'ui/chrome';
+import { fieldFormats } from 'ui/registry/field_formats';
 import { FieldFormat } from '../../../../../ui/field_formats/field_format';
 
-let fieldFormats;
-let config;
-let getConfig;
+const config = chrome.getUiSettingsClient();
+
 
 const formatIds = [
   'bytes',
@@ -27,12 +26,7 @@ const formatIds = [
 // eslint-disable-next-line @elastic/kibana-custom/no-default-export
 export default describe('conformance', function () {
 
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
-    fieldFormats = Private(RegistryFieldFormatsProvider);
-    config = $injector.get('config');
-    getConfig = (...args) => config.get(...args);
-  }));
+  const getConfig = (...args) => config.get(...args);
 
   formatIds.forEach(function (id) {
     let instance;

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_date.js b/src/core_plugins/kibana/public/field_formats/__tests__/_date.js
@@ -1,9 +1,8 @@
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import moment from 'moment-timezone';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 describe('Date Format', function () {
-  let fieldFormats;
   let settings;
   let convert;
   let $scope;
@@ -14,7 +13,6 @@ describe('Date Format', function () {
     $scope = $rootScope;
     settings = config;
 
-    fieldFormats = Private(RegistryFieldFormatsProvider);
     const getConfig = (...args) => config.get(...args);
     const DateFormat = fieldFormats.getType('date');
     const date = new DateFormat({}, getConfig);

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_duration.js b/src/core_plugins/kibana/public/field_formats/__tests__/_duration.js
@@ -1,16 +1,9 @@
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 
 describe('Duration Format', function () {
-  let fieldFormats;
-  let DurationFormat;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    fieldFormats = Private(RegistryFieldFormatsProvider);
-    DurationFormat = fieldFormats.getType('duration');
-  }));
+
+  const DurationFormat = fieldFormats.getType('duration');
 
   test({ inputFormat: 'seconds', outputFormat: 'humanize' })
   (-60, 'minus a minute')

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_ip.js b/src/core_plugins/kibana/public/field_formats/__tests__/_ip.js
@@ -1,13 +1,8 @@
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 describe('IP Address Format', function () {
-  let ip;
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    const fieldFormats = Private(RegistryFieldFormatsProvider);
-    ip = fieldFormats.getInstance('ip');
-  }));
+
+  const ip = fieldFormats.getInstance('ip');
 
   it('converts a value from a decimal to a string', function () {
     expect(ip.convert(1186489492)).to.be('70.184.100.148');

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_source.js b/src/core_plugins/kibana/public/field_formats/__tests__/_source.js
@@ -2,24 +2,20 @@ import $ from 'jquery';
 import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import FixturesHitsProvider from 'fixtures/hits';
 describe('_source formatting', function () {
 
-  let fieldFormats;
 
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    fieldFormats = Private(RegistryFieldFormatsProvider);
-  }));
 
   describe('Source format', function () {
     let indexPattern;
     let hits;
     let format;
     let convertHtml;
 
+    beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       hits = Private(FixturesHitsProvider);

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_string.js b/src/core_plugins/kibana/public/field_formats/__tests__/_string.js
@@ -1,14 +1,8 @@
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 describe('String Format', function () {
-  let StringFormat;
 
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    const fieldFormats = Private(RegistryFieldFormatsProvider);
-    StringFormat = fieldFormats.getType('string');
-  }));
+  const StringFormat = fieldFormats.getType('string');
 
   it('convert a string to lower case', function () {
     const string = new StringFormat({

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_truncate.js b/src/core_plugins/kibana/public/field_formats/__tests__/_truncate.js
@@ -1,13 +1,7 @@
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 describe('String Truncate Format', function () {
-  let fieldFormats;
 
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    fieldFormats = Private(RegistryFieldFormatsProvider);
-  }));
 
   it('truncate large string', function () {
     const Truncate = fieldFormats.getType('truncate');

diff --git a/src/core_plugins/kibana/public/field_formats/__tests__/_url.js b/src/core_plugins/kibana/public/field_formats/__tests__/_url.js
@@ -1,15 +1,9 @@
 import $ from 'jquery';
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 describe('Url Format', function () {
 
-  let fieldFormats;
 
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    fieldFormats = Private(RegistryFieldFormatsProvider);
-  }));
 
   const unwrap = $el => {
     expect($el.is('span[ng-non-bindable]')).to.be.ok();

diff --git a/src/core_plugins/kibana/public/field_formats/register.js b/src/core_plugins/kibana/public/field_formats/register.js
@@ -1,4 +1,4 @@
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 import { createUrlFormat } from '../../common/field_formats/types/url';
 import { createBytesFormat } from '../../common/field_formats/types/bytes';
 import { createDateFormat } from '../../common/field_formats/types/date';
@@ -13,16 +13,16 @@ import { createColorFormat } from '../../common/field_formats/types/color';
 import { createTruncateFormat } from '../../common/field_formats/types/truncate';
 import { createBoolFormat } from '../../common/field_formats/types/boolean';
 
-RegistryFieldFormatsProvider.register(createUrlFormat);
-RegistryFieldFormatsProvider.register(createBytesFormat);
-RegistryFieldFormatsProvider.register(createDateFormat);
-RegistryFieldFormatsProvider.register(createRelativeDateFormat);
-RegistryFieldFormatsProvider.register(createDurationFormat);
-RegistryFieldFormatsProvider.register(createIpFormat);
-RegistryFieldFormatsProvider.register(createNumberFormat);
-RegistryFieldFormatsProvider.register(createPercentFormat);
-RegistryFieldFormatsProvider.register(createStringFormat);
-RegistryFieldFormatsProvider.register(createSourceFormat);
-RegistryFieldFormatsProvider.register(createColorFormat);
-RegistryFieldFormatsProvider.register(createTruncateFormat);
-RegistryFieldFormatsProvider.register(createBoolFormat);
+fieldFormats.register(createUrlFormat);
+fieldFormats.register(createBytesFormat);
+fieldFormats.register(createDateFormat);
+fieldFormats.register(createRelativeDateFormat);
+fieldFormats.register(createDurationFormat);
+fieldFormats.register(createIpFormat);
+fieldFormats.register(createNumberFormat);
+fieldFormats.register(createPercentFormat);
+fieldFormats.register(createStringFormat);
+fieldFormats.register(createSourceFormat);
+fieldFormats.register(createColorFormat);
+fieldFormats.register(createTruncateFormat);
+fieldFormats.register(createBoolFormat);
diff --git a/src/test_utils/public/stub_index_pattern.js b/src/test_utils/public/stub_index_pattern.js
@@ -4,12 +4,12 @@ import Promise from 'bluebird';
 import { IndexPatternProvider, getRoutes } from 'ui/index_patterns/_index_pattern';
 import { formatHit } from 'ui/index_patterns/_format_hit';
 import { getComputedFields } from 'ui/index_patterns/_get_computed_fields';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 import { IndexPatternsFlattenHitProvider } from 'ui/index_patterns/_flatten_hit';
 import { IndexPatternsFieldListProvider } from 'ui/index_patterns/_field_list';
 
 export default function (Private) {
-  const fieldFormats = Private(RegistryFieldFormatsProvider);
+
   const flattenHit = Private(IndexPatternsFlattenHitProvider);
   const FieldList = Private(IndexPatternsFieldListProvider);
   const IndexPattern = Private(IndexPatternProvider);

diff --git a/src/ui/public/agg_response/geo_json/_tooltip_formatter.js b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
@@ -1,10 +1,10 @@
 import $ from 'jquery';
 import _ from 'lodash';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
+
+export function TileMapTooltipFormatterProvider($compile, $rootScope) {
 
-export function TileMapTooltipFormatterProvider($compile, $rootScope, Private) {
 
-  const fieldFormats = Private(RegistryFieldFormatsProvider);
   const $tooltipScope = $rootScope.$new();
   const $el = $('<div>').html(require('ui/agg_response/geo_json/_tooltip.html'));
   $compile($el)($tooltipScope);

diff --git a/src/ui/public/agg_table/agg_table.js b/src/ui/public/agg_table/agg_table.js
@@ -5,12 +5,12 @@ import 'ui/agg_table/agg_table.less';
 import _ from 'lodash';
 import { uiModules } from 'ui/modules';
 import aggTableTemplate from 'ui/agg_table/agg_table.html';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 
 uiModules
   .get('kibana', ['RecursionHelper'])
   .directive('kbnAggTable', function ($filter, config, Private, RecursionHelper) {
-    const fieldFormats = Private(RegistryFieldFormatsProvider);
+
     const numberFormatter = fieldFormats.getDefaultInstance('number').getConverterFor('text');
 
     return {

diff --git a/src/ui/public/agg_types/__tests__/agg_type.js b/src/ui/public/agg_types/__tests__/agg_type.js
@@ -4,22 +4,20 @@ import ngMock from 'ng_mock';
 import 'ui/private';
 import { AggParams } from 'ui/agg_types/agg_params';
 import { VisProvider } from 'ui/vis';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 import { AggTypesAggTypeProvider } from 'ui/agg_types/agg_type';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 describe('AggType Class', function () {
   let AggType;
   let indexPattern;
-  let fieldFormat;
   let Vis;
 
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
 
     Vis = Private(VisProvider);
-    fieldFormat = Private(RegistryFieldFormatsProvider);
     AggType = Private(AggTypesAggTypeProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
   }));
@@ -89,7 +87,7 @@ describe('AggType Class', function () {
 
           let aggConfig = vis.aggs.byTypeName.date_histogram[0];
 
-          expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('date'));
+          expect(aggType.getFormat(aggConfig)).to.be(fieldFormats.getDefaultInstance('date'));
 
           vis = new Vis(indexPattern, {
             type: 'metric',
@@ -102,7 +100,7 @@ describe('AggType Class', function () {
           });
           aggConfig = vis.aggs.byTypeName.count[0];
 
-          expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('string'));
+          expect(aggType.getFormat(aggConfig)).to.be(fieldFormats.getDefaultInstance('string'));
         });
 
         it('can be overridden via config', function () {

diff --git a/src/ui/public/agg_types/agg_type.js b/src/ui/public/agg_types/agg_type.js
@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import { AggParams } from 'ui/agg_types/agg_params';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
+
+export function AggTypesAggTypeProvider() {
 
-export function AggTypesAggTypeProvider(Private) {
-  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
 
   /**

diff --git a/src/ui/public/agg_types/buckets/date_range.js b/src/ui/public/agg_types/buckets/date_range.js
@@ -3,13 +3,12 @@ import 'ui/directives/validate_date_math';
 import 'ui/directives/documentation_href';
 import { AggTypesBucketsBucketAggTypeProvider } from 'ui/agg_types/buckets/_bucket_agg_type';
 import { AggTypesBucketsCreateFilterDateRangeProvider } from 'ui/agg_types/buckets/create_filter/date_range';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 import dateRangesTemplate from 'ui/agg_types/controls/date_ranges.html';
 
 export function AggTypesBucketsDateRangeProvider(Private) {
   const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
   const createFilter = Private(AggTypesBucketsCreateFilterDateRangeProvider);
-  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
 
   return new BucketAggType({

diff --git a/src/ui/public/agg_types/metrics/cardinality.js b/src/ui/public/agg_types/metrics/cardinality.js
@@ -1,9 +1,9 @@
 import { AggTypesMetricsMetricAggTypeProvider } from 'ui/agg_types/metrics/metric_agg_type';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 
 export function AggTypesMetricsCardinalityProvider(Private) {
   const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  const fieldFormats = Private(RegistryFieldFormatsProvider);
+
 
   return new MetricAggType({
     name: 'cardinality',

diff --git a/src/ui/public/agg_types/metrics/count.js b/src/ui/public/agg_types/metrics/count.js
@@ -1,9 +1,9 @@
 import { AggTypesMetricsMetricAggTypeProvider } from 'ui/agg_types/metrics/metric_agg_type';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 
 export function AggTypesMetricsCountProvider(Private) {
   const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  const fieldFormats = Private(RegistryFieldFormatsProvider);
+
 
   return new MetricAggType({
     name: 'count',

diff --git a/src/ui/public/agg_types/metrics/metric_agg_type.js b/src/ui/public/agg_types/metrics/metric_agg_type.js
@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import { AggTypesAggTypeProvider } from 'ui/agg_types/agg_type';
-import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
+import { fieldFormats } from 'ui/registry/field_formats';
 
 export function AggTypesMetricsMetricAggTypeProvider(Private) {
   const AggType = Private(AggTypesAggTypeProvider);
-  const fieldFormats = Private(RegistryFieldFormatsProvider);
+
 
   _.class(MetricAggType).inherits(AggType);
   function MetricAggType(config) {