Expose NP FieldFormats service to server side

.eslintrc.js

@@ -244,15 +244,15 @@ module.exports = {
               {
                 target: [
                   '(src|x-pack)/plugins/**/*',
-                  '!(src|x-pack)/plugins/*/server/**/*',
+                  '!(src|x-pack)/plugins/**/server/**/*',
 
                   'src/legacy/core_plugins/**/*',
-                  '!src/legacy/core_plugins/*/server/**/*',
-                  '!src/legacy/core_plugins/*/index.{js,ts,tsx}',
+                  '!src/legacy/core_plugins/**/server/**/*',
+                  '!src/legacy/core_plugins/**/index.{js,ts,tsx}',
 
                   'x-pack/legacy/plugins/**/*',
-                  '!x-pack/legacy/plugins/*/server/**/*',
-                  '!x-pack/legacy/plugins/*/index.{js,ts,tsx}',
+                  '!x-pack/legacy/plugins/**/server/**/*',
+                  '!x-pack/legacy/plugins/**/index.{js,ts,tsx}',
 
                   'examples/**/*',
                   '!examples/**/server/**/*',

src/legacy/core_plugins/kibana/index.js

@@ -26,7 +26,6 @@ import { importApi } from './server/routes/api/import';
 import { exportApi } from './server/routes/api/export';
 import { homeApi } from './server/routes/api/home';
 import { managementApi } from './server/routes/api/management';
-import { registerFieldFormats } from './server/field_formats/register';
 import { registerTutorials } from './server/tutorials/register';
 import * as systemApi from './server/lib/system_api';
 import mappings from './mappings.json';
@@ -334,7 +333,6 @@ export default function(kibana) {
       exportApi(server);
       homeApi(server);
       managementApi(server);
-      registerFieldFormats(server);
       registerTutorials(server);
       registerCspCollector(usageCollection, server);
       server.expose('systemApi', systemApi);

src/legacy/ui/ui_mixin.js

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { fieldFormatsMixin } from './field_formats';
 import { tutorialsMixin } from './tutorials_mixin';
 import { uiAppsMixin } from './ui_apps';
 import { uiBundlesMixin } from './ui_bundles';
@@ -28,7 +27,6 @@ export async function uiMixin(kbnServer) {
   await kbnServer.mixin(uiAppsMixin);
   await kbnServer.mixin(uiBundlesMixin);
   await kbnServer.mixin(uiSettingsMixin);
-  await kbnServer.mixin(fieldFormatsMixin);
   await kbnServer.mixin(tutorialsMixin);
   await kbnServer.mixin(uiRenderMixin);
 }

src/legacy/ui/field_formats/mixin/field_formats_service.test.ts → src/plugins/data/server/field_formats/field_formats.test.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { FieldFormatsService } from './field_formats_service';
+import { FieldFormats } from './field_formats';
 import { NumberFormat } from '../../../../plugins/data/public';
 
 const getConfig = (key: string) => {
@@ -33,22 +33,22 @@ const getConfig = (key: string) => {
 };
 
 describe('FieldFormatsService', () => {
-  let fieldFormatsService: FieldFormatsService;
+  let fieldFormats: FieldFormats;
 
   beforeEach(() => {
     const fieldFormatClasses = [NumberFormat];
 
-    fieldFormatsService = new FieldFormatsService(fieldFormatClasses, getConfig);
+    fieldFormats = new FieldFormats(fieldFormatClasses, getConfig);
   });
 
   test('FieldFormats are accessible via getType method', () => {
-    const Type = fieldFormatsService.getType('number');
+    const Type = fieldFormats.getType('number');
 
     expect(Type.id).toBe('number');
   });
 
   test('getDefaultInstance returns default FieldFormat instance for fieldType', () => {
-    const instance = fieldFormatsService.getDefaultInstance('number');
+    const instance = fieldFormats.getDefaultInstance('number');
 
     expect(instance.type.id).toBe('number');
     expect(instance.convert('0.33333')).toBe('0.333');

src/legacy/ui/field_formats/mixin/field_formats_service.ts → src/plugins/data/server/field_formats/field_formats.ts

@@ -25,13 +25,11 @@ interface FieldFormatConfig {
   params?: Record<string, any>;
 }
 
-export class FieldFormatsService {
-  getConfig: any;
-  _fieldFormats: Dictionary<IFieldFormatType>;
+export class FieldFormats {
+  private readonly _fieldFormats: Dictionary<IFieldFormatType>;
 
-  constructor(fieldFormatClasses: IFieldFormatType[], getConfig: Function) {
+  constructor(fieldFormatClasses: IFieldFormatType[], private getConfig: Function) {
     this._fieldFormats = indexBy(fieldFormatClasses, 'id');
-    this.getConfig = getConfig;
   }
 
   /**
@@ -43,6 +41,7 @@ export class FieldFormatsService {
    */
   getDefaultConfig(fieldType: string): FieldFormatConfig {
     const defaultMap = this.getConfig('format:defaultTypeMap');
+
     return defaultMap[fieldType] || defaultMap._default_;
   }
 

src/plugins/data/server/field_formats/field_formats_service.ts

@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { has } from 'lodash';
+import { FieldFormats } from './field_formats';
+import { IFieldFormatType } from '../../common/field_formats';
+import { IUiSettingsClient } from '../../../../core/server';
+
+import {
+  UrlFormat,
+  StringFormat,
+  NumberFormat,
+  BytesFormat,
+  TruncateFormat,
+  RelativeDateFormat,
+  PercentFormat,
+  IpFormat,
+  DurationFormat,
+  DateNanosFormat,
+  DateFormat,
+  ColorFormat,
+  BoolFormat,
+  SourceFormat,
+  StaticLookupFormat,
+} from '../../common/field_formats';
+
+export class FieldFormatsService {
+  private readonly fieldFormatClasses: IFieldFormatType[] = [
+    UrlFormat,
+    StringFormat,
+    NumberFormat,
+    BytesFormat,
+    TruncateFormat,
+    RelativeDateFormat,
+    PercentFormat,
+    IpFormat,
+    DurationFormat,
+    DateNanosFormat,
+    DateFormat,
+    ColorFormat,
+    BoolFormat,
+    SourceFormat,
+    StaticLookupFormat,
+  ];
+
+  public setup() {
+    return {
+      registerFieldFormat: (customFieldFormat: IFieldFormatType) =>
+        this.fieldFormatClasses.push(customFieldFormat),
+    };
+  }
+
+  public start() {
+    return {
+      fieldFormatServiceFactory: async (uiSettings: IUiSettingsClient) => {
+        const uiConfigs = await uiSettings.getAll();
+        const registeredUiSettings = uiSettings.getRegistered();
+
+        Object.keys(registeredUiSettings).forEach(key => {
+          if (has(uiConfigs, key) && registeredUiSettings[key].type === 'json') {
+            uiConfigs[key] = JSON.parse(uiConfigs[key]);
+          }
+        });
+
+        return new FieldFormats(this.fieldFormatClasses, (key: string) => uiConfigs[key]);
+      },
+    };
+  }
+}
+
+export type FieldFormatsServiceSetup = ReturnType<FieldFormatsService['setup']>;
+export type FieldFormatsServiceStart = ReturnType<FieldFormatsService['start']>;

src/legacy/ui/field_formats/index.ts → src/plugins/data/server/field_formats/index.ts

@@ -17,4 +17,9 @@
  * under the License.
  */
 
-export { fieldFormatsMixin } from './mixin/field_formats_mixin';
+export {
+  FieldFormatsService,
+  FieldFormatsServiceSetup,
+  FieldFormatsServiceStart,
+} from './field_formats_service';
+export { FieldFormats } from './field_formats';

src/plugins/data/server/index.ts

@@ -18,12 +18,14 @@
  */
 
 import { PluginInitializerContext } from '../../../core/server';
-import { DataServerPlugin, DataPluginSetup } from './plugin';
+import { DataServerPlugin, DataPluginSetup, DataPluginStart } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new DataServerPlugin(initializerContext);
 }
 
+export { FieldFormatsService, FieldFormats } from './field_formats';
+
 /**
  * Types to be shared externally
  * @public
@@ -93,4 +95,8 @@ export {
   getKbnTypeNames,
 } from '../common';
 
-export { DataServerPlugin as Plugin, DataPluginSetup as PluginSetup };
+export {
+  DataServerPlugin as Plugin,
+  DataPluginSetup as PluginSetup,
+  DataPluginStart as PluginStart,
+};

src/plugins/data/server/plugin.ts

@@ -25,20 +25,32 @@ import { ScriptsService } from './scripts';
 import { KqlTelemetryService } from './kql_telemetry';
 import { UsageCollectionSetup } from '../../usage_collection/server';
 import { AutocompleteService } from './autocomplete';
+import {
+  FieldFormatsService,
+  FieldFormatsServiceSetup,
+  FieldFormatsServiceStart,
+} from './field_formats';
 
 export interface DataPluginSetup {
   search: ISearchSetup;
+  fieldFormats: FieldFormatsServiceSetup;
+}
+
+export interface DataPluginStart {
+  fieldFormats: FieldFormatsServiceStart;
 }
 
 export interface DataPluginSetupDependencies {
   usageCollection?: UsageCollectionSetup;
 }
-export class DataServerPlugin implements Plugin<DataPluginSetup> {
+
+export class DataServerPlugin implements Plugin<DataPluginSetup, DataPluginStart> {
   private readonly searchService: SearchService;
   private readonly scriptsService: ScriptsService;
   private readonly kqlTelemetryService: KqlTelemetryService;
   private readonly autocompleteService = new AutocompleteService();
   private readonly indexPatterns = new IndexPatternsService();
+  private readonly fieldFormats = new FieldFormatsService();
 
   constructor(initializerContext: PluginInitializerContext) {
     this.searchService = new SearchService(initializerContext);
@@ -53,11 +65,17 @@ export class DataServerPlugin implements Plugin<DataPluginSetup> {
     this.kqlTelemetryService.setup(core, { usageCollection });
 
     return {
+      fieldFormats: this.fieldFormats.setup(),
       search: this.searchService.setup(core),
     };
   }
 
-  public start(core: CoreStart) {}
+  public start(core: CoreStart) {
+    return {
+      fieldFormats: this.fieldFormats.start(),
+    };
+  }
+
   public stop() {}
 }