diff --git a/.i18nrc.json b/.i18nrc.json index 68bb343092f25..269b02ecee87a 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -9,6 +9,7 @@ "data": "src/plugins/data", "embeddableApi": "src/plugins/embeddable", "embeddableExamples": "examples/embeddable_examples", + "fieldFormats": "src/plugins/field_formats", "uiActionsExamples": "examples/ui_action_examples", "share": "src/plugins/share", "home": "src/plugins/home", diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index eaaab3386a795..5c47d0f46bbfe 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -115,6 +115,10 @@ for use in their own application. |Expression Shape plugin adds a shape function to the expression plugin and an associated renderer. The renderer will display the given shape with selected decorations. +|{kib-repo}blob/{branch}/src/plugins/field_formats/README.md[fieldFormats] +|Index pattern fields formatters + + |{kib-repo}blob/{branch}/src/plugins/home/README.md[home] |Moves the legacy ui/registry/feature_catalogue module for registering "features" that should be shown in the home page's feature catalogue to a service within a "home" plugin. The feature catalogue refered to here should not be confused with the "feature" plugin for registering features used to derive UI capabilities for feature controls. diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.tojson.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.tojson.md index 6e9f12d98d149..2c93ae6143b44 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.tojson.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.tojson.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Use serialize() instead. 8.0 +> Use serialize() instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md deleted file mode 100644 index 1aa9f460c4fac..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [baseFormattersPublic](./kibana-plugin-plugins-data-public.baseformatterspublic.md) - -## baseFormattersPublic variable - -Signature: - -```typescript -baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat | typeof DateNanosFormat)[] -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.castestokbnfieldtypename.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.castestokbnfieldtypename.md index c6135d9313b23..90aa0b0a8a313 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.castestokbnfieldtypename.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.castestokbnfieldtypename.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/field-types" package directly instead. 8.0 +> Import from the "@kbn/field-types" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md index 3d08df8544d6c..6addd931ce22d 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.md index 4b2cad7b42882..b970a408e5130 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.md @@ -20,7 +20,7 @@ export declare class DataPublicPlugin implements PluginSignature: ```typescript -setup(core: CoreSetup, { bfetch, expressions, uiActions, usageCollection, inspector }: DataSetupDependencies): DataPublicPluginSetup; +setup(core: CoreSetup, { bfetch, expressions, uiActions, usageCollection, inspector, fieldFormats, }: DataSetupDependencies): DataPublicPluginSetup; ``` ## Parameters @@ -15,7 +15,7 @@ setup(core: CoreSetup, { bfetch, e | Parameter | Type | Description | | --- | --- | --- | | core | CoreSetup<DataStartDependencies, DataPublicPluginStart> | | -| { bfetch, expressions, uiActions, usageCollection, inspector } | DataSetupDependencies | | +| { bfetch, expressions, uiActions, usageCollection, inspector, fieldFormats, } | DataSetupDependencies | | Returns: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.start.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.start.md index 4ea7ec8cd4f65..c7611ac761bb9 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.start.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.dataplugin.start.md @@ -7,7 +7,7 @@ Signature: ```typescript -start(core: CoreStart, { uiActions }: DataStartDependencies): DataPublicPluginStart; +start(core: CoreStart, { uiActions, fieldFormats }: DataStartDependencies): DataPublicPluginStart; ``` ## Parameters @@ -15,7 +15,7 @@ start(core: CoreStart, { uiActions }: DataStartDependencies): DataPublicPluginSt | Parameter | Type | Description | | --- | --- | --- | | core | CoreStart | | -| { uiActions } | DataStartDependencies | | +| { uiActions, fieldFormats } | DataStartDependencies | | Returns: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginsetup.fieldformats.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginsetup.fieldformats.md index 993634023c20c..54e64c309351e 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginsetup.fieldformats.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginsetup.fieldformats.md @@ -4,6 +4,11 @@ ## DataPublicPluginSetup.fieldFormats property +> Warning: This API is now obsolete. +> +> Use fieldFormats plugin instead +> + Signature: ```typescript diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.fieldformats.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.fieldformats.md index 344044b38f7de..a60e631835ea4 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.fieldformats.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.fieldformats.md @@ -4,7 +4,10 @@ ## DataPublicPluginStart.fieldFormats property -field formats service [FieldFormatsStart](./kibana-plugin-plugins-data-public.fieldformatsstart.md) +> Warning: This API is now obsolete. +> +> Use fieldFormats plugin instead +> Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.md index c7810b18c55a9..341ec0d7e514c 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.md @@ -18,7 +18,7 @@ export interface DataPublicPluginStart | --- | --- | --- | | [actions](./kibana-plugin-plugins-data-public.datapublicpluginstart.actions.md) | DataPublicPluginStartActions | filter creation utilities [DataPublicPluginStartActions](./kibana-plugin-plugins-data-public.datapublicpluginstartactions.md) | | [autocomplete](./kibana-plugin-plugins-data-public.datapublicpluginstart.autocomplete.md) | AutocompleteStart | autocomplete service [AutocompleteStart](./kibana-plugin-plugins-data-public.autocompletestart.md) | -| [fieldFormats](./kibana-plugin-plugins-data-public.datapublicpluginstart.fieldformats.md) | FieldFormatsStart | field formats service [FieldFormatsStart](./kibana-plugin-plugins-data-public.fieldformatsstart.md) | +| [fieldFormats](./kibana-plugin-plugins-data-public.datapublicpluginstart.fieldformats.md) | FieldFormatsStart | | | [indexPatterns](./kibana-plugin-plugins-data-public.datapublicpluginstart.indexpatterns.md) | IndexPatternsContract | index patterns service [IndexPatternsContract](./kibana-plugin-plugins-data-public.indexpatternscontract.md) | | [nowProvider](./kibana-plugin-plugins-data-public.datapublicpluginstart.nowprovider.md) | NowProviderPublicContract | | | [query](./kibana-plugin-plugins-data-public.datapublicpluginstart.query.md) | QueryStart | query service [QueryStart](./kibana-plugin-plugins-data-public.querystart.md) | diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md index 24d60613d913a..b5d5c5cfee5ad 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import helpers from the "@kbn/es-query" package directly instead. 8.0 +> Import helpers from the "@kbn/es-query" package directly instead. 8.1 > Filter helpers namespace: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md index e569733f15e7f..3b768404aab95 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import helpers from the "@kbn/es-query" package directly instead. 8.0 +> Import helpers from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md index 447e387f90eb5..2a26b009d7447 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import helpers from the "@kbn/es-query" package directly instead. 8.0 +> Import helpers from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md index f877fa26b1b25..48a32cd9abe61 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md index 5c98ba4131ac3..79c92cfe52dd7 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat._constructor_.md deleted file mode 100644 index e38da6600696c..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat._constructor_.md +++ /dev/null @@ -1,21 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [(constructor)](./kibana-plugin-plugins-data-public.fieldformat._constructor_.md) - -## FieldFormat.(constructor) - -Constructs a new instance of the `FieldFormat` class - -Signature: - -```typescript -constructor(_params?: IFieldFormatMetaParams, getConfig?: FieldFormatsGetConfigFn); -``` - -## Parameters - -| Parameter | Type | Description | -| --- | --- | --- | -| \_params | IFieldFormatMetaParams | | -| getConfig | FieldFormatsGetConfigFn | | - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat._params.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat._params.md deleted file mode 100644 index ac3f256a9afc3..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat._params.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [\_params](./kibana-plugin-plugins-data-public.fieldformat._params.md) - -## FieldFormat.\_params property - -Signature: - -```typescript -protected readonly _params: any; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.allowsnumericalaggregations.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.allowsnumericalaggregations.md deleted file mode 100644 index 454a816a60171..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.allowsnumericalaggregations.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [allowsNumericalAggregations](./kibana-plugin-plugins-data-public.fieldformat.allowsnumericalaggregations.md) - -## FieldFormat.allowsNumericalAggregations property - -Signature: - -```typescript -allowsNumericalAggregations?: boolean; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.convert.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.convert.md deleted file mode 100644 index 0535585cb4718..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.convert.md +++ /dev/null @@ -1,26 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [convert](./kibana-plugin-plugins-data-public.fieldformat.convert.md) - -## FieldFormat.convert() method - -Convert a raw value to a formatted string - -Signature: - -```typescript -convert(value: any, contentType?: FieldFormatsContentType, options?: HtmlContextTypeOptions | TextContextTypeOptions): string; -``` - -## Parameters - -| Parameter | Type | Description | -| --- | --- | --- | -| value | any | | -| contentType | FieldFormatsContentType | | -| options | HtmlContextTypeOptions | TextContextTypeOptions | | - -Returns: - -`string` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.convertobject.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.convertobject.md deleted file mode 100644 index 436124ac08387..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.convertobject.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [convertObject](./kibana-plugin-plugins-data-public.fieldformat.convertobject.md) - -## FieldFormat.convertObject property - - {FieldFormatConvert} have to remove the private because of https://github.com/Microsoft/TypeScript/issues/17293 - -Signature: - -```typescript -convertObject: FieldFormatConvert | undefined; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.fieldtype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.fieldtype.md deleted file mode 100644 index 1d109a599d2d9..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.fieldtype.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [fieldType](./kibana-plugin-plugins-data-public.fieldformat.fieldtype.md) - -## FieldFormat.fieldType property - - {string} - Field Format Type - -Signature: - -```typescript -static fieldType: string | string[]; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.from.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.from.md deleted file mode 100644 index ec497de59d236..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.from.md +++ /dev/null @@ -1,22 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [from](./kibana-plugin-plugins-data-public.fieldformat.from.md) - -## FieldFormat.from() method - -Signature: - -```typescript -static from(convertFn: FieldFormatConvertFunction): FieldFormatInstanceType; -``` - -## Parameters - -| Parameter | Type | Description | -| --- | --- | --- | -| convertFn | FieldFormatConvertFunction | | - -Returns: - -`FieldFormatInstanceType` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getconfig.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getconfig.md deleted file mode 100644 index 446e0c237ce13..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getconfig.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [getConfig](./kibana-plugin-plugins-data-public.fieldformat.getconfig.md) - -## FieldFormat.getConfig property - -Signature: - -```typescript -protected getConfig: FieldFormatsGetConfigFn | undefined; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getconverterfor.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getconverterfor.md deleted file mode 100644 index f4eeb5eed06a0..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getconverterfor.md +++ /dev/null @@ -1,24 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [getConverterFor](./kibana-plugin-plugins-data-public.fieldformat.getconverterfor.md) - -## FieldFormat.getConverterFor() method - -Get a convert function that is bound to a specific contentType - -Signature: - -```typescript -getConverterFor(contentType?: FieldFormatsContentType): FieldFormatConvertFunction; -``` - -## Parameters - -| Parameter | Type | Description | -| --- | --- | --- | -| contentType | FieldFormatsContentType | | - -Returns: - -`FieldFormatConvertFunction` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getparamdefaults.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getparamdefaults.md deleted file mode 100644 index 59afdc25df350..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.getparamdefaults.md +++ /dev/null @@ -1,17 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [getParamDefaults](./kibana-plugin-plugins-data-public.fieldformat.getparamdefaults.md) - -## FieldFormat.getParamDefaults() method - -Get parameter defaults {object} - parameter defaults - -Signature: - -```typescript -getParamDefaults(): Record; -``` -Returns: - -`Record` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.hidden.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.hidden.md deleted file mode 100644 index 2032f0fc01112..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.hidden.md +++ /dev/null @@ -1,15 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [hidden](./kibana-plugin-plugins-data-public.fieldformat.hidden.md) - -## FieldFormat.hidden property - -Hidden field formats can only be accessed directly by id, They won't appear in field format editor UI, But they can be accessed and used from code internally. - - {boolean} - Is this a hidden field format - -Signature: - -```typescript -static hidden: boolean; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.htmlconvert.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.htmlconvert.md deleted file mode 100644 index 945ac7ededff6..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.htmlconvert.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [htmlConvert](./kibana-plugin-plugins-data-public.fieldformat.htmlconvert.md) - -## FieldFormat.htmlConvert property - - {htmlConvert} have to remove the protected because of https://github.com/Microsoft/TypeScript/issues/17293 - -Signature: - -```typescript -htmlConvert: HtmlContextTypeConvert | undefined; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.id.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.id.md deleted file mode 100644 index 91c3ff4f2d9a3..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.id.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [id](./kibana-plugin-plugins-data-public.fieldformat.id.md) - -## FieldFormat.id property - - {string} - Field Format Id - -Signature: - -```typescript -static id: string; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.isinstanceoffieldformat.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.isinstanceoffieldformat.md deleted file mode 100644 index c6afa27fe5952..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.isinstanceoffieldformat.md +++ /dev/null @@ -1,22 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [isInstanceOfFieldFormat](./kibana-plugin-plugins-data-public.fieldformat.isinstanceoffieldformat.md) - -## FieldFormat.isInstanceOfFieldFormat() method - -Signature: - -```typescript -static isInstanceOfFieldFormat(fieldFormat: any): fieldFormat is FieldFormat; -``` - -## Parameters - -| Parameter | Type | Description | -| --- | --- | --- | -| fieldFormat | any | | - -Returns: - -`fieldFormat is FieldFormat` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.md deleted file mode 100644 index 640064af4be12..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.md +++ /dev/null @@ -1,48 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) - -## FieldFormat class - -Signature: - -```typescript -export declare abstract class FieldFormat -``` - -## Constructors - -| Constructor | Modifiers | Description | -| --- | --- | --- | -| [(constructor)(\_params, getConfig)](./kibana-plugin-plugins-data-public.fieldformat._constructor_.md) | | Constructs a new instance of the FieldFormat class | - -## Properties - -| Property | Modifiers | Type | Description | -| --- | --- | --- | --- | -| [\_params](./kibana-plugin-plugins-data-public.fieldformat._params.md) | | any | | -| [allowsNumericalAggregations](./kibana-plugin-plugins-data-public.fieldformat.allowsnumericalaggregations.md) | | boolean | | -| [convertObject](./kibana-plugin-plugins-data-public.fieldformat.convertobject.md) | | FieldFormatConvert | undefined | {FieldFormatConvert} have to remove the private because of https://github.com/Microsoft/TypeScript/issues/17293 | -| [fieldType](./kibana-plugin-plugins-data-public.fieldformat.fieldtype.md) | static | string | string[] | {string} - Field Format Type | -| [getConfig](./kibana-plugin-plugins-data-public.fieldformat.getconfig.md) | | FieldFormatsGetConfigFn | undefined | | -| [hidden](./kibana-plugin-plugins-data-public.fieldformat.hidden.md) | static | boolean | Hidden field formats can only be accessed directly by id, They won't appear in field format editor UI, But they can be accessed and used from code internally. {boolean} - Is this a hidden field format | -| [htmlConvert](./kibana-plugin-plugins-data-public.fieldformat.htmlconvert.md) | | HtmlContextTypeConvert | undefined | {htmlConvert} have to remove the protected because of https://github.com/Microsoft/TypeScript/issues/17293 | -| [id](./kibana-plugin-plugins-data-public.fieldformat.id.md) | static | string | {string} - Field Format Id | -| [textConvert](./kibana-plugin-plugins-data-public.fieldformat.textconvert.md) | | TextContextTypeConvert | undefined | {textConvert} have to remove the protected because of https://github.com/Microsoft/TypeScript/issues/17293 | -| [title](./kibana-plugin-plugins-data-public.fieldformat.title.md) | static | string | {string} - Field Format Title | -| [type](./kibana-plugin-plugins-data-public.fieldformat.type.md) | | any | {Function} - ref to child class | - -## Methods - -| Method | Modifiers | Description | -| --- | --- | --- | -| [convert(value, contentType, options)](./kibana-plugin-plugins-data-public.fieldformat.convert.md) | | Convert a raw value to a formatted string | -| [from(convertFn)](./kibana-plugin-plugins-data-public.fieldformat.from.md) | static | | -| [getConverterFor(contentType)](./kibana-plugin-plugins-data-public.fieldformat.getconverterfor.md) | | Get a convert function that is bound to a specific contentType | -| [getParamDefaults()](./kibana-plugin-plugins-data-public.fieldformat.getparamdefaults.md) | | Get parameter defaults {object} - parameter defaults | -| [isInstanceOfFieldFormat(fieldFormat)](./kibana-plugin-plugins-data-public.fieldformat.isinstanceoffieldformat.md) | static | | -| [param(name)](./kibana-plugin-plugins-data-public.fieldformat.param.md) | | Get the value of a param. This value may be a default value. | -| [params()](./kibana-plugin-plugins-data-public.fieldformat.params.md) | | Get all of the params in a single object {object} | -| [setupContentType()](./kibana-plugin-plugins-data-public.fieldformat.setupcontenttype.md) | | | -| [toJSON()](./kibana-plugin-plugins-data-public.fieldformat.tojson.md) | | Serialize this format to a simple POJO, with only the params that are not default {object} | - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.param.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.param.md deleted file mode 100644 index 1e7fd9d161429..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.param.md +++ /dev/null @@ -1,24 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [param](./kibana-plugin-plugins-data-public.fieldformat.param.md) - -## FieldFormat.param() method - -Get the value of a param. This value may be a default value. - -Signature: - -```typescript -param(name: string): any; -``` - -## Parameters - -| Parameter | Type | Description | -| --- | --- | --- | -| name | string | | - -Returns: - -`any` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.params.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.params.md deleted file mode 100644 index 5825af4925d06..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.params.md +++ /dev/null @@ -1,17 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [params](./kibana-plugin-plugins-data-public.fieldformat.params.md) - -## FieldFormat.params() method - -Get all of the params in a single object {object} - -Signature: - -```typescript -params(): Record; -``` -Returns: - -`Record` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.setupcontenttype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.setupcontenttype.md deleted file mode 100644 index 41f5f2446f22a..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.setupcontenttype.md +++ /dev/null @@ -1,15 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [setupContentType](./kibana-plugin-plugins-data-public.fieldformat.setupcontenttype.md) - -## FieldFormat.setupContentType() method - -Signature: - -```typescript -setupContentType(): FieldFormatConvert; -``` -Returns: - -`FieldFormatConvert` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.textconvert.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.textconvert.md deleted file mode 100644 index 57ccca9136081..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.textconvert.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [textConvert](./kibana-plugin-plugins-data-public.fieldformat.textconvert.md) - -## FieldFormat.textConvert property - - {textConvert} have to remove the protected because of https://github.com/Microsoft/TypeScript/issues/17293 - -Signature: - -```typescript -textConvert: TextContextTypeConvert | undefined; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.title.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.title.md deleted file mode 100644 index b19246758f080..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.title.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [title](./kibana-plugin-plugins-data-public.fieldformat.title.md) - -## FieldFormat.title property - - {string} - Field Format Title - -Signature: - -```typescript -static title: string; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.tojson.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.tojson.md deleted file mode 100644 index 48ec9456c56dd..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.tojson.md +++ /dev/null @@ -1,25 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [toJSON](./kibana-plugin-plugins-data-public.fieldformat.tojson.md) - -## FieldFormat.toJSON() method - -Serialize this format to a simple POJO, with only the params that are not default - - {object} - -Signature: - -```typescript -toJSON(): { - id: any; - params: any; - }; -``` -Returns: - -`{ - id: any; - params: any; - }` - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.type.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.type.md deleted file mode 100644 index 394a2e3cc9afb..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.type.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) > [type](./kibana-plugin-plugins-data-public.fieldformat.type.md) - -## FieldFormat.type property - - {Function} - ref to child class - -Signature: - -```typescript -type: any; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.es.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.es.md deleted file mode 100644 index 82441ee41d80d..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.es.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) > [es](./kibana-plugin-plugins-data-public.fieldformatconfig.es.md) - -## FieldFormatConfig.es property - -Signature: - -```typescript -es?: boolean; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.id.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.id.md deleted file mode 100644 index b179c314a56d3..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.id.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) > [id](./kibana-plugin-plugins-data-public.fieldformatconfig.id.md) - -## FieldFormatConfig.id property - -Signature: - -```typescript -id: FieldFormatId; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.md deleted file mode 100644 index f856a3132eccb..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.md +++ /dev/null @@ -1,20 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) - -## FieldFormatConfig interface - -Signature: - -```typescript -export interface FieldFormatConfig -``` - -## Properties - -| Property | Type | Description | -| --- | --- | --- | -| [es](./kibana-plugin-plugins-data-public.fieldformatconfig.es.md) | boolean | | -| [id](./kibana-plugin-plugins-data-public.fieldformatconfig.id.md) | FieldFormatId | | -| [params](./kibana-plugin-plugins-data-public.fieldformatconfig.params.md) | Record<string, any> | | - diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.params.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.params.md deleted file mode 100644 index aad977643ad2f..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatconfig.params.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) > [params](./kibana-plugin-plugins-data-public.fieldformatconfig.params.md) - -## FieldFormatConfig.params property - -Signature: - -```typescript -params: Record; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatid.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatid.md deleted file mode 100644 index 9f94d50a2001f..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatid.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormatId](./kibana-plugin-plugins-data-public.fieldformatid.md) - -## FieldFormatId type - - id type is needed for creating custom converters. - -Signature: - -```typescript -export declare type FieldFormatId = FIELD_FORMAT_IDS | string; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformats.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformats.md deleted file mode 100644 index 838ea2b5d9f3a..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformats.md +++ /dev/null @@ -1,39 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [fieldFormats](./kibana-plugin-plugins-data-public.fieldformats.md) - -## fieldFormats variable - -Signature: - -```typescript -fieldFormats: { - FieldFormat: typeof FieldFormat; - FieldFormatsRegistry: typeof FieldFormatsRegistry; - DEFAULT_CONVERTER_COLOR: { - range: string; - regex: string; - text: string; - background: string; - }; - HTML_CONTEXT_TYPE: import("../common").FieldFormatsContentType; - TEXT_CONTEXT_TYPE: import("../common").FieldFormatsContentType; - FIELD_FORMAT_IDS: typeof FIELD_FORMAT_IDS; - BoolFormat: typeof BoolFormat; - BytesFormat: typeof BytesFormat; - ColorFormat: typeof ColorFormat; - DateFormat: typeof DateFormat; - DateNanosFormat: typeof DateNanosFormat; - DurationFormat: typeof DurationFormat; - IpFormat: typeof IpFormat; - NumberFormat: typeof NumberFormat; - PercentFormat: typeof PercentFormat; - RelativeDateFormat: typeof RelativeDateFormat; - SourceFormat: typeof SourceFormat; - StaticLookupFormat: typeof StaticLookupFormat; - UrlFormat: typeof UrlFormat; - StringFormat: typeof StringFormat; - TruncateFormat: typeof TruncateFormat; - HistogramFormat: typeof HistogramFormat; -} -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatscontenttype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatscontenttype.md deleted file mode 100644 index 8e89a0262b438..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatscontenttype.md +++ /dev/null @@ -1,13 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormatsContentType](./kibana-plugin-plugins-data-public.fieldformatscontenttype.md) - -## FieldFormatsContentType type - -\* - -Signature: - -```typescript -export declare type FieldFormatsContentType = 'html' | 'text'; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md deleted file mode 100644 index c54e549c42a44..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormatsGetConfigFn](./kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md) - -## FieldFormatsGetConfigFn type - -Signature: - -```typescript -export declare type FieldFormatsGetConfigFn = GetConfigFn; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsstart.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsstart.md deleted file mode 100644 index ac8ddce6e7016..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformatsstart.md +++ /dev/null @@ -1,14 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [FieldFormatsStart](./kibana-plugin-plugins-data-public.fieldformatsstart.md) - -## FieldFormatsStart type - - -Signature: - -```typescript -export declare type FieldFormatsStart = Omit & { - deserialize: FormatFactory; -}; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md index b25d313129634..247760305db9c 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getkbntypenames.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getkbntypenames.md index 66effff722f3b..db741f74f538d 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getkbntypenames.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getkbntypenames.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/field-types" package directly instead. 8.0 +> Import from the "@kbn/field-types" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldformat.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldformat.md deleted file mode 100644 index 4fe738ddef5dc..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldformat.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [IFieldFormat](./kibana-plugin-plugins-data-public.ifieldformat.md) - -## IFieldFormat type - -Signature: - -```typescript -export declare type IFieldFormat = FieldFormat; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldformatsregistry.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldformatsregistry.md deleted file mode 100644 index 0f83e2bb2d423..0000000000000 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldformatsregistry.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [IFieldFormatsRegistry](./kibana-plugin-plugins-data-public.ifieldformatsregistry.md) - -## IFieldFormatsRegistry type - -Signature: - -```typescript -declare type IFieldFormatsRegistry = PublicMethodsOf; -``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldsubtype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldsubtype.md index ec723ddc00e72..8fe65d5a86de1 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldsubtype.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldsubtype.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md index b4b3198092604..6a798c3a4add1 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Use [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) 8.0 +> Use [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md index 3f8048d2913fb..99caa646c17b0 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> use runtime field instead 8.0 +> use runtime field instead 8.1 > Add scripted field to field list diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md index 70a9b624099cb..7a704b917daaf 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> use runtime field instead 8.0 +> use runtime field instead 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md index 517dec992c090..cd91bdcebce60 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> use runtime field instead 8.0 +> use runtime field instead 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.md index 9d26cf9730f46..774601daf4a87 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Used by time range index patterns 8.0 +> Used by time range index patterns 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md index fbd85a7d73230..052ccc2ae97b4 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> use runtime field instead 8.0 +> use runtime field instead 8.1 > Remove scripted field from field list diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilter.md index 8891620ad01ef..39da5c0548da0 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilters.md index 522a1c66bb80e..047a9861002b5 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilters.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilters.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kuerynode.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kuerynode.md index 6c6904d6625c6..73d82c25228bb 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kuerynode.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kuerynode.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.matchallfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.matchallfilter.md index 35ebdb1473c4e..51d0f8a139da5 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.matchallfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.matchallfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md index 49c9d1d143e6b..c13f8282242ff 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md @@ -13,7 +13,6 @@ | [AggParamType](./kibana-plugin-plugins-data-public.aggparamtype.md) | | | [DataPlugin](./kibana-plugin-plugins-data-public.dataplugin.md) | | | [DuplicateIndexPatternError](./kibana-plugin-plugins-data-public.duplicateindexpatternerror.md) | | -| [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) | | | [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) | | | [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) | | | [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) | | @@ -64,7 +63,6 @@ | [DataPublicPluginStart](./kibana-plugin-plugins-data-public.datapublicpluginstart.md) | Data plugin public Start contract | | [DataPublicPluginStartActions](./kibana-plugin-plugins-data-public.datapublicpluginstartactions.md) | utilities to generate filters from action context | | [DataPublicPluginStartUi](./kibana-plugin-plugins-data-public.datapublicpluginstartui.md) | Data plugin prewired UI components | -| [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) | | | [IDataPluginServices](./kibana-plugin-plugins-data-public.idatapluginservices.md) | | | [IEsSearchRequest](./kibana-plugin-plugins-data-public.iessearchrequest.md) | | | [IFieldType](./kibana-plugin-plugins-data-public.ifieldtype.md) | | @@ -104,7 +102,6 @@ | [AggGroupLabels](./kibana-plugin-plugins-data-public.agggrouplabels.md) | | | [AggGroupNames](./kibana-plugin-plugins-data-public.agggroupnames.md) | | | [APPLY\_FILTER\_TRIGGER](./kibana-plugin-plugins-data-public.apply_filter_trigger.md) | | -| [baseFormattersPublic](./kibana-plugin-plugins-data-public.baseformatterspublic.md) | | | [castEsToKbnFieldTypeName](./kibana-plugin-plugins-data-public.castestokbnfieldtypename.md) | | | [connectToQueryState](./kibana-plugin-plugins-data-public.connecttoquerystate.md) | Helper to setup two-way syncing of global data and a state container | | [createSavedQueryService](./kibana-plugin-plugins-data-public.createsavedqueryservice.md) | | @@ -114,7 +111,6 @@ | [esQuery](./kibana-plugin-plugins-data-public.esquery.md) | | | [exporters](./kibana-plugin-plugins-data-public.exporters.md) | | | [extractSearchSourceReferences](./kibana-plugin-plugins-data-public.extractsearchsourcereferences.md) | | -| [fieldFormats](./kibana-plugin-plugins-data-public.fieldformats.md) | | | [fieldList](./kibana-plugin-plugins-data-public.fieldlist.md) | | | [FilterItem](./kibana-plugin-plugins-data-public.filteritem.md) | | | [FilterLabel](./kibana-plugin-plugins-data-public.filterlabel.md) | | @@ -159,17 +155,11 @@ | [ExpressionFunctionKibana](./kibana-plugin-plugins-data-public.expressionfunctionkibana.md) | | | [ExpressionFunctionKibanaContext](./kibana-plugin-plugins-data-public.expressionfunctionkibanacontext.md) | | | [ExpressionValueSearchContext](./kibana-plugin-plugins-data-public.expressionvaluesearchcontext.md) | | -| [FieldFormatId](./kibana-plugin-plugins-data-public.fieldformatid.md) | id type is needed for creating custom converters. | -| [FieldFormatsContentType](./kibana-plugin-plugins-data-public.fieldformatscontenttype.md) | \* | -| [FieldFormatsGetConfigFn](./kibana-plugin-plugins-data-public.fieldformatsgetconfigfn.md) | | -| [FieldFormatsStart](./kibana-plugin-plugins-data-public.fieldformatsstart.md) | | | [Filter](./kibana-plugin-plugins-data-public.filter.md) | | | [IAggConfig](./kibana-plugin-plugins-data-public.iaggconfig.md) | AggConfig This class represents an aggregation, which is displayed in the left-hand nav of the Visualize app. | | [IAggType](./kibana-plugin-plugins-data-public.iaggtype.md) | | | [IEsError](./kibana-plugin-plugins-data-public.ieserror.md) | | | [IEsSearchResponse](./kibana-plugin-plugins-data-public.iessearchresponse.md) | | -| [IFieldFormat](./kibana-plugin-plugins-data-public.ifieldformat.md) | | -| [IFieldFormatsRegistry](./kibana-plugin-plugins-data-public.ifieldformatsregistry.md) | | | [IFieldParamType](./kibana-plugin-plugins-data-public.ifieldparamtype.md) | | | [IFieldSubType](./kibana-plugin-plugins-data-public.ifieldsubtype.md) | | | [IMetricAggType](./kibana-plugin-plugins-data-public.imetricaggtype.md) | | diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md index 850aff0f6cd85..cc1007655ecf3 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasesfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasesfilter.md index a28dba5b1cd3f..48a41dc34497f 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasesfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasesfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md index 91dd7c13c472e..5d452d759c934 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefiltermeta.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefiltermeta.md index 291dc90c3971d..eefb773f5727f 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefiltermeta.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefiltermeta.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilterparams.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilterparams.md index 42db2d353befa..df78be16e6d01 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilterparams.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilterparams.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md index 977f875b214e5..b00a7f31318eb 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Use the `fetch$` method instead 8.0 +> Use the `fetch$` method instead 8.1 > Fetch this source and reject the returned Promise on error diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ui_settings.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ui_settings.md index bdfc881878efd..fba9afd6f6648 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ui_settings.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ui_settings.md @@ -24,13 +24,6 @@ UI_SETTINGS: { readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget"; readonly HISTOGRAM_MAX_BARS: "histogram:maxBars"; readonly HISTORY_LIMIT: "history:limit"; - readonly SHORT_DOTS_ENABLE: "shortDots:enable"; - readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap"; - readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern"; - readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern"; - readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern"; - readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern"; - readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale"; readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults"; readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges"; readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults"; diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.castestokbnfieldtypename.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.castestokbnfieldtypename.md index 834fe302ad9f8..a3f92491e8983 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.castestokbnfieldtypename.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.castestokbnfieldtypename.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/field-types" package directly instead. 8.0 +> Import from the "@kbn/field-types" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.es.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.es.md deleted file mode 100644 index a3c3ddc4e1649..0000000000000 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.es.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [FieldFormatConfig](./kibana-plugin-plugins-data-server.fieldformatconfig.md) > [es](./kibana-plugin-plugins-data-server.fieldformatconfig.es.md) - -## FieldFormatConfig.es property - -Signature: - -```typescript -es?: boolean; -``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.id.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.id.md deleted file mode 100644 index c5173fba22533..0000000000000 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.id.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [FieldFormatConfig](./kibana-plugin-plugins-data-server.fieldformatconfig.md) > [id](./kibana-plugin-plugins-data-server.fieldformatconfig.id.md) - -## FieldFormatConfig.id property - -Signature: - -```typescript -id: FieldFormatId; -``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.md deleted file mode 100644 index 5d5c13784bc57..0000000000000 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.md +++ /dev/null @@ -1,20 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [FieldFormatConfig](./kibana-plugin-plugins-data-server.fieldformatconfig.md) - -## FieldFormatConfig interface - -Signature: - -```typescript -export interface FieldFormatConfig -``` - -## Properties - -| Property | Type | Description | -| --- | --- | --- | -| [es](./kibana-plugin-plugins-data-server.fieldformatconfig.es.md) | boolean | | -| [id](./kibana-plugin-plugins-data-server.fieldformatconfig.id.md) | FieldFormatId | | -| [params](./kibana-plugin-plugins-data-server.fieldformatconfig.params.md) | Record<string, any> | | - diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.params.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.params.md deleted file mode 100644 index c5e5faef30860..0000000000000 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatconfig.params.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [FieldFormatConfig](./kibana-plugin-plugins-data-server.fieldformatconfig.md) > [params](./kibana-plugin-plugins-data-server.fieldformatconfig.params.md) - -## FieldFormatConfig.params property - -Signature: - -```typescript -params: Record; -``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformats.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformats.md deleted file mode 100644 index 42563051bcdc4..0000000000000 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformats.md +++ /dev/null @@ -1,28 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [fieldFormats](./kibana-plugin-plugins-data-server.fieldformats.md) - -## fieldFormats variable - -Signature: - -```typescript -fieldFormats: { - FieldFormatsRegistry: typeof FieldFormatsRegistry; - FieldFormat: typeof FieldFormat; - BoolFormat: typeof BoolFormat; - BytesFormat: typeof BytesFormat; - ColorFormat: typeof ColorFormat; - DurationFormat: typeof DurationFormat; - IpFormat: typeof IpFormat; - NumberFormat: typeof NumberFormat; - PercentFormat: typeof PercentFormat; - RelativeDateFormat: typeof RelativeDateFormat; - SourceFormat: typeof SourceFormat; - StaticLookupFormat: typeof StaticLookupFormat; - UrlFormat: typeof UrlFormat; - StringFormat: typeof StringFormat; - TruncateFormat: typeof TruncateFormat; - HistogramFormat: typeof HistogramFormat; -} -``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md deleted file mode 100644 index a3f6c709246ea..0000000000000 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [FieldFormatsGetConfigFn](./kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md) - -## FieldFormatsGetConfigFn type - -Signature: - -```typescript -export declare type FieldFormatsGetConfigFn = GetConfigFn; -``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldformatsregistry.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldformatsregistry.md deleted file mode 100644 index c284d2c87fcaa..0000000000000 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldformatsregistry.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IFieldFormatsRegistry](./kibana-plugin-plugins-data-server.ifieldformatsregistry.md) - -## IFieldFormatsRegistry type - -Signature: - -```typescript -declare type IFieldFormatsRegistry = PublicMethodsOf; -``` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldsubtype.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldsubtype.md index 9ac9ba1abc637..7f812fb08fd51 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldsubtype.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldsubtype.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md index 932afceb5d22b..93f91f6264dbc 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Use [IndexPatternField](./kibana-plugin-plugins-data-server.indexpatternfield.md) 8.0 +> Use [IndexPatternField](./kibana-plugin-plugins-data-server.indexpatternfield.md) 8.1 > Signature: diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md index 9fe169233af13..829cc9c0752a0 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> use runtime field instead 8.0 +> use runtime field instead 8.1 > Add scripted field to field list diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md index 8a06b394ae554..deb71a9df8cc5 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> use runtime field instead 8.0 +> use runtime field instead 8.1 > Signature: diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md index 15978b6414947..3beef6e08ed3f 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> use runtime field instead 8.0 +> use runtime field instead 8.1 > Signature: diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.intervalname.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.intervalname.md index e2810cc21a378..01367d931a841 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.intervalname.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.intervalname.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Used by time range index patterns 8.0 +> Used by time range index patterns 8.1 > Signature: diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md index bc96d3596ed12..c72ad5163d4ec 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> use runtime field instead 8.0 +> use runtime field instead 8.1 > Remove scripted field from field list diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.kuerynode.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.kuerynode.md index 0bdb5d6726fa8..f56300757736a 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.kuerynode.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.kuerynode.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Import from the "@kbn/es-query" package directly instead. 8.0 +> Import from the "@kbn/es-query" package directly instead. 8.1 > Signature: diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md index 2e76e3b0c6ad4..0363aa1ce6442 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md @@ -49,7 +49,6 @@ | [AsyncSearchResponse](./kibana-plugin-plugins-data-server.asyncsearchresponse.md) | | | [AsyncSearchStatusResponse](./kibana-plugin-plugins-data-server.asyncsearchstatusresponse.md) | | | [FieldDescriptor](./kibana-plugin-plugins-data-server.fielddescriptor.md) | | -| [FieldFormatConfig](./kibana-plugin-plugins-data-server.fieldformatconfig.md) | | | [IEsSearchRequest](./kibana-plugin-plugins-data-server.iessearchrequest.md) | | | [IFieldType](./kibana-plugin-plugins-data-server.ifieldtype.md) | | | [IndexPatternAttributes](./kibana-plugin-plugins-data-server.indexpatternattributes.md) | Interface for an index pattern saved object | @@ -80,7 +79,6 @@ | [esKuery](./kibana-plugin-plugins-data-server.eskuery.md) | | | [esQuery](./kibana-plugin-plugins-data-server.esquery.md) | | | [exporters](./kibana-plugin-plugins-data-server.exporters.md) | | -| [fieldFormats](./kibana-plugin-plugins-data-server.fieldformats.md) | | | [INDEX\_PATTERN\_SAVED\_OBJECT\_TYPE](./kibana-plugin-plugins-data-server.index_pattern_saved_object_type.md) | \* | | [indexPatterns](./kibana-plugin-plugins-data-server.indexpatterns.md) | | | [mergeCapabilitiesWithFields](./kibana-plugin-plugins-data-server.mergecapabilitieswithfields.md) | | @@ -100,12 +98,10 @@ | [ExpressionFunctionKibana](./kibana-plugin-plugins-data-server.expressionfunctionkibana.md) | | | [ExpressionFunctionKibanaContext](./kibana-plugin-plugins-data-server.expressionfunctionkibanacontext.md) | | | [ExpressionValueSearchContext](./kibana-plugin-plugins-data-server.expressionvaluesearchcontext.md) | | -| [FieldFormatsGetConfigFn](./kibana-plugin-plugins-data-server.fieldformatsgetconfigfn.md) | | | [Filter](./kibana-plugin-plugins-data-server.filter.md) | | | [IAggConfig](./kibana-plugin-plugins-data-server.iaggconfig.md) | AggConfig This class represents an aggregation, which is displayed in the left-hand nav of the Visualize app. | | [IAggType](./kibana-plugin-plugins-data-server.iaggtype.md) | | | [IEsSearchResponse](./kibana-plugin-plugins-data-server.iessearchresponse.md) | | -| [IFieldFormatsRegistry](./kibana-plugin-plugins-data-server.ifieldformatsregistry.md) | | | [IFieldParamType](./kibana-plugin-plugins-data-server.ifieldparamtype.md) | | | [IFieldSubType](./kibana-plugin-plugins-data-server.ifieldsubtype.md) | | | [IMetricAggType](./kibana-plugin-plugins-data-server.imetricaggtype.md) | | diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md index bd90f23b4ab59..5763cb2dacb7a 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md @@ -7,12 +7,10 @@ Signature: ```typescript -setup(core: CoreSetup, { bfetch, expressions, usageCollection }: DataPluginSetupDependencies): { +setup(core: CoreSetup, { bfetch, expressions, usageCollection, fieldFormats }: DataPluginSetupDependencies): { __enhance: (enhancements: DataEnhancements) => void; search: ISearchSetup; - fieldFormats: { - register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number; - }; + fieldFormats: FieldFormatsSetup; }; ``` @@ -21,15 +19,13 @@ setup(core: CoreSetup, { bfetch, e | Parameter | Type | Description | | --- | --- | --- | | core | CoreSetup<DataPluginStartDependencies, DataPluginStart> | | -| { bfetch, expressions, usageCollection } | DataPluginSetupDependencies | | +| { bfetch, expressions, usageCollection, fieldFormats } | DataPluginSetupDependencies | | Returns: `{ __enhance: (enhancements: DataEnhancements) => void; search: ISearchSetup; - fieldFormats: { - register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number; - }; + fieldFormats: FieldFormatsSetup; }` diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md index dd1f3806c1408..a31e4512cfcf1 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md @@ -7,10 +7,8 @@ Signature: ```typescript -start(core: CoreStart): { - fieldFormats: { - fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise; - }; +start(core: CoreStart, { fieldFormats }: DataPluginStartDependencies): { + fieldFormats: FieldFormatsStart; indexPatterns: { indexPatternsServiceFactory: (savedObjectsClient: Pick, elasticsearchClient: import("../../../core/server").ElasticsearchClient) => Promise; }; @@ -23,13 +21,12 @@ start(core: CoreStart): { | Parameter | Type | Description | | --- | --- | --- | | core | CoreStart | | +| { fieldFormats } | DataPluginStartDependencies | | Returns: `{ - fieldFormats: { - fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise; - }; + fieldFormats: FieldFormatsStart; indexPatterns: { indexPatternsServiceFactory: (savedObjectsClient: Pick, elasticsearchClient: import("../../../core/server").ElasticsearchClient) => Promise; }; diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginsetup.fieldformats.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginsetup.fieldformats.md index 648e23e597f4d..55badaf2d07bc 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginsetup.fieldformats.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginsetup.fieldformats.md @@ -4,6 +4,11 @@ ## PluginSetup.fieldFormats property +> Warning: This API is now obsolete. +> +> - use "fieldFormats" plugin directly instead +> + Signature: ```typescript diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.fieldformats.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.fieldformats.md index 7a77c6c943cd7..26182e96a4a7e 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.fieldformats.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.fieldformats.md @@ -4,6 +4,11 @@ ## PluginStart.fieldFormats property +> Warning: This API is now obsolete. +> +> - use "fieldFormats" plugin directly instead +> + Signature: ```typescript diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ui_settings.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ui_settings.md index 387dac22e1c83..e1f002674ef6d 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ui_settings.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ui_settings.md @@ -24,13 +24,6 @@ UI_SETTINGS: { readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget"; readonly HISTOGRAM_MAX_BARS: "histogram:maxBars"; readonly HISTORY_LIMIT: "history:limit"; - readonly SHORT_DOTS_ENABLE: "shortDots:enable"; - readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap"; - readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern"; - readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern"; - readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern"; - readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern"; - readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale"; readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults"; readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges"; readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults"; diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index e814fe9db5e3a..3755744d73184 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -13,7 +13,7 @@ pageLoadAssetSize: dashboard: 374194 dashboardEnhanced: 65646 dashboardMode: 22716 - data: 900000 + data: 824229 dataEnhanced: 50420 devTools: 38637 discover: 99999 @@ -24,6 +24,7 @@ pageLoadAssetSize: esUiShared: 326654 expressions: 224136 features: 21723 + fieldFormats: 92628 globalSearch: 29696 globalSearchBar: 50403 globalSearchProviders: 25554 diff --git a/src/plugins/dashboard/public/application/actions/export_csv_action.tsx b/src/plugins/dashboard/public/application/actions/export_csv_action.tsx index dd6eeb92ef932..cf643fa7d271f 100644 --- a/src/plugins/dashboard/public/application/actions/export_csv_action.tsx +++ b/src/plugins/dashboard/public/application/actions/export_csv_action.tsx @@ -8,7 +8,7 @@ import { Datatable } from 'src/plugins/expressions/public'; import { CoreStart } from '../../../../../core/public'; -import { FormatFactory } from '../../../../data/common/field_formats/utils'; +import { FormatFactory } from '../../../../field_formats/common'; import { DataPublicPluginStart, exporters } from '../../services/data'; import { downloadMultipleAs } from '../../services/share'; diff --git a/src/plugins/data/README.mdx b/src/plugins/data/README.mdx index fba5cbd6d48e1..c2da9a686cacb 100644 --- a/src/plugins/data/README.mdx +++ b/src/plugins/data/README.mdx @@ -49,10 +49,6 @@ This is helpful when you want to provide a user with options, for example when c ``` -## Field Formats - -Coming soon. - ## Index Patterns The Index Patterns API provides a consistent method of structuring and formatting documents diff --git a/src/plugins/data/common/constants.ts b/src/plugins/data/common/constants.ts index 89ccdfcc0479e..406da4e56d150 100644 --- a/src/plugins/data/common/constants.ts +++ b/src/plugins/data/common/constants.ts @@ -31,13 +31,6 @@ export const UI_SETTINGS = { HISTOGRAM_BAR_TARGET: 'histogram:barTarget', HISTOGRAM_MAX_BARS: 'histogram:maxBars', HISTORY_LIMIT: 'history:limit', - SHORT_DOTS_ENABLE: 'shortDots:enable', - FORMAT_DEFAULT_TYPE_MAP: 'format:defaultTypeMap', - FORMAT_NUMBER_DEFAULT_PATTERN: 'format:number:defaultPattern', - FORMAT_PERCENT_DEFAULT_PATTERN: 'format:percent:defaultPattern', - FORMAT_BYTES_DEFAULT_PATTERN: 'format:bytes:defaultPattern', - FORMAT_CURRENCY_DEFAULT_PATTERN: 'format:currency:defaultPattern', - FORMAT_NUMBER_DEFAULT_LOCALE: 'format:number:defaultLocale', TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: 'timepicker:refreshIntervalDefaults', TIMEPICKER_QUICK_RANGES: 'timepicker:quickRanges', TIMEPICKER_TIME_DEFAULTS: 'timepicker:timeDefaults', diff --git a/src/plugins/data/common/exports/export_csv.test.ts b/src/plugins/data/common/exports/export_csv.test.ts index 8bf44fe48a589..f108e69c68d56 100644 --- a/src/plugins/data/common/exports/export_csv.test.ts +++ b/src/plugins/data/common/exports/export_csv.test.ts @@ -7,7 +7,7 @@ */ import { Datatable } from 'src/plugins/expressions'; -import { FieldFormat } from '../../common/field_formats'; +import { FieldFormat } from '../../../field_formats/common'; import { datatableToCSV } from './export_csv'; function getDefaultOptions() { diff --git a/src/plugins/data/common/exports/export_csv.tsx b/src/plugins/data/common/exports/export_csv.tsx index d4477e72b64c4..68f817d1b1484 100644 --- a/src/plugins/data/common/exports/export_csv.tsx +++ b/src/plugins/data/common/exports/export_csv.tsx @@ -8,8 +8,8 @@ // Inspired by the inspector CSV exporter -import { FormatFactory } from 'src/plugins/data/common/field_formats/utils'; import { Datatable } from 'src/plugins/expressions'; +import { FormatFactory } from '../../../field_formats/common'; import { createEscapeValue } from './escape_value'; export const LINE_FEED_CHARACTER = '\r\n'; diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts index cd05c613f793f..2bc383db6f530 100644 --- a/src/plugins/data/common/index.ts +++ b/src/plugins/data/common/index.ts @@ -8,7 +8,6 @@ export * from './constants'; export * from './es_query'; -export * from './field_formats'; export * from './index_patterns'; export * from './kbn_field_types'; export * from './query'; diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts index 73f015ca5517c..f95de90955b65 100644 --- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts +++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts @@ -8,8 +8,9 @@ import { IndexPatternField } from './index_pattern_field'; import { IndexPattern } from '../index_patterns'; -import { KBN_FIELD_TYPES, FieldFormat } from '../../../common'; +import { KBN_FIELD_TYPES } from '../../../common'; import { FieldSpec, RuntimeField } from '../types'; +import { FieldFormat } from '../../../../field_formats/common'; describe('Field', function () { function flatten(obj: Record) { diff --git a/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.test.ts b/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.test.ts index 9a33b0cfa6f1c..f4f94856c7226 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.test.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.test.ts @@ -12,7 +12,7 @@ import { IndexPattern } from './index_pattern'; import mockLogStashFields from './fixtures/logstash_fields'; import { stubbedSavedObjectIndexPattern } from './fixtures/stubbed_saved_object_index_pattern'; -import { fieldFormatsMock } from '../../field_formats/mocks'; +import { fieldFormatsMock } from '../../../../field_formats/common/mocks'; import { flattenHitWrapper } from './flatten_hit'; class MockFieldFormatter {} diff --git a/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts b/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts index 732b9c7c8eab0..fe872ae929899 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts @@ -8,7 +8,7 @@ import _ from 'lodash'; import { IndexPattern } from './index_pattern'; -import { FieldFormatsContentType } from '../../../common'; +import { FieldFormatsContentType } from '../../../../field_formats/common'; const formattedCache = new WeakMap(); const partialFormattedCache = new WeakMap(); diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts index 508bddb7a4096..7c111f7666544 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts @@ -16,8 +16,8 @@ import mockLogStashFields from './fixtures/logstash_fields'; import { stubbedSavedObjectIndexPattern } from './fixtures/stubbed_saved_object_index_pattern'; import { IndexPatternField } from '../fields'; -import { fieldFormatsMock } from '../../field_formats/mocks'; -import { FieldFormat } from '../..'; +import { fieldFormatsMock } from '../../../../field_formats/common/mocks'; +import { FieldFormat } from '../../../../field_formats/common'; import { RuntimeField } from '../types'; class MockFieldFormatter {} diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts index b3f2605723c02..48bcdf6982b67 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts @@ -15,7 +15,7 @@ import { ES_FIELD_TYPES, KBN_FIELD_TYPES, IIndexPattern, IFieldType } from '../. import { IndexPatternField, IIndexPatternFieldList, fieldList } from '../fields'; import { formatHitProvider } from './format_hit'; import { flattenHitWrapper } from './flatten_hit'; -import { FieldFormatsStartCommon, FieldFormat } from '../../field_formats'; +import { FieldFormatsStartCommon, FieldFormat } from '../../../../field_formats/common'; import { IndexPatternSpec, TypeMeta, SourceFilter, IndexPatternFieldMap } from '../types'; import { SerializedFieldFormat } from '../../../../expressions/common'; import { castEsToKbnFieldTypeName } from '../../kbn_field_types'; diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts index 8715f8feb067a..a80e97b4e2cab 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts @@ -8,7 +8,7 @@ import { defaults } from 'lodash'; import { IndexPatternsService, IndexPattern } from '.'; -import { fieldFormatsMock } from '../../field_formats/mocks'; +import { fieldFormatsMock } from '../../../../field_formats/common/mocks'; import { stubbedSavedObjectIndexPattern } from './fixtures/stubbed_saved_object_index_pattern'; import { UiSettingsCommon, SavedObjectsClientCommon, SavedObject } from '../types'; diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts index cecf3b8c07d1a..0f2e4afbdcd28 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts @@ -29,7 +29,7 @@ import { FieldSpec, IndexPatternFieldMap, } from '../types'; -import { FieldFormatsStartCommon } from '../../field_formats'; +import { FieldFormatsStartCommon, FORMATS_UI_SETTINGS } from '../../../../field_formats/common/'; import { UI_SETTINGS, SavedObject } from '../../../common'; import { SavedObjectNotFound } from '../../../../kibana_utils/common'; import { IndexPatternMissingIndices } from '../lib'; @@ -500,7 +500,7 @@ export class IndexPatternsService { * @returns IndexPattern */ async create(spec: IndexPatternSpec, skipFetchFields = false): Promise { - const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE); + const shortDotsEnable = await this.config.get(FORMATS_UI_SETTINGS.SHORT_DOTS_ENABLE); const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS); const indexPattern = new IndexPattern({ diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts index d05a7ea6e2d93..56a79dd9cfada 100644 --- a/src/plugins/data/common/index_patterns/types.ts +++ b/src/plugins/data/common/index_patterns/types.ts @@ -13,7 +13,8 @@ import type { SavedObject } from 'src/core/server'; import { IFieldType } from './fields'; import { RUNTIME_FIELD_TYPES } from './constants'; import { SerializedFieldFormat } from '../../../expressions/common'; -import { KBN_FIELD_TYPES, IndexPatternField, FieldFormat } from '..'; +import { KBN_FIELD_TYPES, IndexPatternField } from '..'; +import { FieldFormat } from '../../../field_formats/common'; export type FieldFormatMap = Record; diff --git a/src/plugins/data/common/search/aggs/agg_types.ts b/src/plugins/data/common/search/aggs/agg_types.ts index 1db60db507f0f..375de79f7f081 100644 --- a/src/plugins/data/common/search/aggs/agg_types.ts +++ b/src/plugins/data/common/search/aggs/agg_types.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { FieldFormatsStartCommon } from '../../field_formats'; +import { FieldFormatsStartCommon } from '../../../../field_formats/common'; import * as buckets from './buckets'; import * as metrics from './metrics'; diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts index c147708b5b2f9..0cefd6b73b336 100644 --- a/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts +++ b/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../common/field_formats'; +import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../../field_formats/common'; import { AggConfigs } from '../../agg_configs'; import { mockAggTypesRegistry, mockGetFieldFormatsStart } from '../../test_helpers'; import { BUCKET_TYPES } from '../bucket_agg_types'; diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts index 1e4d97a007301..51ea6d081d139 100644 --- a/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts +++ b/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts @@ -9,7 +9,7 @@ import { createFilterIpRange } from './ip_range'; import { AggConfigs, CreateAggConfigParams } from '../../agg_configs'; import { mockAggTypesRegistry } from '../../test_helpers'; -import { IpFormat } from '../../../../../common'; +import { IpFormat } from '../../../../../../field_formats/common'; import { BUCKET_TYPES } from '../bucket_agg_types'; import { IBucketAggConfig } from '../bucket_agg_type'; diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts index 7e4289e23cfae..c9ab1617929dc 100644 --- a/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts +++ b/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../common/field_formats'; +import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../../field_formats/common'; import { AggConfigs } from '../../agg_configs'; import { mockAggTypesRegistry, mockGetFieldFormatsStart } from '../../test_helpers'; import { IBucketAggConfig } from '../bucket_agg_type'; diff --git a/src/plugins/data/common/search/aggs/buckets/range.test.ts b/src/plugins/data/common/search/aggs/buckets/range.test.ts index 60a58a68e18e0..202cc59c83c0f 100644 --- a/src/plugins/data/common/search/aggs/buckets/range.test.ts +++ b/src/plugins/data/common/search/aggs/buckets/range.test.ts @@ -9,7 +9,7 @@ import { AggConfigs } from '../agg_configs'; import { mockAggTypesRegistry } from '../test_helpers'; import { BUCKET_TYPES } from './bucket_agg_types'; -import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../common/field_formats'; +import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../../field_formats/common'; describe('Range Agg', () => { const getConfig = (() => {}) as FieldFormatsGetConfigFn; diff --git a/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts b/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts index 51c71cd1a2994..9f7559c6fe34f 100644 --- a/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts +++ b/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts @@ -7,7 +7,7 @@ */ import { AggConfigs } from '../agg_configs'; -import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../common/field_formats'; +import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../../field_formats/common'; import { getShardDelayBucketAgg, SHARD_DELAY_AGG_NAME } from './shard_delay'; describe('Shard Delay Agg', () => { diff --git a/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts b/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts index ff22af720bde6..50c8966d284a0 100644 --- a/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts +++ b/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { fieldFormatsMock } from '../../../field_formats/mocks'; +import { fieldFormatsMock } from '../../../../../field_formats/common/mocks'; import { AggTypesRegistry, AggTypesRegistryStart } from '../agg_types_registry'; import { AggTypesDependencies, getAggTypes } from '../agg_types'; diff --git a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts index 1cf80a6d0085c..76112980c55fb 100644 --- a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts +++ b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts @@ -8,8 +8,11 @@ import { identity } from 'lodash'; -import { SerializedFieldFormat } from 'src/plugins/expressions/common/types'; -import { FieldFormat, IFieldFormat } from '../../../../common'; +import { + FieldFormat, + IFieldFormat, + SerializedFieldFormat, +} from '../../../../../field_formats/common'; import { getAggsFormats } from './get_aggs_formats'; const getAggFormat = ( diff --git a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts index 175b6832b3c85..2aead866c6b60 100644 --- a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts +++ b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts @@ -15,7 +15,7 @@ import { FieldFormatInstanceType, FieldFormatsContentType, IFieldFormat, -} from '../../../../common/field_formats'; +} from '../../../../../field_formats/common'; import { DateRange } from '../../expressions'; import { convertDateRangeToString } from '../buckets/lib/date_range'; import { convertIPRangeToString, IpRangeKey } from '../buckets/lib/ip_range'; diff --git a/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts b/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts index b78980cb5136e..e200f9bf02536 100644 --- a/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts +++ b/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts @@ -7,7 +7,7 @@ */ import { isRangeFilter } from '@kbn/es-query'; -import { BytesFormat, FieldFormatsGetConfigFn } from '../../../field_formats'; +import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../field_formats/common'; import { AggConfigs, IAggConfig } from '../../aggs'; import { mockAggTypesRegistry } from '../../aggs/test_helpers'; diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts index c982ba1e7a293..c72976e3412a6 100644 --- a/src/plugins/data/common/search/search_source/search_source.ts +++ b/src/plugins/data/common/search/search_source/search_source.ts @@ -99,7 +99,7 @@ import { isPartialResponse, IKibanaSearchResponse, } from '../../../common'; -import { getHighlightRequest } from '../../../common/field_formats'; +import { getHighlightRequest } from '../../../../field_formats/common'; import { extractReferences } from './extract_references'; /** @internal */ diff --git a/src/plugins/data/kibana.json b/src/plugins/data/kibana.json index e425d0701155b..e6faa6bd0b1a7 100644 --- a/src/plugins/data/kibana.json +++ b/src/plugins/data/kibana.json @@ -3,8 +3,8 @@ "version": "kibana", "server": true, "ui": true, - "requiredPlugins": ["bfetch", "expressions", "uiActions", "share", "inspector"], - "serviceFolders": ["search", "index_patterns", "query", "autocomplete", "ui", "field_formats"], + "requiredPlugins": ["bfetch", "expressions", "uiActions", "share", "inspector", "fieldFormats"], + "serviceFolders": ["search", "index_patterns", "query", "autocomplete", "ui"], "optionalPlugins": ["usageCollection"], "extraPublicDirs": ["common"], "requiredBundles": ["kibanaUtils", "kibanaReact", "inspector"], diff --git a/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts b/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts index ea7d7690fb876..5c3b016dc631e 100644 --- a/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts +++ b/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts @@ -10,14 +10,11 @@ import moment from 'moment'; import { createFiltersFromRangeSelectAction } from './create_filters_from_range_select'; -import { - fieldFormats, - FieldFormatsGetConfigFn, - IndexPatternsContract, - RangeFilter, -} from '../../../public'; +import { IndexPatternsContract, RangeFilter } from '../../../public'; import { dataPluginMock } from '../../../public/mocks'; import { setIndexPatterns, setSearchService } from '../../../public/services'; +import { FieldFormatsGetConfigFn } from '../../../../field_formats/common'; +import { DateFormat } from '../../../../field_formats/public/'; describe('brushEvent', () => { const DAY_IN_MS = 24 * 60 * 60 * 1000; @@ -35,7 +32,7 @@ describe('brushEvent', () => { id: 'logstash-*', }, filterable: true, - format: new fieldFormats.DateFormat({}, (() => {}) as FieldFormatsGetConfigFn), + format: new DateFormat({}, (() => {}) as FieldFormatsGetConfigFn), }; const indexPattern = { diff --git a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts index 14ae24a2a5626..563321cf56fef 100644 --- a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts +++ b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts @@ -6,18 +6,14 @@ * Side Public License, v 1. */ -import { - fieldFormats, - FieldFormatsGetConfigFn, - esFilters, - IndexPatternsContract, -} from '../../../public'; +import { esFilters, IndexPatternsContract } from '../../../public'; import { dataPluginMock } from '../../../public/mocks'; import { setIndexPatterns, setSearchService } from '../../../public/services'; import { createFiltersFromValueClickAction, ValueClickDataContext, } from './create_filters_from_value_click'; +import { FieldFormatsGetConfigFn, BytesFormat } from '../../../../field_formats/common'; const mockField = { name: 'bytes', @@ -72,8 +68,7 @@ describe('createFiltersFromValueClick', () => { getByName: () => mockField, filter: () => [mockField], }, - getFormatterForField: () => - new fieldFormats.BytesFormat({}, (() => {}) as FieldFormatsGetConfigFn), + getFormatterForField: () => new BytesFormat({}, (() => {}) as FieldFormatsGetConfigFn), }), } as unknown) as IndexPatternsContract); }); diff --git a/src/plugins/data/public/field_formats/field_formats_registry.stub.ts b/src/plugins/data/public/field_formats/field_formats_registry.stub.ts deleted file mode 100644 index 566532085059d..0000000000000 --- a/src/plugins/data/public/field_formats/field_formats_registry.stub.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -import { CoreSetup } from 'src/core/public'; -import { baseFormattersPublic } from './constants'; -import { fieldFormats } from '..'; - -export const getFieldFormatsRegistry = (core: CoreSetup) => { - const fieldFormatsRegistry = new fieldFormats.FieldFormatsRegistry(); - const getConfig = core.uiSettings.get.bind(core.uiSettings); - - fieldFormatsRegistry.init(getConfig, {}, baseFormattersPublic); - - return fieldFormatsRegistry; -}; diff --git a/src/plugins/data/public/index.scss b/src/plugins/data/public/index.scss index c0eebf3402771..467efa98934ec 100644 --- a/src/plugins/data/public/index.scss +++ b/src/plugins/data/public/index.scss @@ -1,3 +1,2 @@ @import './ui/index'; @import './utils/table_inspector_view/index'; -@import './field_formats/converters/index'; diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts index e3ecacfbda5ad..803b93cc7acf5 100644 --- a/src/plugins/data/public/index.ts +++ b/src/plugins/data/public/index.ts @@ -19,75 +19,6 @@ export { getEsQueryConfig } from '../common'; export { FilterLabel, FilterItem } from './ui'; export { getDisplayValueFromFilter, generateFilters, extractTimeRange } from './query'; -/* - * Field Formatters: - */ - -import { - FieldFormat, - FieldFormatsRegistry, - DEFAULT_CONVERTER_COLOR, - HTML_CONTEXT_TYPE, - TEXT_CONTEXT_TYPE, - FIELD_FORMAT_IDS, - BoolFormat, - BytesFormat, - ColorFormat, - DurationFormat, - IpFormat, - NumberFormat, - PercentFormat, - RelativeDateFormat, - SourceFormat, - StaticLookupFormat, - UrlFormat, - StringFormat, - TruncateFormat, - HistogramFormat, -} from '../common/field_formats'; - -import { DateNanosFormat, DateFormat } from './field_formats'; -export { baseFormattersPublic, FieldFormatsStart } from './field_formats'; - -// Field formats helpers namespace: -export const fieldFormats = { - FieldFormat, - FieldFormatsRegistry, // exported only for tests. Consider mock. - - DEFAULT_CONVERTER_COLOR, - HTML_CONTEXT_TYPE, - TEXT_CONTEXT_TYPE, - FIELD_FORMAT_IDS, - - BoolFormat, - BytesFormat, - ColorFormat, - DateFormat, - DateNanosFormat, - DurationFormat, - IpFormat, - NumberFormat, - PercentFormat, - RelativeDateFormat, - SourceFormat, - StaticLookupFormat, - UrlFormat, - StringFormat, - TruncateFormat, - HistogramFormat, -}; - -export { - IFieldFormat, - FieldFormatInstanceType, - IFieldFormatsRegistry, - FieldFormatsContentType, - FieldFormatsGetConfigFn, - FieldFormatConfig, - FieldFormatId, - FieldFormat, -} from '../common'; - /** * Exporters (CSV) */ diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts index 9e01350add2e3..ba1cba987c0b9 100644 --- a/src/plugins/data/public/mocks.ts +++ b/src/plugins/data/public/mocks.ts @@ -7,7 +7,7 @@ */ import { DataPlugin, IndexPatternsContract } from '.'; -import { fieldFormatsServiceMock } from './field_formats/mocks'; +import { fieldFormatsServiceMock } from '../../field_formats/public/mocks'; import { searchServiceMock } from './search/mocks'; import { queryServiceMock } from './query/mocks'; import { AutocompleteStart, AutocompleteSetup } from './autocomplete'; diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts index 7a071dbffe696..46b1d4a14be78 100644 --- a/src/plugins/data/public/plugin.ts +++ b/src/plugins/data/public/plugin.ts @@ -19,7 +19,6 @@ import { } from './types'; import { AutocompleteService } from './autocomplete'; import { SearchService } from './search/search_service'; -import { FieldFormatsService } from './field_formats'; import { QueryService } from './query'; import { createIndexPatternSelect } from './ui/index_pattern_select'; import { @@ -62,7 +61,6 @@ export class DataPublicPlugin > { private readonly autocomplete: AutocompleteService; private readonly searchService: SearchService; - private readonly fieldFormatsService: FieldFormatsService; private readonly queryService: QueryService; private readonly storage: IStorageWrapper; private usageCollection: UsageCollectionSetup | undefined; @@ -71,7 +69,6 @@ export class DataPublicPlugin constructor(initializerContext: PluginInitializerContext) { this.searchService = new SearchService(initializerContext); this.queryService = new QueryService(); - this.fieldFormatsService = new FieldFormatsService(); this.autocomplete = new AutocompleteService(initializerContext); this.storage = new Storage(window.localStorage); @@ -80,7 +77,14 @@ export class DataPublicPlugin public setup( core: CoreSetup, - { bfetch, expressions, uiActions, usageCollection, inspector }: DataSetupDependencies + { + bfetch, + expressions, + uiActions, + usageCollection, + inspector, + fieldFormats, + }: DataSetupDependencies ): DataPublicPluginSetup { const startServices = createStartServicesGetter(core.getStartServices); @@ -115,10 +119,9 @@ export class DataPublicPlugin })) ); - const fieldFormats = this.fieldFormatsService.setup(core); fieldFormats.register( getAggsFormats((serializedFieldFormat) => - startServices().self.fieldFormats.deserialize(serializedFieldFormat) + startServices().plugins.fieldFormats.deserialize(serializedFieldFormat) ) ); @@ -133,14 +136,15 @@ export class DataPublicPlugin }; } - public start(core: CoreStart, { uiActions }: DataStartDependencies): DataPublicPluginStart { + public start( + core: CoreStart, + { uiActions, fieldFormats }: DataStartDependencies + ): DataPublicPluginStart { const { uiSettings, http, notifications, savedObjects, overlays, application } = core; setNotifications(notifications); setOverlays(overlays); setUiSettings(uiSettings); - const fieldFormats = this.fieldFormatsService.start(); - const indexPatterns = new IndexPatternsService({ uiSettings: new UiSettingsPublicToCommon(uiSettings), savedObjectsClient: new SavedObjectsClientPublicToCommon(savedObjects.client), diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index ce105b8cc94ac..7e67fdbe667ea 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -43,9 +43,10 @@ import { ExpressionAstExpression } from 'src/plugins/expressions/common'; import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; import { ExpressionsSetup } from 'src/plugins/expressions/public'; import { ExpressionValueBoxed } from 'src/plugins/expressions/common'; +import { FieldFormatsSetup } from 'src/plugins/field_formats/public'; +import { FieldFormatsStart } from 'src/plugins/field_formats/public'; import { Filter as Filter_2 } from '@kbn/es-query'; import { FilterStateStore } from '@kbn/es-query'; -import { FormatFactory as FormatFactory_2 } from 'src/plugins/data/common/field_formats/utils'; import { History } from 'history'; import { Href } from 'history'; import { HttpSetup } from 'kibana/public'; @@ -107,7 +108,7 @@ import { SavedObjectsFindOptions } from 'kibana/public'; import { SavedObjectsFindResponse } from 'kibana/server'; import { SavedObjectsUpdateResponse } from 'kibana/server'; import { SchemaTypeError } from '@kbn/config-schema'; -import { SerializedFieldFormat as SerializedFieldFormat_2 } from 'src/plugins/expressions/common'; +import { SerializedFieldFormat as SerializedFieldFormat_3 } from 'src/plugins/expressions/common'; import { StartServicesAccessor } from 'kibana/public'; import { ToastInputFields } from 'src/core/public/notifications'; import { ToastsSetup } from 'kibana/public'; @@ -207,7 +208,7 @@ export class AggConfig { // @deprecated (undocumented) toJSON(): AggConfigSerialized; // Warning: (ae-forgotten-export) The symbol "SerializableState" needs to be exported by the entry point index.d.ts - toSerializedFieldFormat(): {} | Ensure, SerializableState_2>; + toSerializedFieldFormat(): {} | Ensure, SerializableState_2>; // (undocumented) get type(): IAggType; set type(type: IAggType); @@ -573,13 +574,6 @@ export type AutocompleteStart = ReturnType; // @public (undocumented) export type AutoRefreshDoneFn = () => void; -// Warning: (ae-forgotten-export) The symbol "DateFormat" needs to be exported by the entry point index.d.ts -// Warning: (ae-forgotten-export) The symbol "DateNanosFormat" needs to be exported by the entry point index.d.ts -// Warning: (ae-missing-release-tag) "baseFormattersPublic" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export const baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat | typeof DateNanosFormat)[]; - // Warning: (ae-missing-release-tag) "BUCKET_TYPES" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) @@ -644,9 +638,9 @@ export class DataPlugin implements Plugin); // (undocumented) - setup(core: CoreSetup, { bfetch, expressions, uiActions, usageCollection, inspector }: DataSetupDependencies): DataPublicPluginSetup; + setup(core: CoreSetup, { bfetch, expressions, uiActions, usageCollection, inspector, fieldFormats, }: DataSetupDependencies): DataPublicPluginSetup; // (undocumented) - start(core: CoreStart_2, { uiActions }: DataStartDependencies): DataPublicPluginStart; + start(core: CoreStart_2, { uiActions, fieldFormats }: DataStartDependencies): DataPublicPluginStart; // (undocumented) stop(): void; } @@ -659,9 +653,7 @@ export interface DataPublicPluginSetup { // // (undocumented) autocomplete: AutocompleteSetup; - // Warning: (ae-forgotten-export) The symbol "FieldFormatsSetup" needs to be exported by the entry point index.d.ts - // - // (undocumented) + // @deprecated (undocumented) fieldFormats: FieldFormatsSetup; // (undocumented) query: QuerySetup; @@ -675,6 +667,7 @@ export interface DataPublicPluginSetup { export interface DataPublicPluginStart { actions: DataPublicPluginStartActions; autocomplete: AutocompleteStart; + // @deprecated (undocumented) fieldFormats: FieldFormatsStart; indexPatterns: IndexPatternsContract; // Warning: (ae-forgotten-export) The symbol "NowProviderPublicContract" needs to be exported by the entry point index.d.ts @@ -896,124 +889,6 @@ export function extractTimeRange(filters: Filter_2[], timeFieldName?: string): { timeRange?: TimeRange; }; -// Warning: (ae-missing-release-tag) "FieldFormat" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export abstract class FieldFormat { - // Warning: (ae-forgotten-export) The symbol "IFieldFormatMetaParams" needs to be exported by the entry point index.d.ts - constructor(_params?: IFieldFormatMetaParams, getConfig?: FieldFormatsGetConfigFn); - // (undocumented) - allowsNumericalAggregations?: boolean; - // Warning: (ae-forgotten-export) The symbol "HtmlContextTypeOptions" needs to be exported by the entry point index.d.ts - // Warning: (ae-forgotten-export) The symbol "TextContextTypeOptions" needs to be exported by the entry point index.d.ts - convert(value: any, contentType?: FieldFormatsContentType, options?: HtmlContextTypeOptions | TextContextTypeOptions): string; - // Warning: (ae-forgotten-export) The symbol "FieldFormatConvert" needs to be exported by the entry point index.d.ts - convertObject: FieldFormatConvert | undefined; - static fieldType: string | string[]; - // Warning: (ae-incompatible-release-tags) The symbol "from" is marked as @public, but its signature references "FieldFormatInstanceType" which is marked as @internal - // - // (undocumented) - static from(convertFn: FieldFormatConvertFunction): FieldFormatInstanceType; - // (undocumented) - protected getConfig: FieldFormatsGetConfigFn | undefined; - // Warning: (ae-forgotten-export) The symbol "FieldFormatConvertFunction" needs to be exported by the entry point index.d.ts - getConverterFor(contentType?: FieldFormatsContentType): FieldFormatConvertFunction; - getParamDefaults(): Record; - static hidden: boolean; - // Warning: (ae-forgotten-export) The symbol "HtmlContextTypeConvert" needs to be exported by the entry point index.d.ts - htmlConvert: HtmlContextTypeConvert | undefined; - static id: string; - // (undocumented) - static isInstanceOfFieldFormat(fieldFormat: any): fieldFormat is FieldFormat; - param(name: string): any; - params(): Record; - // (undocumented) - protected readonly _params: any; - // (undocumented) - setupContentType(): FieldFormatConvert; - // Warning: (ae-forgotten-export) The symbol "TextContextTypeConvert" needs to be exported by the entry point index.d.ts - textConvert: TextContextTypeConvert | undefined; - static title: string; - toJSON(): { - id: any; - params: any; - }; - type: any; -} - -// Warning: (ae-missing-release-tag) "FieldFormatConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export interface FieldFormatConfig { - // (undocumented) - es?: boolean; - // (undocumented) - id: FieldFormatId; - // (undocumented) - params: Record; -} - -// Warning: (ae-forgotten-export) The symbol "FIELD_FORMAT_IDS" needs to be exported by the entry point index.d.ts -// Warning: (ae-missing-release-tag) "FieldFormatId" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public -export type FieldFormatId = FIELD_FORMAT_IDS | string; - -// @internal (undocumented) -export type FieldFormatInstanceType = (new (params?: any, getConfig?: FieldFormatsGetConfigFn) => FieldFormat) & { - id: FieldFormatId; - title: string; - hidden?: boolean; - fieldType: string | string[]; -}; - -// Warning: (ae-missing-release-tag) "fieldFormats" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export const fieldFormats: { - FieldFormat: typeof FieldFormat; - FieldFormatsRegistry: typeof FieldFormatsRegistry; - DEFAULT_CONVERTER_COLOR: { - range: string; - regex: string; - text: string; - background: string; - }; - HTML_CONTEXT_TYPE: import("../common").FieldFormatsContentType; - TEXT_CONTEXT_TYPE: import("../common").FieldFormatsContentType; - FIELD_FORMAT_IDS: typeof FIELD_FORMAT_IDS; - BoolFormat: typeof BoolFormat; - BytesFormat: typeof BytesFormat; - ColorFormat: typeof ColorFormat; - DateFormat: typeof DateFormat; - DateNanosFormat: typeof DateNanosFormat; - DurationFormat: typeof DurationFormat; - IpFormat: typeof IpFormat; - NumberFormat: typeof NumberFormat; - PercentFormat: typeof PercentFormat; - RelativeDateFormat: typeof RelativeDateFormat; - SourceFormat: typeof SourceFormat; - StaticLookupFormat: typeof StaticLookupFormat; - UrlFormat: typeof UrlFormat; - StringFormat: typeof StringFormat; - TruncateFormat: typeof TruncateFormat; - HistogramFormat: typeof HistogramFormat; -}; - -// @public (undocumented) -export type FieldFormatsContentType = 'html' | 'text'; - -// Warning: (ae-forgotten-export) The symbol "GetConfigFn" needs to be exported by the entry point index.d.ts -// Warning: (ae-missing-release-tag) "FieldFormatsGetConfigFn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export type FieldFormatsGetConfigFn = GetConfigFn; - -// @public (undocumented) -export type FieldFormatsStart = Omit & { - deserialize: FormatFactory; -}; - // Warning: (ae-forgotten-export) The symbol "FieldSpec" needs to be exported by the entry point index.d.ts // Warning: (ae-missing-release-tag) "fieldList" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // @@ -1191,16 +1066,6 @@ export interface IEsSearchRequest extends IKibanaSearchRequest = IKibanaSearchResponse>; -// Warning: (ae-missing-release-tag) "IFieldFormat" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export type IFieldFormat = FieldFormat; - -// Warning: (ae-missing-release-tag) "IFieldFormatsRegistry" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export type IFieldFormatsRegistry = PublicMethodsOf; - // Warning: (ae-forgotten-export) The symbol "FieldParamType" needs to be exported by the entry point index.d.ts // Warning: (ae-missing-release-tag) "IFieldParamType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // @@ -1254,6 +1119,7 @@ export interface IIndexPattern extends IndexPatternBase { fieldFormatMap?: Record | undefined>; // (undocumented) fields: IFieldType[]; + // Warning: (ae-forgotten-export) The symbol "FieldFormat" needs to be exported by the entry point index.d.ts getFormatterForField?: (field: IndexPatternField | IndexPatternField['spec'] | IFieldType) => FieldFormat; // (undocumented) getTimeField?(): IFieldType | undefined; @@ -2578,13 +2444,6 @@ export const UI_SETTINGS: { readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget"; readonly HISTOGRAM_MAX_BARS: "histogram:maxBars"; readonly HISTORY_LIMIT: "history:limit"; - readonly SHORT_DOTS_ENABLE: "shortDots:enable"; - readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap"; - readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern"; - readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern"; - readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern"; - readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern"; - readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale"; readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults"; readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges"; readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults"; @@ -2614,45 +2473,30 @@ export interface WaitUntilNextSessionCompletesOptions { // src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:139:7 - (ae-forgotten-export) The symbol "FieldAttrSet" needs to be exported by the entry point index.d.ts // src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:170:7 - (ae-forgotten-export) The symbol "RuntimeField" needs to be exported by the entry point index.d.ts // src/plugins/data/common/search/aggs/types.ts:128:51 - (ae-forgotten-export) The symbol "AggTypesRegistryStart" needs to be exported by the entry point index.d.ts +// src/plugins/data/common/search/search_source/fetch/get_search_params.ts:35:19 - (ae-forgotten-export) The symbol "GetConfigFn" needs to be exported by the entry point index.d.ts // src/plugins/data/public/deprecated.ts:98:23 - (ae-forgotten-export) The symbol "changeTimeFilter" needs to be exported by the entry point index.d.ts // src/plugins/data/public/deprecated.ts:98:23 - (ae-forgotten-export) The symbol "convertRangeFilterToTimeRangeString" needs to be exported by the entry point index.d.ts // src/plugins/data/public/deprecated.ts:98:23 - (ae-forgotten-export) The symbol "extractTimeFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/field_formats/field_formats_service.ts:51:3 - (ae-forgotten-export) The symbol "FormatFactory" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "FieldFormatsRegistry" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "BoolFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "BytesFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "ColorFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "DurationFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "IpFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "NumberFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "PercentFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "RelativeDateFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "SourceFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "StaticLookupFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "UrlFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "StringFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "TruncateFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "HistogramFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:96:23 - (ae-forgotten-export) The symbol "datatableToCSV" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:294:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:294:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:294:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:296:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:297:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:306:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:307:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:308:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:309:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:313:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:314:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:317:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:318:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:321:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:27:23 - (ae-forgotten-export) The symbol "datatableToCSV" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:225:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:225:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:225:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:227:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:228:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:237:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:238:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:239:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:240:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:244:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:245:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:248:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:249:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:252:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts // src/plugins/data/public/search/session/session_service.ts:62:5 - (ae-forgotten-export) The symbol "UrlGeneratorStateMapping" needs to be exported by the entry point index.d.ts // (No @packageDocumentation comment for this package) diff --git a/src/plugins/data/public/search/aggs/aggs_service.test.ts b/src/plugins/data/public/search/aggs/aggs_service.test.ts index cd2ee69d33996..563fd5d044073 100644 --- a/src/plugins/data/public/search/aggs/aggs_service.test.ts +++ b/src/plugins/data/public/search/aggs/aggs_service.test.ts @@ -11,7 +11,7 @@ import { BehaviorSubject, Subscription } from 'rxjs'; import { coreMock } from '../../../../../core/public/mocks'; import { expressionsPluginMock } from '../../../../../plugins/expressions/public/mocks'; import { BucketAggType, getAggTypes, MetricAggType } from '../../../common'; -import { fieldFormatsServiceMock } from '../../field_formats/mocks'; +import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks'; import { dataPluginMock } from '../../mocks'; import { diff --git a/src/plugins/data/public/search/aggs/aggs_service.ts b/src/plugins/data/public/search/aggs/aggs_service.ts index f603bd733f601..3f91ced6de950 100644 --- a/src/plugins/data/public/search/aggs/aggs_service.ts +++ b/src/plugins/data/public/search/aggs/aggs_service.ts @@ -10,7 +10,7 @@ import { Subscription } from 'rxjs'; import { IUiSettingsClient } from 'src/core/public'; import { ExpressionsServiceSetup } from 'src/plugins/expressions/common'; -import { FieldFormatsStart } from '../../field_formats'; +import { FieldFormatsStart } from '../../../../field_formats/public'; import { calculateBounds, TimeRange } from '../../../common'; import { aggsRequiredUiSettings, diff --git a/src/plugins/data/public/test_utils.ts b/src/plugins/data/public/test_utils.ts index b964ddbd2a379..613e3850c922e 100644 --- a/src/plugins/data/public/test_utils.ts +++ b/src/plugins/data/public/test_utils.ts @@ -6,5 +6,5 @@ * Side Public License, v 1. */ -export { getFieldFormatsRegistry } from './field_formats/field_formats_registry.stub'; +export { getFieldFormatsRegistry } from '../../field_formats/public/mocks'; export { getStubIndexPattern, StubIndexPattern } from './index_patterns/index_pattern.stub'; diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts index 5ba4ba2bc48af..d8bfcfdb6ddb1 100644 --- a/src/plugins/data/public/types.ts +++ b/src/plugins/data/public/types.ts @@ -12,8 +12,8 @@ import { BfetchPublicSetup } from 'src/plugins/bfetch/public'; import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; import { ExpressionsSetup } from 'src/plugins/expressions/public'; import { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public'; +import { FieldFormatsSetup, FieldFormatsStart } from 'src/plugins/field_formats/public'; import { AutocompleteSetup, AutocompleteStart } from './autocomplete'; -import { FieldFormatsSetup, FieldFormatsStart } from './field_formats'; import { createFiltersFromRangeSelectAction, createFiltersFromValueClickAction } from './actions'; import { ISearchSetup, ISearchStart } from './search'; import { QuerySetup, QueryStart } from './query'; @@ -29,10 +29,12 @@ export interface DataSetupDependencies { uiActions: UiActionsSetup; inspector: InspectorSetup; usageCollection?: UsageCollectionSetup; + fieldFormats: FieldFormatsSetup; } export interface DataStartDependencies { uiActions: UiActionsStart; + fieldFormats: FieldFormatsStart; } /** @@ -41,6 +43,9 @@ export interface DataStartDependencies { export interface DataPublicPluginSetup { autocomplete: AutocompleteSetup; search: ISearchSetup; + /** + * @deprecated Use fieldFormats plugin instead + */ fieldFormats: FieldFormatsSetup; query: QuerySetup; } @@ -86,8 +91,7 @@ export interface DataPublicPluginStart { */ search: ISearchStart; /** - * field formats service - * {@link FieldFormatsStart} + * @deprecated Use fieldFormats plugin instead */ fieldFormats: FieldFormatsStart; /** diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx index 5272834012eab..de72f16358098 100644 --- a/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx +++ b/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx @@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n'; import { DataViewRow, DataViewColumn } from '../types'; import { IUiSettingsClient } from '../../../../../../core/public'; import { Datatable, DatatableColumn } from '../../../../../expressions/public'; -import { FieldFormatsStart } from '../../../field_formats'; +import { FieldFormatsStart } from '../../../../../field_formats/public'; import { UiActionsStart } from '../../../../../ui_actions/public'; interface DataTableFormatState { diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx index 61a4daa3fc36a..bfdd2d602de19 100644 --- a/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx +++ b/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx @@ -15,7 +15,7 @@ import { DataTableFormat } from './data_table'; import { IUiSettingsClient } from '../../../../../../core/public'; import { InspectorViewProps, Adapters } from '../../../../../inspector/public'; import { UiActionsStart } from '../../../../../ui_actions/public'; -import { FieldFormatsStart } from '../../../field_formats'; +import { FieldFormatsStart } from '../../../../../field_formats/public'; import { TablesAdapter, Datatable, DatatableColumn } from '../../../../../expressions/public'; import { TableSelector } from './data_table_selector'; import { DataDownloadOptions } from './download_options'; diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx index 4204a48925bfe..1e0ebe3e3d907 100644 --- a/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx +++ b/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx @@ -9,7 +9,7 @@ import React, { lazy } from 'react'; import { IUiSettingsClient } from 'kibana/public'; import { UiActionsStart } from '../../../../../ui_actions/public'; -import { FieldFormatsStart } from '../../../field_formats'; +import { FieldFormatsStart } from '../../../../../field_formats/public'; import { DatatableColumn } from '../../../../../expressions/common/expression_types/specs'; const DataViewComponent = lazy(() => import('./data_view')); diff --git a/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx b/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx index e79a1c2b52e03..57e586eaf12f8 100644 --- a/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx +++ b/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx @@ -22,7 +22,7 @@ import { import { CSV_MIME_TYPE, datatableToCSV, tableHasFormulas } from '../../../../common'; import { Datatable } from '../../../../../expressions'; import { downloadMultipleAs } from '../../../../../share/public'; -import { FieldFormatsStart } from '../../../field_formats'; +import { FieldFormatsStart } from '../../../../../field_formats/public'; import { IUiSettingsClient } from '../../../../../../core/public'; interface DataDownloadOptionsState { diff --git a/src/plugins/data/public/utils/table_inspector_view/index.ts b/src/plugins/data/public/utils/table_inspector_view/index.ts index 10c74bbc99dd0..498fe8d7fcca0 100644 --- a/src/plugins/data/public/utils/table_inspector_view/index.ts +++ b/src/plugins/data/public/utils/table_inspector_view/index.ts @@ -11,7 +11,7 @@ import { IUiSettingsClient } from 'kibana/public'; import { Adapters, InspectorViewDescription } from '../../../../inspector/public'; import { getDataViewComponentWrapper } from './components/data_view_wrapper'; import { UiActionsStart } from '../../../../ui_actions/public'; -import { FieldFormatsStart } from '../../field_formats'; +import { FieldFormatsStart } from '../../../../field_formats/public'; import { DatatableColumn } from '../../../../expressions/common/expression_types/specs'; export const getTableViewDescription = ( diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts index e5656ceabc151..d010819d14e94 100644 --- a/src/plugins/data/server/index.ts +++ b/src/plugins/data/server/index.ts @@ -27,50 +27,7 @@ export const exporters = { * Field Formats: */ -import { - FieldFormatsRegistry, - FieldFormat, - BoolFormat, - BytesFormat, - ColorFormat, - DurationFormat, - IpFormat, - NumberFormat, - PercentFormat, - RelativeDateFormat, - SourceFormat, - StaticLookupFormat, - UrlFormat, - StringFormat, - TruncateFormat, - HistogramFormat, -} from '../common/field_formats'; - -export const fieldFormats = { - FieldFormatsRegistry, - FieldFormat, - BoolFormat, - BytesFormat, - ColorFormat, - DurationFormat, - IpFormat, - NumberFormat, - PercentFormat, - RelativeDateFormat, - SourceFormat, - StaticLookupFormat, - UrlFormat, - StringFormat, - TruncateFormat, - HistogramFormat, -}; - -export { - IFieldFormatsRegistry, - FieldFormatsGetConfigFn, - FieldFormatConfig, - INDEX_PATTERN_SAVED_OBJECT_TYPE, -} from '../common'; +export { INDEX_PATTERN_SAVED_OBJECT_TYPE } from '../common'; /* * Index patterns: diff --git a/src/plugins/data/server/index_patterns/index_patterns_service.ts b/src/plugins/data/server/index_patterns/index_patterns_service.ts index 4269f15127daf..c3cdc65d3fa04 100644 --- a/src/plugins/data/server/index_patterns/index_patterns_service.ts +++ b/src/plugins/data/server/index_patterns/index_patterns_service.ts @@ -22,7 +22,7 @@ import { registerRoutes } from './routes'; import { indexPatternSavedObjectType } from '../saved_objects'; import { capabilitiesProvider } from './capabilities_provider'; import { IndexPatternsCommonService } from '../'; -import { FieldFormatsStart } from '../field_formats'; +import { FieldFormatsStart } from '../../../field_formats/server'; import { getIndexPatternLoad } from './expressions'; import { UiSettingsServerToCommon } from './ui_settings_wrapper'; import { IndexPatternsApiServer } from './index_patterns_api_client'; diff --git a/src/plugins/data/server/mocks.ts b/src/plugins/data/server/mocks.ts index 786dd30dbabd0..af104dea72af7 100644 --- a/src/plugins/data/server/mocks.ts +++ b/src/plugins/data/server/mocks.ts @@ -11,13 +11,19 @@ import { createSearchStartMock, createSearchRequestHandlerContext, } from './search/mocks'; -import { createFieldFormatsSetupMock, createFieldFormatsStartMock } from './field_formats/mocks'; +import { + createFieldFormatsSetupMock, + createFieldFormatsStartMock, +} from '../../field_formats/server/mocks'; import { createIndexPatternsStartMock } from './index_patterns/mocks'; import { DataRequestHandlerContext } from './search'; function createSetupContract() { return { search: createSearchSetupMock(), + /** + * @deprecated - use directly from "fieldFormats" plugin instead + */ fieldFormats: createFieldFormatsSetupMock(), }; } @@ -25,6 +31,9 @@ function createSetupContract() { function createStartContract() { return { search: createSearchStartMock(), + /** + * @deprecated - use directly from "fieldFormats" plugin instead + */ fieldFormats: createFieldFormatsStartMock(), indexPatterns: createIndexPatternsStartMock(), }; diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts index 7b73802f1a34d..e04095ed26a46 100644 --- a/src/plugins/data/server/plugin.ts +++ b/src/plugins/data/server/plugin.ts @@ -18,7 +18,7 @@ import { ScriptsService } from './scripts'; import { KqlTelemetryService } from './kql_telemetry'; import { UsageCollectionSetup } from '../../usage_collection/server'; import { AutocompleteService } from './autocomplete'; -import { FieldFormatsService, FieldFormatsSetup, FieldFormatsStart } from './field_formats'; +import { FieldFormatsSetup, FieldFormatsStart } from '../../field_formats/server'; import { getUiSettings } from './ui_settings'; export interface DataEnhancements { @@ -27,6 +27,9 @@ export interface DataEnhancements { export interface DataPluginSetup { search: ISearchSetup; + /** + * @deprecated - use "fieldFormats" plugin directly instead + */ fieldFormats: FieldFormatsSetup; /** * @internal @@ -36,6 +39,9 @@ export interface DataPluginSetup { export interface DataPluginStart { search: ISearchStart; + /** + * @deprecated - use "fieldFormats" plugin directly instead + */ fieldFormats: FieldFormatsStart; indexPatterns: IndexPatternsServiceStart; } @@ -44,6 +50,7 @@ export interface DataPluginSetupDependencies { bfetch: BfetchServerSetup; expressions: ExpressionsServerSetup; usageCollection?: UsageCollectionSetup; + fieldFormats: FieldFormatsSetup; } export interface DataPluginStartDependencies { @@ -64,7 +71,6 @@ export class DataServerPlugin private readonly kqlTelemetryService: KqlTelemetryService; private readonly autocompleteService: AutocompleteService; private readonly indexPatterns = new IndexPatternsServiceProvider(); - private readonly fieldFormats = new FieldFormatsService(); private readonly queryService = new QueryService(); private readonly logger: Logger; @@ -78,7 +84,7 @@ export class DataServerPlugin public setup( core: CoreSetup, - { bfetch, expressions, usageCollection }: DataPluginSetupDependencies + { bfetch, expressions, usageCollection, fieldFormats }: DataPluginSetupDependencies ) { this.scriptsService.setup(core); this.queryService.setup(core); @@ -103,12 +109,11 @@ export class DataServerPlugin searchSetup.__enhance(enhancements.search); }, search: searchSetup, - fieldFormats: this.fieldFormats.setup(), + fieldFormats, }; } - public start(core: CoreStart) { - const fieldFormats = this.fieldFormats.start(); + public start(core: CoreStart, { fieldFormats }: DataPluginStartDependencies) { const indexPatterns = this.indexPatterns.start(core, { fieldFormats, logger: this.logger.get('indexPatterns'), diff --git a/src/plugins/data/server/search/aggs/aggs_service.test.ts b/src/plugins/data/server/search/aggs/aggs_service.test.ts index 0a4f54ee339a1..fdff2a4a8118c 100644 --- a/src/plugins/data/server/search/aggs/aggs_service.test.ts +++ b/src/plugins/data/server/search/aggs/aggs_service.test.ts @@ -11,7 +11,7 @@ import { KibanaRequest, ElasticsearchClient } from 'src/core/server'; import { coreMock } from '../../../../../core/server/mocks'; import { expressionsPluginMock } from '../../../../../plugins/expressions/server/mocks'; import { BucketAggType, getAggTypes, MetricAggType } from '../../../common'; -import { createFieldFormatsStartMock } from '../../field_formats/mocks'; +import { createFieldFormatsStartMock } from '../../../../field_formats/server/mocks'; import { createIndexPatternsStartMock } from '../../index_patterns/mocks'; import { AggsService, AggsSetupDependencies, AggsStartDependencies } from './aggs_service'; diff --git a/src/plugins/data/server/search/aggs/aggs_service.ts b/src/plugins/data/server/search/aggs/aggs_service.ts index 96927728f2f2f..197d8fd7caa99 100644 --- a/src/plugins/data/server/search/aggs/aggs_service.ts +++ b/src/plugins/data/server/search/aggs/aggs_service.ts @@ -22,7 +22,7 @@ import { calculateBounds, TimeRange, } from '../../../common'; -import { FieldFormatsStart } from '../../field_formats'; +import { FieldFormatsStart } from '../../../../field_formats/server'; import { IndexPatternsServiceStart } from '../../index_patterns'; import { AggsSetup, AggsStart } from './types'; diff --git a/src/plugins/data/server/search/search_service.test.ts b/src/plugins/data/server/search/search_service.test.ts index 314cb2c3acbf8..e6db3c76ef9ba 100644 --- a/src/plugins/data/server/search/search_service.test.ts +++ b/src/plugins/data/server/search/search_service.test.ts @@ -11,7 +11,7 @@ import { CoreSetup, CoreStart, SavedObject } from '../../../../core/server'; import { coreMock } from '../../../../core/server/mocks'; import { DataPluginStart, DataPluginStartDependencies } from '../plugin'; -import { createFieldFormatsStartMock } from '../field_formats/mocks'; +import { createFieldFormatsStartMock } from '../../../field_formats/server/mocks'; import { createIndexPatternsStartMock } from '../index_patterns/mocks'; import { SearchService, SearchServiceSetupDependencies } from './search_service'; diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts index cc7981220fa6f..5b4ff121f3c77 100644 --- a/src/plugins/data/server/search/search_service.ts +++ b/src/plugins/data/server/search/search_service.ts @@ -34,7 +34,7 @@ import type { import { AggsService } from './aggs'; -import { FieldFormatsStart } from '../field_formats'; +import { FieldFormatsStart } from '../../../field_formats/server'; import { IndexPatternsServiceStart } from '../index_patterns'; import { registerMsearchRoute, registerSearchRoute } from './routes'; import { ES_SEARCH_STRATEGY, esSearchStrategyProvider } from './strategies/es_search'; diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md index 9d5e598588f25..51436dabe05a0 100644 --- a/src/plugins/data/server/server.api.md +++ b/src/plugins/data/server/server.api.md @@ -33,7 +33,6 @@ import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; import { ExpressionsServerSetup } from 'src/plugins/expressions/server'; import { ExpressionValueBoxed } from 'src/plugins/expressions/common'; import { Filter as Filter_2 } from '@kbn/es-query'; -import { FormatFactory as FormatFactory_2 } from 'src/plugins/data/common/field_formats/utils'; import { IAggConfigs as IAggConfigs_2 } from 'src/plugins/data/public'; import { IEsSearchResponse as IEsSearchResponse_2 } from 'src/plugins/data/public'; import { IFieldSubType as IFieldSubType_2 } from '@kbn/es-query'; @@ -60,7 +59,6 @@ import { PathConfigType } from '@kbn/utils'; import { Plugin as Plugin_2 } from 'src/core/server'; import { Plugin as Plugin_3 } from 'kibana/server'; import { PluginInitializerContext as PluginInitializerContext_2 } from 'src/core/server'; -import { PublicMethodsOf } from '@kbn/utility-types'; import { Query } from '@kbn/es-query'; import { RecursiveReadonly } from '@kbn/utility-types'; import { RequestAdapter } from 'src/plugins/inspector/common'; @@ -73,7 +71,7 @@ import { SavedObjectsFindOptions } from 'kibana/server'; import { SavedObjectsFindResponse } from 'kibana/server'; import { SavedObjectsUpdateResponse } from 'kibana/server'; import { Search } from '@elastic/elasticsearch/api/requestParams'; -import { SerializedFieldFormat as SerializedFieldFormat_2 } from 'src/plugins/expressions/common'; +import { SerializedFieldFormat as SerializedFieldFormat_3 } from 'src/plugins/expressions/common'; import { SharedGlobalConfig as SharedGlobalConfig_2 } from 'kibana/server'; import { ToastInputFields } from 'src/core/public/notifications'; import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport'; @@ -488,48 +486,6 @@ export { FieldDescriptor } export { FieldDescriptor as IndexPatternFieldDescriptor } -// Warning: (ae-missing-release-tag) "FieldFormatConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export interface FieldFormatConfig { - // (undocumented) - es?: boolean; - // Warning: (ae-forgotten-export) The symbol "FieldFormatId" needs to be exported by the entry point index.d.ts - // - // (undocumented) - id: FieldFormatId; - // (undocumented) - params: Record; -} - -// Warning: (ae-missing-release-tag) "fieldFormats" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export const fieldFormats: { - FieldFormatsRegistry: typeof FieldFormatsRegistry; - FieldFormat: typeof FieldFormat; - BoolFormat: typeof BoolFormat; - BytesFormat: typeof BytesFormat; - ColorFormat: typeof ColorFormat; - DurationFormat: typeof DurationFormat; - IpFormat: typeof IpFormat; - NumberFormat: typeof NumberFormat; - PercentFormat: typeof PercentFormat; - RelativeDateFormat: typeof RelativeDateFormat; - SourceFormat: typeof SourceFormat; - StaticLookupFormat: typeof StaticLookupFormat; - UrlFormat: typeof UrlFormat; - StringFormat: typeof StringFormat; - TruncateFormat: typeof TruncateFormat; - HistogramFormat: typeof HistogramFormat; -}; - -// Warning: (ae-forgotten-export) The symbol "GetConfigFn" needs to be exported by the entry point index.d.ts -// Warning: (ae-missing-release-tag) "FieldFormatsGetConfigFn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export type FieldFormatsGetConfigFn = GetConfigFn; - // Warning: (ae-missing-release-tag) "Filter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public @deprecated (undocumented) @@ -607,11 +563,6 @@ export interface IEsSearchRequest extends IKibanaSearchRequest = IKibanaSearchResponse>; -// Warning: (ae-missing-release-tag) "IFieldFormatsRegistry" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export type IFieldFormatsRegistry = PublicMethodsOf; - // Warning: (ae-forgotten-export) The symbol "FieldParamType" needs to be exported by the entry point index.d.ts // Warning: (ae-missing-release-tag) "IFieldParamType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // @@ -721,6 +672,7 @@ export class IndexPattern implements IIndexPattern { }; // (undocumented) getFieldByName(name: string): IndexPatternField | undefined; + // Warning: (ae-forgotten-export) The symbol "FieldFormat" needs to be exported by the entry point index.d.ts getFormatterForField(field: IndexPatternField | IndexPatternField['spec'] | IFieldType): FieldFormat; getFormatterForFieldNoDefault(fieldname: string): FieldFormat | undefined; // @deprecated (undocumented) @@ -769,7 +721,7 @@ export class IndexPattern implements IIndexPattern { // Warning: (ae-forgotten-export) The symbol "SerializedFieldFormat" needs to be exported by the entry point index.d.ts // // (undocumented) - readonly setFieldFormat: (fieldName: string, format: SerializedFieldFormat) => void; + readonly setFieldFormat: (fieldName: string, format: SerializedFieldFormat_2) => void; // Warning: (ae-forgotten-export) The symbol "SourceFilter" needs to be exported by the entry point index.d.ts // // (undocumented) @@ -1196,18 +1148,14 @@ export function parseInterval(interval: string): moment.Duration | null; export class Plugin implements Plugin_2 { constructor(initializerContext: PluginInitializerContext_2); // (undocumented) - setup(core: CoreSetup, { bfetch, expressions, usageCollection }: DataPluginSetupDependencies): { + setup(core: CoreSetup, { bfetch, expressions, usageCollection, fieldFormats }: DataPluginSetupDependencies): { __enhance: (enhancements: DataEnhancements) => void; search: ISearchSetup; - fieldFormats: { - register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number; - }; + fieldFormats: FieldFormatsSetup; }; // (undocumented) - start(core: CoreStart_2): { - fieldFormats: { - fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise; - }; + start(core: CoreStart_2, { fieldFormats }: DataPluginStartDependencies): { + fieldFormats: FieldFormatsStart; indexPatterns: { indexPatternsServiceFactory: (savedObjectsClient: Pick, elasticsearchClient: import("../../../core/server").ElasticsearchClient) => Promise; }; @@ -1228,9 +1176,7 @@ export function plugin(initializerContext: PluginInitializerContext void; - // Warning: (ae-forgotten-export) The symbol "FieldFormatsSetup" needs to be exported by the entry point index.d.ts - // - // (undocumented) + // @deprecated (undocumented) fieldFormats: FieldFormatsSetup; // (undocumented) search: ISearchSetup; @@ -1240,9 +1186,7 @@ export interface PluginSetup { // // @public (undocumented) export interface PluginStart { - // Warning: (ae-forgotten-export) The symbol "FieldFormatsStart" needs to be exported by the entry point index.d.ts - // - // (undocumented) + // @deprecated (undocumented) fieldFormats: FieldFormatsStart; // (undocumented) indexPatterns: IndexPatternsServiceStart; @@ -1425,13 +1369,6 @@ export const UI_SETTINGS: { readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget"; readonly HISTOGRAM_MAX_BARS: "histogram:maxBars"; readonly HISTORY_LIMIT: "history:limit"; - readonly SHORT_DOTS_ENABLE: "shortDots:enable"; - readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap"; - readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern"; - readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern"; - readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern"; - readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern"; - readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale"; readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults"; readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges"; readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults"; @@ -1455,37 +1392,23 @@ export function usageProvider(core: CoreSetup_2): SearchUsage; // src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:139:7 - (ae-forgotten-export) The symbol "FieldAttrSet" needs to be exported by the entry point index.d.ts // src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts:170:7 - (ae-forgotten-export) The symbol "RuntimeField" needs to be exported by the entry point index.d.ts // src/plugins/data/server/index.ts:21:23 - (ae-forgotten-export) The symbol "datatableToCSV" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "FieldFormatsRegistry" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "FieldFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "BoolFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "BytesFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "ColorFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "DurationFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "IpFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "NumberFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "PercentFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "RelativeDateFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "SourceFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "StaticLookupFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "UrlFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "StringFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "TruncateFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:49:26 - (ae-forgotten-export) The symbol "HistogramFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:81:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:81:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:198:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:198:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:200:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:201:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:210:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:211:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:212:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:216:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:217:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:221:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:224:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/index.ts:225:1 - (ae-forgotten-export) The symbol "calcAutoIntervalLessThan" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/plugin.ts:81:74 - (ae-forgotten-export) The symbol "DataEnhancements" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:38:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:38:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:155:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:155:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:157:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:158:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:167:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:168:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:169:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:173:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:174:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:178:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:181:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/index.ts:182:1 - (ae-forgotten-export) The symbol "calcAutoIntervalLessThan" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/plugin.ts:87:88 - (ae-forgotten-export) The symbol "DataEnhancements" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/plugin.ts:110:7 - (ae-forgotten-export) The symbol "FieldFormatsSetup" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/plugin.ts:117:14 - (ae-forgotten-export) The symbol "FieldFormatsStart" needs to be exported by the entry point index.d.ts // src/plugins/data/server/search/types.ts:120:5 - (ae-forgotten-export) The symbol "ISearchStartSearchSource" needs to be exported by the entry point index.d.ts // (No @packageDocumentation comment for this package) diff --git a/src/plugins/data/server/ui_settings.ts b/src/plugins/data/server/ui_settings.ts index 0723c4b2d85c2..360529ad5a735 100644 --- a/src/plugins/data/server/ui_settings.ts +++ b/src/plugins/data/server/ui_settings.ts @@ -9,8 +9,6 @@ import { i18n } from '@kbn/i18n'; import { schema } from '@kbn/config-schema'; import { UiSettingsParams } from 'kibana/server'; -// @ts-ignore untyped module -import numeralLanguages from '@elastic/numeral/languages'; import { DEFAULT_QUERY_LANGUAGE, UI_SETTINGS } from '../common'; const luceneQueryLanguageLabel = i18n.translate('data.advancedSettings.searchQueryLanguageLucene', { @@ -33,15 +31,6 @@ const requestPreferenceOptionLabels = { }), }; -// We add the `en` key manually here, since that's not a real numeral locale, but the -// default fallback in case the locale is not found. -const numeralLanguageIds = [ - 'en', - ...numeralLanguages.map((numeralLanguage: any) => { - return numeralLanguage.id; - }), -]; - export function getUiSettings(): Record> { return { [UI_SETTINGS.META_FIELDS]: { @@ -341,192 +330,6 @@ export function getUiSettings(): Record> { }), schema: schema.number(), }, - [UI_SETTINGS.SHORT_DOTS_ENABLE]: { - name: i18n.translate('data.advancedSettings.shortenFieldsTitle', { - defaultMessage: 'Shorten fields', - }), - value: false, - description: i18n.translate('data.advancedSettings.shortenFieldsText', { - defaultMessage: 'Shorten long fields, for example, instead of foo.bar.baz, show f.b.baz', - }), - schema: schema.boolean(), - }, - [UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP]: { - name: i18n.translate('data.advancedSettings.format.defaultTypeMapTitle', { - defaultMessage: 'Field type format name', - }), - value: `{ - "ip": { "id": "ip", "params": {} }, - "date": { "id": "date", "params": {} }, - "date_nanos": { "id": "date_nanos", "params": {}, "es": true }, - "number": { "id": "number", "params": {} }, - "boolean": { "id": "boolean", "params": {} }, - "histogram": { "id": "histogram", "params": {} }, - "_source": { "id": "_source", "params": {} }, - "_default_": { "id": "string", "params": {} } -}`, - type: 'json', - description: i18n.translate('data.advancedSettings.format.defaultTypeMapText', { - defaultMessage: - 'Map of the format name to use by default for each field type. ' + - '{defaultFormat} is used if the field type is not mentioned explicitly', - values: { - defaultFormat: '"_default_"', - }, - }), - schema: schema.object({ - ip: schema.object({ - id: schema.string(), - params: schema.object({}), - }), - date: schema.object({ - id: schema.string(), - params: schema.object({}), - }), - date_nanos: schema.object({ - id: schema.string(), - params: schema.object({}), - es: schema.boolean(), - }), - number: schema.object({ - id: schema.string(), - params: schema.object({}), - }), - boolean: schema.object({ - id: schema.string(), - params: schema.object({}), - }), - histogram: schema.object({ - id: schema.string(), - params: schema.object({}), - }), - _source: schema.object({ - id: schema.string(), - params: schema.object({}), - }), - _default_: schema.object({ - id: schema.string(), - params: schema.object({}), - }), - }), - }, - [UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN]: { - name: i18n.translate('data.advancedSettings.format.numberFormatTitle', { - defaultMessage: 'Number format', - }), - value: '0,0.[000]', - type: 'string', - description: i18n.translate('data.advancedSettings.format.numberFormatText', { - defaultMessage: 'Default {numeralFormatLink} for the "number" format', - description: - 'Part of composite text: data.advancedSettings.format.numberFormatText + ' + - 'data.advancedSettings.format.numberFormat.numeralFormatLinkText', - values: { - numeralFormatLink: - '' + - i18n.translate('data.advancedSettings.format.numberFormat.numeralFormatLinkText', { - defaultMessage: 'numeral format', - }) + - '', - }, - }), - schema: schema.string(), - }, - [UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: { - name: i18n.translate('data.advancedSettings.format.percentFormatTitle', { - defaultMessage: 'Percent format', - }), - value: '0,0.[000]%', - type: 'string', - description: i18n.translate('data.advancedSettings.format.percentFormatText', { - defaultMessage: 'Default {numeralFormatLink} for the "percent" format', - description: - 'Part of composite text: data.advancedSettings.format.percentFormatText + ' + - 'data.advancedSettings.format.percentFormat.numeralFormatLinkText', - values: { - numeralFormatLink: - '' + - i18n.translate('data.advancedSettings.format.percentFormat.numeralFormatLinkText', { - defaultMessage: 'numeral format', - }) + - '', - }, - }), - schema: schema.string(), - }, - [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: { - name: i18n.translate('data.advancedSettings.format.bytesFormatTitle', { - defaultMessage: 'Bytes format', - }), - value: '0,0.[0]b', - type: 'string', - description: i18n.translate('data.advancedSettings.format.bytesFormatText', { - defaultMessage: 'Default {numeralFormatLink} for the "bytes" format', - description: - 'Part of composite text: data.advancedSettings.format.bytesFormatText + ' + - 'data.advancedSettings.format.bytesFormat.numeralFormatLinkText', - values: { - numeralFormatLink: - '' + - i18n.translate('data.advancedSettings.format.bytesFormat.numeralFormatLinkText', { - defaultMessage: 'numeral format', - }) + - '', - }, - }), - schema: schema.string(), - }, - [UI_SETTINGS.FORMAT_CURRENCY_DEFAULT_PATTERN]: { - name: i18n.translate('data.advancedSettings.format.currencyFormatTitle', { - defaultMessage: 'Currency format', - }), - value: '($0,0.[00])', - type: 'string', - description: i18n.translate('data.advancedSettings.format.currencyFormatText', { - defaultMessage: 'Default {numeralFormatLink} for the "currency" format', - description: - 'Part of composite text: data.advancedSettings.format.currencyFormatText + ' + - 'data.advancedSettings.format.currencyFormat.numeralFormatLinkText', - values: { - numeralFormatLink: - '' + - i18n.translate('data.advancedSettings.format.currencyFormat.numeralFormatLinkText', { - defaultMessage: 'numeral format', - }) + - '', - }, - }), - schema: schema.string(), - }, - [UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE]: { - name: i18n.translate('data.advancedSettings.format.formattingLocaleTitle', { - defaultMessage: 'Formatting locale', - }), - value: 'en', - type: 'select', - options: numeralLanguageIds, - optionLabels: Object.fromEntries( - numeralLanguages.map((language: Record) => [language.id, language.name]) - ), - description: i18n.translate('data.advancedSettings.format.formattingLocaleText', { - defaultMessage: `{numeralLanguageLink} locale`, - description: - 'Part of composite text: data.advancedSettings.format.formattingLocale.numeralLanguageLinkText + ' + - 'data.advancedSettings.format.formattingLocaleText', - values: { - numeralLanguageLink: - '' + - i18n.translate( - 'data.advancedSettings.format.formattingLocale.numeralLanguageLinkText', - { - defaultMessage: 'Numeral language', - } - ) + - '', - }, - }), - schema: schema.string(), - }, [UI_SETTINGS.TIMEPICKER_REFRESH_INTERVAL_DEFAULTS]: { name: i18n.translate('data.advancedSettings.timepicker.refreshIntervalDefaultsTitle', { defaultMessage: 'Time filter refresh interval', diff --git a/src/plugins/data/tsconfig.json b/src/plugins/data/tsconfig.json index 9c95878af631e..6e4e89f7538fd 100644 --- a/src/plugins/data/tsconfig.json +++ b/src/plugins/data/tsconfig.json @@ -23,6 +23,7 @@ { "path": "../inspector/tsconfig.json" }, { "path": "../usage_collection/tsconfig.json" }, { "path": "../kibana_utils/tsconfig.json" }, - { "path": "../kibana_react/tsconfig.json" } + { "path": "../kibana_react/tsconfig.json" }, + { "path": "../field_formats/tsconfig.json" } ] } diff --git a/src/plugins/discover/kibana.json b/src/plugins/discover/kibana.json index 04469e0ef4276..f612e0ec2cc8d 100644 --- a/src/plugins/discover/kibana.json +++ b/src/plugins/discover/kibana.json @@ -16,7 +16,7 @@ "indexPatternFieldEditor" ], "optionalPlugins": ["home", "share", "usageCollection"], - "requiredBundles": ["kibanaUtils", "home", "kibanaReact"], + "requiredBundles": ["kibanaUtils", "home", "kibanaReact", "fieldFormats"], "owner": { "name": "Kibana App", "githubTeam": "kibana-app" diff --git a/src/plugins/discover/public/application/angular/doc_table/components/table_header.ts b/src/plugins/discover/public/application/angular/doc_table/components/table_header.ts index 5e3a025d8c7ba..0f6c86df0db64 100644 --- a/src/plugins/discover/public/application/angular/doc_table/components/table_header.ts +++ b/src/plugins/discover/public/application/angular/doc_table/components/table_header.ts @@ -9,7 +9,7 @@ import { TableHeader } from './table_header/table_header'; import { getServices } from '../../../../kibana_services'; import { SORT_DEFAULT_ORDER_SETTING, DOC_HIDE_TIME_COLUMN_SETTING } from '../../../../../common'; -import { UI_SETTINGS } from '../../../../../../data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common'; // eslint-disable-next-line @typescript-eslint/no-explicit-any export function createTableHeaderDirective(reactDirective: any) { @@ -30,7 +30,7 @@ export function createTableHeaderDirective(reactDirective: any) { { restrict: 'A' }, { hideTimeColumn: config.get(DOC_HIDE_TIME_COLUMN_SETTING, false), - isShortDots: config.get(UI_SETTINGS.SHORT_DOTS_ENABLE), + isShortDots: config.get(FORMATS_UI_SETTINGS.SHORT_DOTS_ENABLE), defaultSortOrder: config.get(SORT_DEFAULT_ORDER_SETTING, 'desc'), } ); diff --git a/src/plugins/discover/public/application/angular/helpers/row_formatter.test.ts b/src/plugins/discover/public/application/angular/helpers/row_formatter.test.ts index 80fb8a570f78b..6b356446850e6 100644 --- a/src/plugins/discover/public/application/angular/helpers/row_formatter.test.ts +++ b/src/plugins/discover/public/application/angular/helpers/row_formatter.test.ts @@ -9,7 +9,7 @@ import { formatRow, formatTopLevelObject } from './row_formatter'; import { stubbedSavedObjectIndexPattern } from '../../../__mocks__/stubbed_saved_object_index_pattern'; import { IndexPattern } from '../../../../../data/common/index_patterns/index_patterns'; -import { fieldFormatsMock } from '../../../../../data/common/field_formats/mocks'; +import { fieldFormatsMock } from '../../../../../field_formats/common/mocks'; import { setServices } from '../../../kibana_services'; import { DiscoverServices } from '../../../build_services'; diff --git a/src/plugins/discover/tsconfig.json b/src/plugins/discover/tsconfig.json index c0179ad3c8d20..8c71091e3ecf2 100644 --- a/src/plugins/discover/tsconfig.json +++ b/src/plugins/discover/tsconfig.json @@ -24,6 +24,7 @@ { "path": "../kibana_utils/tsconfig.json" }, { "path": "../kibana_react/tsconfig.json" }, { "path": "../kibana_legacy/tsconfig.json" }, - { "path": "../index_pattern_field_editor/tsconfig.json"} + { "path": "../index_pattern_field_editor/tsconfig.json"}, + { "path": "../field_formats/tsconfig.json" } ] } diff --git a/src/plugins/field_formats/README.md b/src/plugins/field_formats/README.md new file mode 100755 index 0000000000000..1bb519af87acf --- /dev/null +++ b/src/plugins/field_formats/README.md @@ -0,0 +1,3 @@ +# Field formats + +Index pattern fields formatters diff --git a/src/plugins/data/common/field_formats/constants/base_formatters.ts b/src/plugins/field_formats/common/constants/base_formatters.ts similarity index 100% rename from src/plugins/data/common/field_formats/constants/base_formatters.ts rename to src/plugins/field_formats/common/constants/base_formatters.ts diff --git a/src/plugins/data/common/field_formats/constants/color_default.ts b/src/plugins/field_formats/common/constants/color_default.ts similarity index 100% rename from src/plugins/data/common/field_formats/constants/color_default.ts rename to src/plugins/field_formats/common/constants/color_default.ts diff --git a/src/plugins/field_formats/common/constants/ui_settings.ts b/src/plugins/field_formats/common/constants/ui_settings.ts new file mode 100644 index 0000000000000..98bae6bcf39d3 --- /dev/null +++ b/src/plugins/field_formats/common/constants/ui_settings.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +export const FORMATS_UI_SETTINGS = { + FORMAT_DEFAULT_TYPE_MAP: 'format:defaultTypeMap', + FORMAT_NUMBER_DEFAULT_PATTERN: 'format:number:defaultPattern', + FORMAT_PERCENT_DEFAULT_PATTERN: 'format:percent:defaultPattern', + FORMAT_BYTES_DEFAULT_PATTERN: 'format:bytes:defaultPattern', + FORMAT_CURRENCY_DEFAULT_PATTERN: 'format:currency:defaultPattern', + FORMAT_NUMBER_DEFAULT_LOCALE: 'format:number:defaultLocale', + SHORT_DOTS_ENABLE: 'shortDots:enable', +} as const; diff --git a/src/plugins/data/common/field_formats/content_types/html_content_type.ts b/src/plugins/field_formats/common/content_types/html_content_type.ts similarity index 100% rename from src/plugins/data/common/field_formats/content_types/html_content_type.ts rename to src/plugins/field_formats/common/content_types/html_content_type.ts diff --git a/src/plugins/data/common/field_formats/content_types/index.ts b/src/plugins/field_formats/common/content_types/index.ts similarity index 100% rename from src/plugins/data/common/field_formats/content_types/index.ts rename to src/plugins/field_formats/common/content_types/index.ts diff --git a/src/plugins/data/common/field_formats/content_types/text_content_type.ts b/src/plugins/field_formats/common/content_types/text_content_type.ts similarity index 100% rename from src/plugins/data/common/field_formats/content_types/text_content_type.ts rename to src/plugins/field_formats/common/content_types/text_content_type.ts diff --git a/src/plugins/data/common/field_formats/converters/boolean.test.ts b/src/plugins/field_formats/common/converters/boolean.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/boolean.test.ts rename to src/plugins/field_formats/common/converters/boolean.test.ts diff --git a/src/plugins/data/common/field_formats/converters/boolean.ts b/src/plugins/field_formats/common/converters/boolean.ts similarity index 94% rename from src/plugins/data/common/field_formats/converters/boolean.ts rename to src/plugins/field_formats/common/converters/boolean.ts index d70501bf0f9d5..674e02fac8de0 100644 --- a/src/plugins/data/common/field_formats/converters/boolean.ts +++ b/src/plugins/field_formats/common/converters/boolean.ts @@ -14,7 +14,7 @@ import { asPrettyString } from '../utils'; export class BoolFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.BOOLEAN; - static title = i18n.translate('data.fieldFormats.boolean.title', { + static title = i18n.translate('fieldFormats.boolean.title', { defaultMessage: 'Boolean', }); static fieldType = [KBN_FIELD_TYPES.BOOLEAN, KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.STRING]; diff --git a/src/plugins/data/common/field_formats/converters/bytes.test.ts b/src/plugins/field_formats/common/converters/bytes.test.ts similarity index 85% rename from src/plugins/data/common/field_formats/converters/bytes.test.ts rename to src/plugins/field_formats/common/converters/bytes.test.ts index be8adbb6355ac..a820b2c1f2b32 100644 --- a/src/plugins/data/common/field_formats/converters/bytes.test.ts +++ b/src/plugins/field_formats/common/converters/bytes.test.ts @@ -7,12 +7,12 @@ */ import { BytesFormat } from './bytes'; -import { UI_SETTINGS } from '../../constants'; +import { FORMATS_UI_SETTINGS } from '../constants/ui_settings'; describe('BytesFormat', () => { const config: Record = {}; - config[UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN] = '0,0.[000]b'; + config[FORMATS_UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN] = '0,0.[000]b'; const getConfig = (key: string) => config[key]; diff --git a/src/plugins/data/common/field_formats/converters/bytes.ts b/src/plugins/field_formats/common/converters/bytes.ts similarity index 91% rename from src/plugins/data/common/field_formats/converters/bytes.ts rename to src/plugins/field_formats/common/converters/bytes.ts index 840a59f3d3092..829063aa07d02 100644 --- a/src/plugins/data/common/field_formats/converters/bytes.ts +++ b/src/plugins/field_formats/common/converters/bytes.ts @@ -12,7 +12,7 @@ import { FIELD_FORMAT_IDS } from '../types'; export class BytesFormat extends NumeralFormat { static id = FIELD_FORMAT_IDS.BYTES; - static title = i18n.translate('data.fieldFormats.bytes.title', { + static title = i18n.translate('fieldFormats.bytes.title', { defaultMessage: 'Bytes', }); diff --git a/src/plugins/data/common/field_formats/converters/color.test.ts b/src/plugins/field_formats/common/converters/color.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/color.test.ts rename to src/plugins/field_formats/common/converters/color.test.ts diff --git a/src/plugins/data/common/field_formats/converters/color.tsx b/src/plugins/field_formats/common/converters/color.tsx similarity index 97% rename from src/plugins/data/common/field_formats/converters/color.tsx rename to src/plugins/field_formats/common/converters/color.tsx index f653c6a4f82a2..d3a6964619cae 100644 --- a/src/plugins/data/common/field_formats/converters/color.tsx +++ b/src/plugins/field_formats/common/converters/color.tsx @@ -18,7 +18,7 @@ import { DEFAULT_CONVERTER_COLOR } from '../constants/color_default'; export class ColorFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.COLOR; - static title = i18n.translate('data.fieldFormats.color.title', { + static title = i18n.translate('fieldFormats.color.title', { defaultMessage: 'Color', }); static fieldType = [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.STRING]; diff --git a/src/plugins/data/common/field_formats/converters/custom.ts b/src/plugins/field_formats/common/converters/custom.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/custom.ts rename to src/plugins/field_formats/common/converters/custom.ts diff --git a/src/plugins/data/common/field_formats/converters/date_nanos_shared.test.ts b/src/plugins/field_formats/common/converters/date_nanos_shared.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/date_nanos_shared.test.ts rename to src/plugins/field_formats/common/converters/date_nanos_shared.test.ts diff --git a/src/plugins/data/common/field_formats/converters/date_nanos_shared.ts b/src/plugins/field_formats/common/converters/date_nanos_shared.ts similarity index 96% rename from src/plugins/data/common/field_formats/converters/date_nanos_shared.ts rename to src/plugins/field_formats/common/converters/date_nanos_shared.ts index d058d0c6a6574..1d226c936a977 100644 --- a/src/plugins/data/common/field_formats/converters/date_nanos_shared.ts +++ b/src/plugins/field_formats/common/converters/date_nanos_shared.ts @@ -8,8 +8,9 @@ import { i18n } from '@kbn/i18n'; import { memoize, noop } from 'lodash'; +import { KBN_FIELD_TYPES } from '@kbn/field-types'; import moment, { Moment } from 'moment'; -import { FieldFormat, FIELD_FORMAT_IDS, KBN_FIELD_TYPES } from '../../'; +import { FieldFormat, FIELD_FORMAT_IDS } from '../'; import { TextContextTypeConvert } from '../types'; /** @@ -59,7 +60,7 @@ export function formatWithNanos( export class DateNanosFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.DATE_NANOS; - static title = i18n.translate('data.fieldFormats.date_nanos.title', { + static title = i18n.translate('fieldFormats.date_nanos.title', { defaultMessage: 'Date nanos', }); static fieldType = KBN_FIELD_TYPES.DATE; diff --git a/src/plugins/data/common/field_formats/converters/duration.test.ts b/src/plugins/field_formats/common/converters/duration.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/duration.test.ts rename to src/plugins/field_formats/common/converters/duration.test.ts diff --git a/src/plugins/data/common/field_formats/converters/duration.ts b/src/plugins/field_formats/common/converters/duration.ts similarity index 74% rename from src/plugins/data/common/field_formats/converters/duration.ts rename to src/plugins/field_formats/common/converters/duration.ts index 926f907af8fe9..a92a6756b335c 100644 --- a/src/plugins/data/common/field_formats/converters/duration.ts +++ b/src/plugins/field_formats/common/converters/duration.ts @@ -21,76 +21,76 @@ const HUMAN_FRIENDLY = 'humanize'; const HUMAN_FRIENDLY_PRECISE = 'humanizePrecise'; const DEFAULT_OUTPUT_PRECISION = 2; const DEFAULT_INPUT_FORMAT = { - text: i18n.translate('data.fieldFormats.duration.inputFormats.seconds', { + text: i18n.translate('fieldFormats.duration.inputFormats.seconds', { defaultMessage: 'Seconds', }), kind: 'seconds', }; const inputFormats = [ { - text: i18n.translate('data.fieldFormats.duration.inputFormats.picoseconds', { + text: i18n.translate('fieldFormats.duration.inputFormats.picoseconds', { defaultMessage: 'Picoseconds', }), kind: 'picoseconds', }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.nanoseconds', { + text: i18n.translate('fieldFormats.duration.inputFormats.nanoseconds', { defaultMessage: 'Nanoseconds', }), kind: 'nanoseconds', }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.microseconds', { + text: i18n.translate('fieldFormats.duration.inputFormats.microseconds', { defaultMessage: 'Microseconds', }), kind: 'microseconds', }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.milliseconds', { + text: i18n.translate('fieldFormats.duration.inputFormats.milliseconds', { defaultMessage: 'Milliseconds', }), kind: 'milliseconds', }, { ...DEFAULT_INPUT_FORMAT }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.minutes', { + text: i18n.translate('fieldFormats.duration.inputFormats.minutes', { defaultMessage: 'Minutes', }), kind: 'minutes', }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.hours', { + text: i18n.translate('fieldFormats.duration.inputFormats.hours', { defaultMessage: 'Hours', }), kind: 'hours', }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.days', { + text: i18n.translate('fieldFormats.duration.inputFormats.days', { defaultMessage: 'Days', }), kind: 'days', }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.weeks', { + text: i18n.translate('fieldFormats.duration.inputFormats.weeks', { defaultMessage: 'Weeks', }), kind: 'weeks', }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.months', { + text: i18n.translate('fieldFormats.duration.inputFormats.months', { defaultMessage: 'Months', }), kind: 'months', }, { - text: i18n.translate('data.fieldFormats.duration.inputFormats.years', { + text: i18n.translate('fieldFormats.duration.inputFormats.years', { defaultMessage: 'Years', }), kind: 'years', }, ]; const DEFAULT_OUTPUT_FORMAT = { - text: i18n.translate('data.fieldFormats.duration.outputFormats.humanize.approximate', { + text: i18n.translate('fieldFormats.duration.outputFormats.humanize.approximate', { defaultMessage: 'Human-readable (approximate)', }), method: 'humanize', @@ -98,79 +98,79 @@ const DEFAULT_OUTPUT_FORMAT = { const outputFormats = [ { ...DEFAULT_OUTPUT_FORMAT }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.humanize.precise', { + text: i18n.translate('fieldFormats.duration.outputFormats.humanize.precise', { defaultMessage: 'Human-readable (precise)', }), method: 'humanizePrecise', }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.asMilliseconds', { + text: i18n.translate('fieldFormats.duration.outputFormats.asMilliseconds', { defaultMessage: 'Milliseconds', }), - shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asMilliseconds.short', { + shortText: i18n.translate('fieldFormats.duration.outputFormats.asMilliseconds.short', { defaultMessage: 'ms', }), method: 'asMilliseconds', }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.asSeconds', { + text: i18n.translate('fieldFormats.duration.outputFormats.asSeconds', { defaultMessage: 'Seconds', }), - shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asSeconds.short', { + shortText: i18n.translate('fieldFormats.duration.outputFormats.asSeconds.short', { defaultMessage: 's', }), method: 'asSeconds', }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.asMinutes', { + text: i18n.translate('fieldFormats.duration.outputFormats.asMinutes', { defaultMessage: 'Minutes', }), - shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asMinutes.short', { + shortText: i18n.translate('fieldFormats.duration.outputFormats.asMinutes.short', { defaultMessage: 'min', }), method: 'asMinutes', }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.asHours', { + text: i18n.translate('fieldFormats.duration.outputFormats.asHours', { defaultMessage: 'Hours', }), - shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asHours.short', { + shortText: i18n.translate('fieldFormats.duration.outputFormats.asHours.short', { defaultMessage: 'h', }), method: 'asHours', }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.asDays', { + text: i18n.translate('fieldFormats.duration.outputFormats.asDays', { defaultMessage: 'Days', }), - shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asDays.short', { + shortText: i18n.translate('fieldFormats.duration.outputFormats.asDays.short', { defaultMessage: 'd', }), method: 'asDays', }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.asWeeks', { + text: i18n.translate('fieldFormats.duration.outputFormats.asWeeks', { defaultMessage: 'Weeks', }), - shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asWeeks.short', { + shortText: i18n.translate('fieldFormats.duration.outputFormats.asWeeks.short', { defaultMessage: 'w', }), method: 'asWeeks', }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.asMonths', { + text: i18n.translate('fieldFormats.duration.outputFormats.asMonths', { defaultMessage: 'Months', }), - shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asMonths.short', { + shortText: i18n.translate('fieldFormats.duration.outputFormats.asMonths.short', { defaultMessage: 'mon', }), method: 'asMonths', }, { - text: i18n.translate('data.fieldFormats.duration.outputFormats.asYears', { + text: i18n.translate('fieldFormats.duration.outputFormats.asYears', { defaultMessage: 'Years', }), - shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asYears.short', { + shortText: i18n.translate('fieldFormats.duration.outputFormats.asYears.short', { defaultMessage: 'y', }), method: 'asYears', @@ -210,7 +210,7 @@ function formatInputHumanPrecise( export class DurationFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.DURATION; - static title = i18n.translate('data.fieldFormats.duration.title', { + static title = i18n.translate('fieldFormats.duration.title', { defaultMessage: 'Duration', }); static fieldType = KBN_FIELD_TYPES.NUMBER; @@ -250,7 +250,7 @@ export class DurationFormat extends FieldFormat { const prefix = val < 0 && human - ? i18n.translate('data.fieldFormats.duration.negativeLabel', { + ? i18n.translate('fieldFormats.duration.negativeLabel', { defaultMessage: 'minus', }) + ' ' : ''; diff --git a/src/plugins/data/common/field_formats/converters/histogram.ts b/src/plugins/field_formats/common/converters/histogram.ts similarity index 95% rename from src/plugins/data/common/field_formats/converters/histogram.ts rename to src/plugins/field_formats/common/converters/histogram.ts index 0812dcc795dc9..586d42ffa7a31 100644 --- a/src/plugins/data/common/field_formats/converters/histogram.ts +++ b/src/plugins/field_formats/common/converters/histogram.ts @@ -17,7 +17,7 @@ import { PercentFormat } from './percent'; export class HistogramFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.HISTOGRAM; static fieldType = KBN_FIELD_TYPES.HISTOGRAM; - static title = i18n.translate('data.fieldFormats.histogram.title', { + static title = i18n.translate('fieldFormats.histogram.title', { defaultMessage: 'Histogram', }); diff --git a/src/plugins/data/common/field_formats/converters/index.ts b/src/plugins/field_formats/common/converters/index.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/index.ts rename to src/plugins/field_formats/common/converters/index.ts diff --git a/src/plugins/data/common/field_formats/converters/ip.test.ts b/src/plugins/field_formats/common/converters/ip.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/ip.test.ts rename to src/plugins/field_formats/common/converters/ip.test.ts diff --git a/src/plugins/data/common/field_formats/converters/ip.ts b/src/plugins/field_formats/common/converters/ip.ts similarity index 94% rename from src/plugins/data/common/field_formats/converters/ip.ts rename to src/plugins/field_formats/common/converters/ip.ts index 76fe4404e2418..b981eca5db441 100644 --- a/src/plugins/data/common/field_formats/converters/ip.ts +++ b/src/plugins/field_formats/common/converters/ip.ts @@ -13,7 +13,7 @@ import { TextContextTypeConvert, FIELD_FORMAT_IDS } from '../types'; export class IpFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.IP; - static title = i18n.translate('data.fieldFormats.ip.title', { + static title = i18n.translate('fieldFormats.ip.title', { defaultMessage: 'IP address', }); static fieldType = KBN_FIELD_TYPES.IP; diff --git a/src/plugins/data/common/field_formats/converters/number.test.ts b/src/plugins/field_formats/common/converters/number.test.ts similarity index 85% rename from src/plugins/data/common/field_formats/converters/number.test.ts rename to src/plugins/field_formats/common/converters/number.test.ts index 837031b59dc5c..da849fae1e6ab 100644 --- a/src/plugins/data/common/field_formats/converters/number.test.ts +++ b/src/plugins/field_formats/common/converters/number.test.ts @@ -7,12 +7,12 @@ */ import { NumberFormat } from './number'; -import { UI_SETTINGS } from '../../constants'; +import { FORMATS_UI_SETTINGS } from '../constants/ui_settings'; describe('NumberFormat', () => { const config: Record = {}; - config[UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN] = '0,0.[000]'; + config[FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN] = '0,0.[000]'; const getConfig = (key: string) => config[key]; diff --git a/src/plugins/data/common/field_formats/converters/number.ts b/src/plugins/field_formats/common/converters/number.ts similarity index 91% rename from src/plugins/data/common/field_formats/converters/number.ts rename to src/plugins/field_formats/common/converters/number.ts index c8c98d010dc61..36470cbd14874 100644 --- a/src/plugins/data/common/field_formats/converters/number.ts +++ b/src/plugins/field_formats/common/converters/number.ts @@ -12,7 +12,7 @@ import { FIELD_FORMAT_IDS } from '../types'; export class NumberFormat extends NumeralFormat { static id = FIELD_FORMAT_IDS.NUMBER; - static title = i18n.translate('data.fieldFormats.number.title', { + static title = i18n.translate('fieldFormats.number.title', { defaultMessage: 'Number', }); diff --git a/src/plugins/data/common/field_formats/converters/numeral.ts b/src/plugins/field_formats/common/converters/numeral.ts similarity index 90% rename from src/plugins/data/common/field_formats/converters/numeral.ts rename to src/plugins/field_formats/common/converters/numeral.ts index 9d8b7ba1c369d..7f11b6377836d 100644 --- a/src/plugins/data/common/field_formats/converters/numeral.ts +++ b/src/plugins/field_formats/common/converters/numeral.ts @@ -13,7 +13,7 @@ import numeralLanguages from '@elastic/numeral/languages'; import { KBN_FIELD_TYPES } from '@kbn/field-types'; import { FieldFormat } from '../field_format'; import { TextContextTypeConvert } from '../types'; -import { UI_SETTINGS } from '../../constants'; +import { FORMATS_UI_SETTINGS } from '../constants/ui_settings'; const numeralInst = numeral(); @@ -42,7 +42,7 @@ export abstract class NumeralFormat extends FieldFormat { const previousLocale = numeral.language(); const defaultLocale = - (this.getConfig && this.getConfig(UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE)) || 'en'; + (this.getConfig && this.getConfig(FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE)) || 'en'; numeral.language(defaultLocale); const formatted = numeralInst.set(val).format(this.param('pattern')); diff --git a/src/plugins/data/common/field_formats/converters/percent.test.ts b/src/plugins/field_formats/common/converters/percent.test.ts similarity index 85% rename from src/plugins/data/common/field_formats/converters/percent.test.ts rename to src/plugins/field_formats/common/converters/percent.test.ts index 77f4274759ba3..d01acf571f9d9 100644 --- a/src/plugins/data/common/field_formats/converters/percent.test.ts +++ b/src/plugins/field_formats/common/converters/percent.test.ts @@ -7,12 +7,12 @@ */ import { PercentFormat } from './percent'; -import { UI_SETTINGS } from '../../constants'; +import { FORMATS_UI_SETTINGS } from '../constants/ui_settings'; describe('PercentFormat', () => { const config: Record = {}; - config[UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN] = '0,0.[000]%'; + config[FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN] = '0,0.[000]%'; const getConfig = (key: string) => config[key]; diff --git a/src/plugins/data/common/field_formats/converters/percent.ts b/src/plugins/field_formats/common/converters/percent.ts similarity index 82% rename from src/plugins/data/common/field_formats/converters/percent.ts rename to src/plugins/field_formats/common/converters/percent.ts index a402975c672e2..3fd70c8ce74a8 100644 --- a/src/plugins/data/common/field_formats/converters/percent.ts +++ b/src/plugins/field_formats/common/converters/percent.ts @@ -9,11 +9,11 @@ import { i18n } from '@kbn/i18n'; import { NumeralFormat } from './numeral'; import { TextContextTypeConvert, FIELD_FORMAT_IDS } from '../types'; -import { UI_SETTINGS } from '../../constants'; +import { FORMATS_UI_SETTINGS } from '../constants/ui_settings'; export class PercentFormat extends NumeralFormat { static id = FIELD_FORMAT_IDS.PERCENT; - static title = i18n.translate('data.fieldFormats.percent.title', { + static title = i18n.translate('fieldFormats.percent.title', { defaultMessage: 'Percentage', }); @@ -22,7 +22,7 @@ export class PercentFormat extends NumeralFormat { allowsNumericalAggregations = true; getParamDefaults = () => ({ - pattern: this.getConfig!(UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN), + pattern: this.getConfig!(FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN), fractional: true, }); diff --git a/src/plugins/data/common/field_formats/converters/relative_date.test.ts b/src/plugins/field_formats/common/converters/relative_date.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/relative_date.test.ts rename to src/plugins/field_formats/common/converters/relative_date.test.ts diff --git a/src/plugins/data/common/field_formats/converters/relative_date.ts b/src/plugins/field_formats/common/converters/relative_date.ts similarity index 93% rename from src/plugins/data/common/field_formats/converters/relative_date.ts rename to src/plugins/field_formats/common/converters/relative_date.ts index c54e32452f267..6111cbf838b79 100644 --- a/src/plugins/data/common/field_formats/converters/relative_date.ts +++ b/src/plugins/field_formats/common/converters/relative_date.ts @@ -14,7 +14,7 @@ import { TextContextTypeConvert, FIELD_FORMAT_IDS } from '../types'; export class RelativeDateFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.RELATIVE_DATE; - static title = i18n.translate('data.fieldFormats.relative_date.title', { + static title = i18n.translate('fieldFormats.relative_date.title', { defaultMessage: 'Relative date', }); static fieldType = KBN_FIELD_TYPES.DATE; diff --git a/src/plugins/data/common/field_formats/converters/source.test.ts b/src/plugins/field_formats/common/converters/source.test.ts similarity index 87% rename from src/plugins/data/common/field_formats/converters/source.test.ts rename to src/plugins/field_formats/common/converters/source.test.ts index 655cf315a05a4..726f2c31e7825 100644 --- a/src/plugins/data/common/field_formats/converters/source.test.ts +++ b/src/plugins/field_formats/common/converters/source.test.ts @@ -9,7 +9,21 @@ import { SourceFormat } from './source'; import { HtmlContextTypeConvert } from '../types'; import { HTML_CONTEXT_TYPE } from '../content_types'; -import { stubIndexPatternWithFields } from '../../index_patterns/index_pattern.stub'; + +export const stubIndexPatternWithFields = { + id: '1234', + title: 'logstash-*', + fields: [ + { + name: 'response', + type: 'number', + esTypes: ['integer'], + aggregatable: true, + filterable: true, + searchable: true, + }, + ], +}; describe('Source Format', () => { let convertHtml: Function; diff --git a/src/plugins/data/common/field_formats/converters/source.tsx b/src/plugins/field_formats/common/converters/source.tsx similarity index 92% rename from src/plugins/data/common/field_formats/converters/source.tsx rename to src/plugins/field_formats/common/converters/source.tsx index de77736503f86..b3ed90329d6d4 100644 --- a/src/plugins/data/common/field_formats/converters/source.tsx +++ b/src/plugins/field_formats/common/converters/source.tsx @@ -6,14 +6,14 @@ * Side Public License, v 1. */ +import { KBN_FIELD_TYPES } from '@kbn/field-types'; import React, { Fragment } from 'react'; import ReactDOM from 'react-dom/server'; import { escape, keys } from 'lodash'; -import { KBN_FIELD_TYPES } from '@kbn/field-types'; -import { shortenDottedString } from '../../utils'; +import { shortenDottedString } from '../utils'; import { FieldFormat } from '../field_format'; import { TextContextTypeConvert, HtmlContextTypeConvert, FIELD_FORMAT_IDS } from '../types'; -import { UI_SETTINGS } from '../../constants'; +import { FORMATS_UI_SETTINGS } from '../constants/ui_settings'; interface Props { defPairs: Array<[string, string]>; @@ -55,7 +55,7 @@ export class SourceFormat extends FieldFormat { const formatted = indexPattern.formatHit(hit); const highlightPairs: any[] = []; const sourcePairs: any[] = []; - const isShortDots = this.getConfig!(UI_SETTINGS.SHORT_DOTS_ENABLE); + const isShortDots = this.getConfig!(FORMATS_UI_SETTINGS.SHORT_DOTS_ENABLE); keys(formatted).forEach((key) => { const pairs = highlights[key] ? highlightPairs : sourcePairs; diff --git a/src/plugins/data/common/field_formats/converters/static_lookup.ts b/src/plugins/field_formats/common/converters/static_lookup.ts similarity index 95% rename from src/plugins/data/common/field_formats/converters/static_lookup.ts rename to src/plugins/field_formats/common/converters/static_lookup.ts index 63d3506dda0bb..ba5b38ba8b24f 100644 --- a/src/plugins/data/common/field_formats/converters/static_lookup.ts +++ b/src/plugins/field_formats/common/converters/static_lookup.ts @@ -23,7 +23,7 @@ function convertLookupEntriesToMap(lookupEntries: any[]) { export class StaticLookupFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.STATIC_LOOKUP; - static title = i18n.translate('data.fieldFormats.static_lookup.title', { + static title = i18n.translate('fieldFormats.static_lookup.title', { defaultMessage: 'Static lookup', }); static fieldType = [ diff --git a/src/plugins/data/common/field_formats/converters/string.test.ts b/src/plugins/field_formats/common/converters/string.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/string.test.ts rename to src/plugins/field_formats/common/converters/string.test.ts diff --git a/src/plugins/data/common/field_formats/converters/string.ts b/src/plugins/field_formats/common/converters/string.ts similarity index 80% rename from src/plugins/data/common/field_formats/converters/string.ts rename to src/plugins/field_formats/common/converters/string.ts index c6aba38cf376d..149da871761e2 100644 --- a/src/plugins/data/common/field_formats/converters/string.ts +++ b/src/plugins/field_formats/common/converters/string.ts @@ -9,55 +9,54 @@ import { escape } from 'lodash'; import { i18n } from '@kbn/i18n'; import { KBN_FIELD_TYPES } from '@kbn/field-types'; -import { asPrettyString, getHighlightHtml } from '../utils'; +import { asPrettyString, getHighlightHtml, shortenDottedString } from '../utils'; import { FieldFormat } from '../field_format'; import { TextContextTypeConvert, FIELD_FORMAT_IDS, HtmlContextTypeConvert } from '../types'; -import { shortenDottedString } from '../../utils'; -const emptyLabel = i18n.translate('data.fieldFormats.string.emptyLabel', { +const emptyLabel = i18n.translate('fieldFormats.string.emptyLabel', { defaultMessage: '(empty)', }); const TRANSFORM_OPTIONS = [ { kind: false, - text: i18n.translate('data.fieldFormats.string.transformOptions.none', { + text: i18n.translate('fieldFormats.string.transformOptions.none', { defaultMessage: '- None -', }), }, { kind: 'lower', - text: i18n.translate('data.fieldFormats.string.transformOptions.lower', { + text: i18n.translate('fieldFormats.string.transformOptions.lower', { defaultMessage: 'Lower Case', }), }, { kind: 'upper', - text: i18n.translate('data.fieldFormats.string.transformOptions.upper', { + text: i18n.translate('fieldFormats.string.transformOptions.upper', { defaultMessage: 'Upper Case', }), }, { kind: 'title', - text: i18n.translate('data.fieldFormats.string.transformOptions.title', { + text: i18n.translate('fieldFormats.string.transformOptions.title', { defaultMessage: 'Title Case', }), }, { kind: 'short', - text: i18n.translate('data.fieldFormats.string.transformOptions.short', { + text: i18n.translate('fieldFormats.string.transformOptions.short', { defaultMessage: 'Short Dots', }), }, { kind: 'base64', - text: i18n.translate('data.fieldFormats.string.transformOptions.base64', { + text: i18n.translate('fieldFormats.string.transformOptions.base64', { defaultMessage: 'Base64 Decode', }), }, { kind: 'urlparam', - text: i18n.translate('data.fieldFormats.string.transformOptions.url', { + text: i18n.translate('fieldFormats.string.transformOptions.url', { defaultMessage: 'URL Param Decode', }), }, @@ -66,7 +65,7 @@ const DEFAULT_TRANSFORM_OPTION = false; export class StringFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.STRING; - static title = i18n.translate('data.fieldFormats.string.title', { + static title = i18n.translate('fieldFormats.string.title', { defaultMessage: 'String', }); static fieldType = [ diff --git a/src/plugins/data/common/field_formats/converters/truncate.test.ts b/src/plugins/field_formats/common/converters/truncate.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/truncate.test.ts rename to src/plugins/field_formats/common/converters/truncate.test.ts diff --git a/src/plugins/data/common/field_formats/converters/truncate.ts b/src/plugins/field_formats/common/converters/truncate.ts similarity index 93% rename from src/plugins/data/common/field_formats/converters/truncate.ts rename to src/plugins/field_formats/common/converters/truncate.ts index 4c68a4c056b82..fd8bbcbc46541 100644 --- a/src/plugins/data/common/field_formats/converters/truncate.ts +++ b/src/plugins/field_formats/common/converters/truncate.ts @@ -16,7 +16,7 @@ const omission = '...'; export class TruncateFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.TRUNCATE; - static title = i18n.translate('data.fieldFormats.truncated_string.title', { + static title = i18n.translate('fieldFormats.truncated_string.title', { defaultMessage: 'Truncated string', }); static fieldType = KBN_FIELD_TYPES.STRING; diff --git a/src/plugins/data/common/field_formats/converters/url.test.ts b/src/plugins/field_formats/common/converters/url.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/converters/url.test.ts rename to src/plugins/field_formats/common/converters/url.test.ts diff --git a/src/plugins/data/common/field_formats/converters/url.ts b/src/plugins/field_formats/common/converters/url.ts similarity index 95% rename from src/plugins/data/common/field_formats/converters/url.ts rename to src/plugins/field_formats/common/converters/url.ts index 3e808d90f0409..07d9ed4cd535e 100644 --- a/src/plugins/data/common/field_formats/converters/url.ts +++ b/src/plugins/field_formats/common/converters/url.ts @@ -24,19 +24,19 @@ const allowedUrlSchemes = ['http://', 'https://']; const URL_TYPES = [ { kind: 'a', - text: i18n.translate('data.fieldFormats.url.types.link', { + text: i18n.translate('fieldFormats.url.types.link', { defaultMessage: 'Link', }), }, { kind: 'img', - text: i18n.translate('data.fieldFormats.url.types.img', { + text: i18n.translate('fieldFormats.url.types.img', { defaultMessage: 'Image', }), }, { kind: 'audio', - text: i18n.translate('data.fieldFormats.url.types.audio', { + text: i18n.translate('fieldFormats.url.types.audio', { defaultMessage: 'Audio', }), }, @@ -45,7 +45,7 @@ const DEFAULT_URL_TYPE = 'a'; export class UrlFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.URL; - static title = i18n.translate('data.fieldFormats.url.title', { + static title = i18n.translate('fieldFormats.url.title', { defaultMessage: 'Url', }); static fieldType = [ diff --git a/src/plugins/data/common/field_formats/errors.ts b/src/plugins/field_formats/common/errors.ts similarity index 100% rename from src/plugins/data/common/field_formats/errors.ts rename to src/plugins/field_formats/common/errors.ts diff --git a/src/plugins/data/common/field_formats/field_format.test.ts b/src/plugins/field_formats/common/field_format.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/field_format.test.ts rename to src/plugins/field_formats/common/field_format.test.ts diff --git a/src/plugins/data/common/field_formats/field_format.ts b/src/plugins/field_formats/common/field_format.ts similarity index 100% rename from src/plugins/data/common/field_formats/field_format.ts rename to src/plugins/field_formats/common/field_format.ts diff --git a/src/plugins/data/common/field_formats/field_formats_registry.test.ts b/src/plugins/field_formats/common/field_formats_registry.test.ts similarity index 99% rename from src/plugins/data/common/field_formats/field_formats_registry.test.ts rename to src/plugins/field_formats/common/field_formats_registry.test.ts index 86e44b69c05bf..e94efc88be20f 100644 --- a/src/plugins/data/common/field_formats/field_formats_registry.test.ts +++ b/src/plugins/field_formats/common/field_formats_registry.test.ts @@ -9,7 +9,7 @@ import { FieldFormatsRegistry } from './field_formats_registry'; import { BoolFormat, PercentFormat, StringFormat } from './converters'; import { FieldFormatsGetConfigFn, FieldFormatInstanceType } from './types'; -import { KBN_FIELD_TYPES } from '../../common'; +import { KBN_FIELD_TYPES } from '@kbn/field-types'; const getValueOfPrivateField = (instance: any, field: string) => instance[field]; diff --git a/src/plugins/data/common/field_formats/field_formats_registry.ts b/src/plugins/field_formats/common/field_formats_registry.ts similarity index 96% rename from src/plugins/data/common/field_formats/field_formats_registry.ts rename to src/plugins/field_formats/common/field_formats_registry.ts index 9e96f5cc1a6bd..675ec897c2b70 100644 --- a/src/plugins/data/common/field_formats/field_formats_registry.ts +++ b/src/plugins/field_formats/common/field_formats_registry.ts @@ -17,13 +17,13 @@ import { FieldFormatInstanceType, FieldFormatId, IFieldFormatMetaParams, + SerializedFieldFormat, + FormatFactory, } from './types'; import { baseFormatters } from './constants/base_formatters'; import { FieldFormat } from './field_format'; -import { FormatFactory } from './utils'; -import { UI_SETTINGS } from '../constants'; -import { FieldFormatNotFoundError } from '../field_formats'; -import { SerializedFieldFormat } from '../../../expressions/common/types'; +import { FORMATS_UI_SETTINGS } from '../common/constants/ui_settings'; +import { FieldFormatNotFoundError } from './errors'; export class FieldFormatsRegistry { protected fieldFormats: Map = new Map(); @@ -53,7 +53,7 @@ export class FieldFormatsRegistry { metaParamsOptions: Record = {}, defaultFieldConverters: FieldFormatInstanceType[] = baseFormatters ) { - const defaultTypeMap = getConfig(UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP); + const defaultTypeMap = getConfig(FORMATS_UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP); this.register(defaultFieldConverters); this.parseDefaultTypeMap(defaultTypeMap); this.getConfig = getConfig; diff --git a/src/plugins/data/common/field_formats/index.ts b/src/plugins/field_formats/common/index.ts similarity index 90% rename from src/plugins/data/common/field_formats/index.ts rename to src/plugins/field_formats/common/index.ts index a3d763196e11f..f2395eef29c54 100644 --- a/src/plugins/data/common/field_formats/index.ts +++ b/src/plugins/field_formats/common/index.ts @@ -33,6 +33,7 @@ export { export { getHighlightRequest } from './utils'; export { DEFAULT_CONVERTER_COLOR } from './constants/color_default'; +export { FORMATS_UI_SETTINGS } from './constants/ui_settings'; export { FIELD_FORMAT_IDS } from './types'; export { HTML_CONTEXT_TYPE, TEXT_CONTEXT_TYPE } from './content_types'; @@ -41,7 +42,9 @@ export { FieldFormatsContentType, FieldFormatConfig, FieldFormatId, - // Used in data plugin only + SerializedFieldFormat, + FormatFactory, + // Used in field format plugin only FieldFormatInstanceType, IFieldFormat, FieldFormatsStartCommon, diff --git a/src/plugins/data/common/field_formats/mocks.ts b/src/plugins/field_formats/common/mocks.ts similarity index 100% rename from src/plugins/data/common/field_formats/mocks.ts rename to src/plugins/field_formats/common/mocks.ts diff --git a/src/plugins/data/common/field_formats/types.ts b/src/plugins/field_formats/common/types.ts similarity index 73% rename from src/plugins/data/common/field_formats/types.ts rename to src/plugins/field_formats/common/types.ts index c09106751815f..9c9112f45373b 100644 --- a/src/plugins/data/common/field_formats/types.ts +++ b/src/plugins/field_formats/common/types.ts @@ -6,7 +6,6 @@ * Side Public License, v 1. */ -import { GetConfigFn } from '../types'; import { FieldFormat } from './field_format'; import { FieldFormatsRegistry } from './field_formats_registry'; @@ -65,7 +64,17 @@ export interface FieldFormatConfig { es?: boolean; } -export type FieldFormatsGetConfigFn = GetConfigFn; +/** + * If a service is being shared on both the client and the server, and + * the client code requires synchronous access to uiSettings, both client + * and server should wrap the core uiSettings services in a function + * matching this signature. + * + * This matches the signature of the public `core.uiSettings.get`, and + * should only be used in scenarios where async access to uiSettings is + * not possible. + */ +export type FieldFormatsGetConfigFn = (key: string, defaultOverride?: T) => T; export type IFieldFormat = FieldFormat; @@ -96,3 +105,17 @@ export interface IFieldFormatMetaParams { } export type FieldFormatsStartCommon = Omit; + +/** + * JSON representation of a field formatter configuration. + * Is used to carry information about how to format data in + * a data table as part of the column definition. + * + * @public + */ +export interface SerializedFieldFormat> { + id?: string; + params?: TParams; +} + +export type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat; diff --git a/src/plugins/data/common/field_formats/utils/as_pretty_string.test.ts b/src/plugins/field_formats/common/utils/as_pretty_string.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/as_pretty_string.test.ts rename to src/plugins/field_formats/common/utils/as_pretty_string.test.ts diff --git a/src/plugins/data/common/field_formats/utils/as_pretty_string.ts b/src/plugins/field_formats/common/utils/as_pretty_string.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/as_pretty_string.ts rename to src/plugins/field_formats/common/utils/as_pretty_string.ts diff --git a/src/plugins/data/common/field_formats/utils/highlight/highlight_html.test.ts b/src/plugins/field_formats/common/utils/highlight/highlight_html.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/highlight/highlight_html.test.ts rename to src/plugins/field_formats/common/utils/highlight/highlight_html.test.ts diff --git a/src/plugins/data/common/field_formats/utils/highlight/highlight_html.ts b/src/plugins/field_formats/common/utils/highlight/highlight_html.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/highlight/highlight_html.ts rename to src/plugins/field_formats/common/utils/highlight/highlight_html.ts diff --git a/src/plugins/data/common/field_formats/utils/highlight/highlight_request.test.ts b/src/plugins/field_formats/common/utils/highlight/highlight_request.test.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/highlight/highlight_request.test.ts rename to src/plugins/field_formats/common/utils/highlight/highlight_request.test.ts diff --git a/src/plugins/data/common/field_formats/utils/highlight/highlight_request.ts b/src/plugins/field_formats/common/utils/highlight/highlight_request.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/highlight/highlight_request.ts rename to src/plugins/field_formats/common/utils/highlight/highlight_request.ts diff --git a/src/plugins/data/common/field_formats/utils/highlight/highlight_tags.ts b/src/plugins/field_formats/common/utils/highlight/highlight_tags.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/highlight/highlight_tags.ts rename to src/plugins/field_formats/common/utils/highlight/highlight_tags.ts diff --git a/src/plugins/data/common/field_formats/utils/highlight/html_tags.ts b/src/plugins/field_formats/common/utils/highlight/html_tags.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/highlight/html_tags.ts rename to src/plugins/field_formats/common/utils/highlight/html_tags.ts diff --git a/src/plugins/data/common/field_formats/utils/highlight/index.ts b/src/plugins/field_formats/common/utils/highlight/index.ts similarity index 100% rename from src/plugins/data/common/field_formats/utils/highlight/index.ts rename to src/plugins/field_formats/common/utils/highlight/index.ts diff --git a/src/plugins/data/common/field_formats/utils/index.ts b/src/plugins/field_formats/common/utils/index.ts similarity index 70% rename from src/plugins/data/common/field_formats/utils/index.ts rename to src/plugins/field_formats/common/utils/index.ts index 5771c0166075d..3cfa0241c6f41 100644 --- a/src/plugins/data/common/field_formats/utils/index.ts +++ b/src/plugins/field_formats/common/utils/index.ts @@ -6,10 +6,6 @@ * Side Public License, v 1. */ -import { SerializedFieldFormat } from '../../../../expressions/common/types'; -import { IFieldFormat } from '../index'; - export { asPrettyString } from './as_pretty_string'; export { getHighlightHtml, getHighlightRequest } from './highlight'; - -export type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat; +export { shortenDottedString } from './shorten_dotted_string'; diff --git a/src/plugins/field_formats/common/utils/shorten_dotted_string.test.ts b/src/plugins/field_formats/common/utils/shorten_dotted_string.test.ts new file mode 100644 index 0000000000000..33a44925982ec --- /dev/null +++ b/src/plugins/field_formats/common/utils/shorten_dotted_string.test.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { shortenDottedString } from './shorten_dotted_string'; + +describe('shortenDottedString', () => { + test('should convert a dot.notated.string into a short string', () => { + expect(shortenDottedString('dot.notated.string')).toBe('d.n.string'); + }); + + test('should ignore non-string values', () => { + const obj = { key: 'val' }; + + expect(shortenDottedString(true)).toBe(true); + expect(shortenDottedString(123)).toBe(123); + expect(shortenDottedString(obj)).toBe(obj); + }); +}); diff --git a/src/plugins/field_formats/common/utils/shorten_dotted_string.ts b/src/plugins/field_formats/common/utils/shorten_dotted_string.ts new file mode 100644 index 0000000000000..53f7471913dc3 --- /dev/null +++ b/src/plugins/field_formats/common/utils/shorten_dotted_string.ts @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +const DOT_PREFIX_RE = /(.).+?\./g; + +/** + * Convert a dot.notated.string into a short + * version (d.n.string) + * + * @return {any} + */ +export function shortenDottedString(input: any) { + return typeof input !== 'string' ? input : input.replace(DOT_PREFIX_RE, '$1.'); +} diff --git a/src/plugins/data/server/field_formats/index.ts b/src/plugins/field_formats/jest.config.js similarity index 75% rename from src/plugins/data/server/field_formats/index.ts rename to src/plugins/field_formats/jest.config.js index a8e6d28f2c642..ea20fcfec6d09 100644 --- a/src/plugins/data/server/field_formats/index.ts +++ b/src/plugins/field_formats/jest.config.js @@ -6,4 +6,8 @@ * Side Public License, v 1. */ -export { FieldFormatsService, FieldFormatsSetup, FieldFormatsStart } from './field_formats_service'; +module.exports = { + preset: '@kbn/test', + rootDir: '../../..', + roots: ['/src/plugins/field_formats'], +}; diff --git a/src/plugins/field_formats/kibana.json b/src/plugins/field_formats/kibana.json new file mode 100755 index 0000000000000..ee5529697851d --- /dev/null +++ b/src/plugins/field_formats/kibana.json @@ -0,0 +1,15 @@ +{ + "id": "fieldFormats", + "version": "1.0.0", + "kibanaVersion": "kibana", + "server": true, + "ui": true, + "extraPublicDirs": ["common"], + "requiredPlugins": [], + "optionalPlugins": [], + "owner": { + "name": "App Services", + "githubTeam": "kibana-app-services" + }, + "description": "Index pattern fields and ambiguous values formatters" +} diff --git a/src/plugins/field_formats/public/index.scss b/src/plugins/field_formats/public/index.scss new file mode 100644 index 0000000000000..7928d81b1f565 --- /dev/null +++ b/src/plugins/field_formats/public/index.scss @@ -0,0 +1 @@ +@import './lib/converters/index'; diff --git a/src/plugins/field_formats/public/index.ts b/src/plugins/field_formats/public/index.ts new file mode 100755 index 0000000000000..f765513fb4c4c --- /dev/null +++ b/src/plugins/field_formats/public/index.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { FieldFormatsPlugin } from './plugin'; +export { DateFormat, DateNanosFormat } from './lib/converters'; + +export function plugin() { + return new FieldFormatsPlugin(); +} +export { FieldFormatsSetup, FieldFormatsStart } from './plugin'; diff --git a/src/plugins/data/public/field_formats/constants.ts b/src/plugins/field_formats/public/lib/constants.ts similarity index 100% rename from src/plugins/data/public/field_formats/constants.ts rename to src/plugins/field_formats/public/lib/constants.ts diff --git a/src/plugins/data/public/field_formats/converters/_index.scss b/src/plugins/field_formats/public/lib/converters/_index.scss similarity index 100% rename from src/plugins/data/public/field_formats/converters/_index.scss rename to src/plugins/field_formats/public/lib/converters/_index.scss diff --git a/src/plugins/data/public/field_formats/converters/_string.scss b/src/plugins/field_formats/public/lib/converters/_string.scss similarity index 100% rename from src/plugins/data/public/field_formats/converters/_string.scss rename to src/plugins/field_formats/public/lib/converters/_string.scss diff --git a/src/plugins/data/public/field_formats/converters/date.test.ts b/src/plugins/field_formats/public/lib/converters/date.test.ts similarity index 100% rename from src/plugins/data/public/field_formats/converters/date.test.ts rename to src/plugins/field_formats/public/lib/converters/date.test.ts diff --git a/src/plugins/data/public/field_formats/converters/date.ts b/src/plugins/field_formats/public/lib/converters/date.ts similarity index 87% rename from src/plugins/data/public/field_formats/converters/date.ts rename to src/plugins/field_formats/public/lib/converters/date.ts index 1d74e6095427d..acc051afd6b1d 100644 --- a/src/plugins/data/public/field_formats/converters/date.ts +++ b/src/plugins/field_formats/public/lib/converters/date.ts @@ -9,12 +9,13 @@ import { i18n } from '@kbn/i18n'; import { memoize, noop } from 'lodash'; import moment from 'moment'; -import { FieldFormat, KBN_FIELD_TYPES, FIELD_FORMAT_IDS } from '../../../common'; -import { TextContextTypeConvert } from '../../../common/field_formats/types'; +import { KBN_FIELD_TYPES } from '@kbn/field-types'; +import { FieldFormat, FIELD_FORMAT_IDS } from '../../../common'; +import { TextContextTypeConvert } from '../../../common/types'; export class DateFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.DATE; - static title = i18n.translate('data.fieldFormats.date.title', { + static title = i18n.translate('fieldFormats.date.title', { defaultMessage: 'Date', }); static fieldType = KBN_FIELD_TYPES.DATE; diff --git a/src/plugins/data/public/field_formats/converters/date_nanos.ts b/src/plugins/field_formats/public/lib/converters/date_nanos.ts similarity index 79% rename from src/plugins/data/public/field_formats/converters/date_nanos.ts rename to src/plugins/field_formats/public/lib/converters/date_nanos.ts index f94d0e47a8ed4..c2e0b3f929067 100644 --- a/src/plugins/data/public/field_formats/converters/date_nanos.ts +++ b/src/plugins/field_formats/public/lib/converters/date_nanos.ts @@ -6,4 +6,4 @@ * Side Public License, v 1. */ -export { DateNanosFormat } from '../../../common/field_formats/converters/date_nanos_shared'; +export { DateNanosFormat } from '../../../common/converters/date_nanos_shared'; diff --git a/src/plugins/data/public/field_formats/converters/index.ts b/src/plugins/field_formats/public/lib/converters/index.ts similarity index 100% rename from src/plugins/data/public/field_formats/converters/index.ts rename to src/plugins/field_formats/public/lib/converters/index.ts diff --git a/src/plugins/data/public/field_formats/index.ts b/src/plugins/field_formats/public/lib/index.ts similarity index 82% rename from src/plugins/data/public/field_formats/index.ts rename to src/plugins/field_formats/public/lib/index.ts index 8b8b00b2b8746..83a2dc60d8d95 100644 --- a/src/plugins/data/public/field_formats/index.ts +++ b/src/plugins/field_formats/public/lib/index.ts @@ -6,6 +6,5 @@ * Side Public License, v 1. */ -export { FieldFormatsService, FieldFormatsSetup, FieldFormatsStart } from './field_formats_service'; export { DateFormat, DateNanosFormat } from './converters'; export { baseFormattersPublic } from './constants'; diff --git a/src/plugins/data/public/field_formats/mocks.ts b/src/plugins/field_formats/public/mocks.ts similarity index 56% rename from src/plugins/data/public/field_formats/mocks.ts rename to src/plugins/field_formats/public/mocks.ts index 883af75939220..53f8cf3a17494 100644 --- a/src/plugins/data/public/field_formats/mocks.ts +++ b/src/plugins/field_formats/public/mocks.ts @@ -6,17 +6,26 @@ * Side Public License, v 1. */ -import type { PublicMethodsOf } from '@kbn/utility-types'; -import { FieldFormatsStart, FieldFormatsSetup, FieldFormatsService } from '.'; -import { fieldFormatsMock } from '../../common/field_formats/mocks'; +import { CoreSetup } from 'src/core/public'; +import { baseFormattersPublic } from './lib/constants'; +import { FieldFormatsRegistry } from '../common'; +import type { FieldFormatsStart, FieldFormatsSetup } from '.'; +import { fieldFormatsMock } from '../common/mocks'; -type FieldFormatsServiceClientContract = PublicMethodsOf; +export const getFieldFormatsRegistry = (core: CoreSetup) => { + const fieldFormatsRegistry = new FieldFormatsRegistry(); + const getConfig = core.uiSettings.get.bind(core.uiSettings); + + fieldFormatsRegistry.init(getConfig, {}, baseFormattersPublic); + + return fieldFormatsRegistry; +}; const createSetupContractMock = () => fieldFormatsMock as FieldFormatsSetup; const createStartContractMock = () => fieldFormatsMock as FieldFormatsStart; const createMock = () => { - const mocked: jest.Mocked = { + const mocked: jest.Mocked<{ start: () => FieldFormatsStart; setup: () => FieldFormatsSetup }> = { setup: jest.fn().mockReturnValue(createSetupContractMock()), start: jest.fn().mockReturnValue(createStartContractMock()), }; diff --git a/src/plugins/data/public/field_formats/field_formats_service.test.ts b/src/plugins/field_formats/public/plugin.test.ts similarity index 51% rename from src/plugins/data/public/field_formats/field_formats_service.test.ts rename to src/plugins/field_formats/public/plugin.test.ts index 06d007b2aff00..808413667918d 100644 --- a/src/plugins/data/public/field_formats/field_formats_service.test.ts +++ b/src/plugins/field_formats/public/plugin.test.ts @@ -6,18 +6,18 @@ * Side Public License, v 1. */ -import { FieldFormatsService } from './field_formats_service'; -import { coreMock } from '../../../../../src/core/public/mocks'; -import { DateFormat } from './converters/date'; +import { coreMock } from '../../../../src/core/public/mocks'; +import { DateFormat } from './lib/converters/date'; +import { FieldFormatsPlugin } from './plugin'; -describe('FieldFormatService', () => { +describe('FieldFormatsPublic', () => { test('DateFormat is public version', () => { const mockCore = coreMock.createSetup(); - const service = new FieldFormatsService(); - service.setup(mockCore); - const fieldFormatsRegistry = service.start(); - const DateFormatFromRegsitry = fieldFormatsRegistry.getTypeWithoutMetaParams('date'); + const plugin = new FieldFormatsPlugin(); + plugin.setup(mockCore); + const fieldFormatsRegistry = plugin.start(); + const DateFormatFromRegistry = fieldFormatsRegistry.getTypeWithoutMetaParams('date'); - expect(DateFormatFromRegsitry).toEqual(DateFormat); + expect(DateFormatFromRegistry).toEqual(DateFormat); }); }); diff --git a/src/plugins/data/public/field_formats/field_formats_service.ts b/src/plugins/field_formats/public/plugin.ts old mode 100644 new mode 100755 similarity index 73% rename from src/plugins/data/public/field_formats/field_formats_service.ts rename to src/plugins/field_formats/public/plugin.ts index 041d0d7dd0e1c..0e90aa9b48c8e --- a/src/plugins/data/public/field_formats/field_formats_service.ts +++ b/src/plugins/field_formats/public/plugin.ts @@ -6,17 +6,18 @@ * Side Public License, v 1. */ -import { CoreSetup } from 'src/core/public'; -import { FieldFormatsRegistry, UI_SETTINGS } from '../../common'; -import { FormatFactory } from '../../common/field_formats/utils'; -import { baseFormattersPublic } from './constants'; +import { CoreSetup, Plugin } from '../../../core/public'; +import { FieldFormatsRegistry, FORMATS_UI_SETTINGS } from '../common'; +import { baseFormattersPublic } from './lib'; +import { FormatFactory } from '../common/types'; +import './index.scss'; -export class FieldFormatsService { +export class FieldFormatsPlugin implements Plugin { private readonly fieldFormatsRegistry: FieldFormatsRegistry = new FieldFormatsRegistry(); - public setup(core: CoreSetup) { + public setup(core: CoreSetup): FieldFormatsSetup { core.uiSettings.getUpdate$().subscribe(({ key, newValue }) => { - if (key === UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP) { + if (key === FORMATS_UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP) { this.fieldFormatsRegistry.parseDefaultTypeMap(newValue); } }); @@ -41,6 +42,8 @@ export class FieldFormatsService { public start() { return this.fieldFormatsRegistry as FieldFormatsStart; } + + public stop() {} } /** @public */ diff --git a/src/plugins/field_formats/server/index.ts b/src/plugins/field_formats/server/index.ts new file mode 100755 index 0000000000000..44de8fde558ec --- /dev/null +++ b/src/plugins/field_formats/server/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { PluginInitializerContext } from '../../../core/server'; +import { FieldFormatsPlugin } from './plugin'; +export { DateFormat, DateNanosFormat } from './lib/converters'; + +export function plugin(initializerContext: PluginInitializerContext) { + return new FieldFormatsPlugin(initializerContext); +} + +export { FieldFormatsSetup, FieldFormatsStart } from './types'; diff --git a/src/plugins/data/server/field_formats/converters/date_nanos_server.test.ts b/src/plugins/field_formats/server/lib/converters/date_nanos_server.test.ts similarity index 97% rename from src/plugins/data/server/field_formats/converters/date_nanos_server.test.ts rename to src/plugins/field_formats/server/lib/converters/date_nanos_server.test.ts index 3353f4a959b7e..86f0b2a7dc875 100644 --- a/src/plugins/data/server/field_formats/converters/date_nanos_server.test.ts +++ b/src/plugins/field_formats/server/lib/converters/date_nanos_server.test.ts @@ -7,7 +7,7 @@ */ import { DateNanosFormat } from './date_nanos_server'; -import { FieldFormatsGetConfigFn } from 'src/plugins/data/common'; +import { FieldFormatsGetConfigFn } from '../../../common'; describe('Date Nanos Format: Server side edition', () => { let convert: Function; diff --git a/src/plugins/data/server/field_formats/converters/date_nanos_server.ts b/src/plugins/field_formats/server/lib/converters/date_nanos_server.ts similarity index 94% rename from src/plugins/data/server/field_formats/converters/date_nanos_server.ts rename to src/plugins/field_formats/server/lib/converters/date_nanos_server.ts index 655c76d328f47..d47475f6274fa 100644 --- a/src/plugins/data/server/field_formats/converters/date_nanos_server.ts +++ b/src/plugins/field_formats/server/lib/converters/date_nanos_server.ts @@ -12,8 +12,8 @@ import { analysePatternForFract, DateNanosFormat, formatWithNanos, -} from '../../../common/field_formats/converters/date_nanos_shared'; -import { TextContextTypeConvert } from '../../../common/field_formats/types'; +} from '../../../common/converters/date_nanos_shared'; +import { TextContextTypeConvert } from '../../../common/types'; class DateNanosFormatServer extends DateNanosFormat { textConvert: TextContextTypeConvert = (val) => { diff --git a/src/plugins/data/server/field_formats/converters/date_server.ts b/src/plugins/field_formats/server/lib/converters/date_server.ts similarity index 90% rename from src/plugins/data/server/field_formats/converters/date_server.ts rename to src/plugins/field_formats/server/lib/converters/date_server.ts index a86f3c894c543..bf2151db0072c 100644 --- a/src/plugins/data/server/field_formats/converters/date_server.ts +++ b/src/plugins/field_formats/server/lib/converters/date_server.ts @@ -9,20 +9,13 @@ import { i18n } from '@kbn/i18n'; import { memoize, noop } from 'lodash'; import moment from 'moment-timezone'; -import { - FieldFormat, - KBN_FIELD_TYPES, - FIELD_FORMAT_IDS, - FieldFormatsGetConfigFn, -} from '../../../common'; -import { - IFieldFormatMetaParams, - TextContextTypeConvert, -} from '../../../common/field_formats/types'; +import { KBN_FIELD_TYPES } from '@kbn/field-types'; +import { FieldFormat, FIELD_FORMAT_IDS, FieldFormatsGetConfigFn } from '../../../common'; +import { IFieldFormatMetaParams, TextContextTypeConvert } from '../../../common/types'; export class DateFormat extends FieldFormat { static id = FIELD_FORMAT_IDS.DATE; - static title = i18n.translate('data.fieldFormats.date.title', { + static title = i18n.translate('fieldFormats.date.title', { defaultMessage: 'Date', }); static fieldType = KBN_FIELD_TYPES.DATE; diff --git a/src/plugins/data/server/field_formats/converters/index.ts b/src/plugins/field_formats/server/lib/converters/index.ts similarity index 100% rename from src/plugins/data/server/field_formats/converters/index.ts rename to src/plugins/field_formats/server/lib/converters/index.ts diff --git a/src/plugins/data/server/field_formats/mocks.ts b/src/plugins/field_formats/server/mocks.ts similarity index 100% rename from src/plugins/data/server/field_formats/mocks.ts rename to src/plugins/field_formats/server/mocks.ts diff --git a/src/plugins/data/server/field_formats/field_formats_service.test.ts b/src/plugins/field_formats/server/plugin.test.ts similarity index 58% rename from src/plugins/data/server/field_formats/field_formats_service.test.ts rename to src/plugins/field_formats/server/plugin.test.ts index 0bfa9f89117e8..266d724ce5e22 100644 --- a/src/plugins/data/server/field_formats/field_formats_service.test.ts +++ b/src/plugins/field_formats/server/plugin.test.ts @@ -6,16 +6,16 @@ * Side Public License, v 1. */ -import { FieldFormatsService } from './field_formats_service'; -import { DateFormat } from './converters/date_server'; -import { coreMock } from '../../../../core/server/mocks'; +import { DateFormat } from './lib/converters/date_server'; +import { coreMock } from '../../../core/server/mocks'; +import { FieldFormatsPlugin } from './plugin'; -describe('FieldFormatService', () => { +describe('FieldFormats registry server plugin', () => { test('DateFormat is server version', async () => { - const service = new FieldFormatsService(); - const fieldFormatsService = await service.start(); + const plugin = new FieldFormatsPlugin(coreMock.createPluginInitializerContext()); + const pluginStart = await plugin.start(coreMock.createStart()); const uiSettings = coreMock.createStart().uiSettings.asScopedToClient({} as any); - const fieldFormatsRegistry = await fieldFormatsService.fieldFormatServiceFactory(uiSettings); + const fieldFormatsRegistry = await pluginStart.fieldFormatServiceFactory(uiSettings); const DateFormatFromRegsitry = fieldFormatsRegistry.getTypeWithoutMetaParams('date'); expect(DateFormatFromRegsitry).toEqual(DateFormat); diff --git a/src/plugins/data/server/field_formats/field_formats_service.ts b/src/plugins/field_formats/server/plugin.ts old mode 100644 new mode 100755 similarity index 60% rename from src/plugins/data/server/field_formats/field_formats_service.ts rename to src/plugins/field_formats/server/plugin.ts index fa94e5dcef9cf..e2c64807433a9 --- a/src/plugins/data/server/field_formats/field_formats_service.ts +++ b/src/plugins/field_formats/server/plugin.ts @@ -8,28 +8,36 @@ import { has } from 'lodash'; import { - FieldFormatsRegistry, - FieldFormatInstanceType, - baseFormatters, -} from '../../common/field_formats'; -import { IUiSettingsClient } from '../../../../core/server'; -import { DateFormat, DateNanosFormat } from './converters'; - -export class FieldFormatsService { - private readonly fieldFormatClasses: FieldFormatInstanceType[] = [ + PluginInitializerContext, + CoreSetup, + CoreStart, + Plugin, + IUiSettingsClient, +} from '../../../core/server'; +import { FieldFormatsStart, FieldFormatsSetup } from './types'; +import { DateFormat, DateNanosFormat } from './lib/converters'; +import { baseFormatters, FieldFormatInstanceType, FieldFormatsRegistry } from '../common'; +import { getUiSettings } from './ui_settings'; + +export class FieldFormatsPlugin implements Plugin { + private readonly fieldFormats: FieldFormatInstanceType[] = [ DateFormat, DateNanosFormat, ...baseFormatters, ]; - public setup() { + constructor(initializerContext: PluginInitializerContext) {} + + public setup(core: CoreSetup) { + core.uiSettings.register(getUiSettings()); + return { register: (customFieldFormat: FieldFormatInstanceType) => - this.fieldFormatClasses.push(customFieldFormat), + this.fieldFormats.push(customFieldFormat), }; } - public start() { + public start(core: CoreStart) { return { fieldFormatServiceFactory: async (uiSettings: IUiSettingsClient) => { const fieldFormatsRegistry = new FieldFormatsRegistry(); @@ -43,16 +51,12 @@ export class FieldFormatsService { } }); - fieldFormatsRegistry.init((key: string) => uiConfigs[key], {}, this.fieldFormatClasses); + fieldFormatsRegistry.init((key: string) => uiConfigs[key], {}, this.fieldFormats); return fieldFormatsRegistry; }, }; } -} -/** @public */ -export type FieldFormatsSetup = ReturnType; - -/** @public */ -export type FieldFormatsStart = ReturnType; + public stop() {} +} diff --git a/src/plugins/field_formats/server/types.ts b/src/plugins/field_formats/server/types.ts new file mode 100755 index 0000000000000..eaf9c9ffdc390 --- /dev/null +++ b/src/plugins/field_formats/server/types.ts @@ -0,0 +1,26 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { FieldFormatInstanceType, FieldFormatsRegistry } from '../common'; +import { IUiSettingsClient } from '../../../core/server'; + +export interface FieldFormatsSetup { + /** + * Register a server side field formatter + * @param fieldFormat {@link FieldFormatInstanceType} + */ + register: (fieldFormat: FieldFormatInstanceType) => void; +} + +export interface FieldFormatsStart { + /** + * Create a field format registry + * @param uiSettings - {@link IUiSettingsClient} + */ + fieldFormatServiceFactory: (uiSettings: IUiSettingsClient) => Promise; +} diff --git a/src/plugins/field_formats/server/ui_settings.ts b/src/plugins/field_formats/server/ui_settings.ts new file mode 100644 index 0000000000000..f24ddc60e1f97 --- /dev/null +++ b/src/plugins/field_formats/server/ui_settings.ts @@ -0,0 +1,226 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { i18n } from '@kbn/i18n'; +import { schema } from '@kbn/config-schema'; +import { UiSettingsParams } from 'kibana/server'; +// @ts-ignore untyped module +import numeralLanguages from '@elastic/numeral/languages'; +import { FORMATS_UI_SETTINGS } from '../common'; + +// We add the `en` key manually here, since that's not a real numeral locale, but the +// default fallback in case the locale is not found. +const numeralLanguageIds = [ + 'en', + ...numeralLanguages.map((numeralLanguage: any) => { + return numeralLanguage.id; + }), +]; + +export function getUiSettings(): Record> { + return { + [FORMATS_UI_SETTINGS.SHORT_DOTS_ENABLE]: { + name: i18n.translate('fieldFormats.advancedSettings.shortenFieldsTitle', { + defaultMessage: 'Shorten fields', + }), + value: false, + description: i18n.translate('fieldFormats.advancedSettings.shortenFieldsText', { + defaultMessage: 'Shorten long fields, for example, instead of foo.bar.baz, show f.b.baz', + }), + schema: schema.boolean(), + }, + [FORMATS_UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP]: { + name: i18n.translate('fieldFormats.advancedSettings.format.defaultTypeMapTitle', { + defaultMessage: 'Field type format name', + }), + value: `{ + "ip": { "id": "ip", "params": {} }, + "date": { "id": "date", "params": {} }, + "date_nanos": { "id": "date_nanos", "params": {}, "es": true }, + "number": { "id": "number", "params": {} }, + "boolean": { "id": "boolean", "params": {} }, + "histogram": { "id": "histogram", "params": {} }, + "_source": { "id": "_source", "params": {} }, + "_default_": { "id": "string", "params": {} } +}`, + type: 'json', + description: i18n.translate('fieldFormats.advancedSettings.format.defaultTypeMapText', { + defaultMessage: + 'Map of the format name to use by default for each field type. ' + + '{defaultFormat} is used if the field type is not mentioned explicitly', + values: { + defaultFormat: '"_default_"', + }, + }), + schema: schema.object({ + ip: schema.object({ + id: schema.string(), + params: schema.object({}), + }), + date: schema.object({ + id: schema.string(), + params: schema.object({}), + }), + date_nanos: schema.object({ + id: schema.string(), + params: schema.object({}), + es: schema.boolean(), + }), + number: schema.object({ + id: schema.string(), + params: schema.object({}), + }), + boolean: schema.object({ + id: schema.string(), + params: schema.object({}), + }), + histogram: schema.object({ + id: schema.string(), + params: schema.object({}), + }), + _source: schema.object({ + id: schema.string(), + params: schema.object({}), + }), + _default_: schema.object({ + id: schema.string(), + params: schema.object({}), + }), + }), + }, + [FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN]: { + name: i18n.translate('fieldFormats.advancedSettings.format.numberFormatTitle', { + defaultMessage: 'Number format', + }), + value: '0,0.[000]', + type: 'string', + description: i18n.translate('fieldFormats.advancedSettings.format.numberFormatText', { + defaultMessage: 'Default {numeralFormatLink} for the "number" format', + description: + 'Part of composite text: fieldFormats.advancedSettings.format.numberFormatText + ' + + 'fieldFormats.advancedSettings.format.numberFormat.numeralFormatLinkText', + values: { + numeralFormatLink: + '' + + i18n.translate( + 'fieldFormats.advancedSettings.format.numberFormat.numeralFormatLinkText', + { + defaultMessage: 'numeral format', + } + ) + + '', + }, + }), + schema: schema.string(), + }, + [FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: { + name: i18n.translate('fieldFormats.advancedSettings.format.percentFormatTitle', { + defaultMessage: 'Percent format', + }), + value: '0,0.[000]%', + type: 'string', + description: i18n.translate('fieldFormats.advancedSettings.format.percentFormatText', { + defaultMessage: 'Default {numeralFormatLink} for the "percent" format', + description: + 'Part of composite text: fieldFormats.advancedSettings.format.percentFormatText + ' + + 'fieldFormats.advancedSettings.format.percentFormat.numeralFormatLinkText', + values: { + numeralFormatLink: + '' + + i18n.translate( + 'fieldFormats.advancedSettings.format.percentFormat.numeralFormatLinkText', + { + defaultMessage: 'numeral format', + } + ) + + '', + }, + }), + schema: schema.string(), + }, + [FORMATS_UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: { + name: i18n.translate('fieldFormats.advancedSettings.format.bytesFormatTitle', { + defaultMessage: 'Bytes format', + }), + value: '0,0.[0]b', + type: 'string', + description: i18n.translate('fieldFormats.advancedSettings.format.bytesFormatText', { + defaultMessage: 'Default {numeralFormatLink} for the "bytes" format', + description: + 'Part of composite text: fieldFormats.advancedSettings.format.bytesFormatText + ' + + 'fieldFormats.advancedSettings.format.bytesFormat.numeralFormatLinkText', + values: { + numeralFormatLink: + '' + + i18n.translate( + 'fieldFormats.advancedSettings.format.bytesFormat.numeralFormatLinkText', + { + defaultMessage: 'numeral format', + } + ) + + '', + }, + }), + schema: schema.string(), + }, + [FORMATS_UI_SETTINGS.FORMAT_CURRENCY_DEFAULT_PATTERN]: { + name: i18n.translate('fieldFormats.advancedSettings.format.currencyFormatTitle', { + defaultMessage: 'Currency format', + }), + value: '($0,0.[00])', + type: 'string', + description: i18n.translate('fieldFormats.advancedSettings.format.currencyFormatText', { + defaultMessage: 'Default {numeralFormatLink} for the "currency" format', + description: + 'Part of composite text: fieldFormats.advancedSettings.format.currencyFormatText + ' + + 'fieldFormats.advancedSettings.format.currencyFormat.numeralFormatLinkText', + values: { + numeralFormatLink: + '' + + i18n.translate( + 'fieldFormats.advancedSettings.format.currencyFormat.numeralFormatLinkText', + { + defaultMessage: 'numeral format', + } + ) + + '', + }, + }), + schema: schema.string(), + }, + [FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE]: { + name: i18n.translate('fieldFormats.advancedSettings.format.formattingLocaleTitle', { + defaultMessage: 'Formatting locale', + }), + value: 'en', + type: 'select', + options: numeralLanguageIds, + optionLabels: Object.fromEntries( + numeralLanguages.map((language: Record) => [language.id, language.name]) + ), + description: i18n.translate('fieldFormats.advancedSettings.format.formattingLocaleText', { + defaultMessage: `{numeralLanguageLink} locale`, + description: + 'Part of composite text: fieldFormats.advancedSettings.format.formattingLocale.numeralLanguageLinkText + ' + + 'fieldFormats.advancedSettings.format.formattingLocaleText', + values: { + numeralLanguageLink: + '' + + i18n.translate( + 'fieldFormats.advancedSettings.format.formattingLocale.numeralLanguageLinkText', + { + defaultMessage: 'Numeral language', + } + ) + + '', + }, + }), + schema: schema.string(), + }, + }; +} diff --git a/src/plugins/field_formats/tsconfig.json b/src/plugins/field_formats/tsconfig.json new file mode 100644 index 0000000000000..4382ab1051c1d --- /dev/null +++ b/src/plugins/field_formats/tsconfig.json @@ -0,0 +1,19 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": [ + "common/**/*", + "public/**/*", + "server/**/*", + "config.ts", + "common/**/*.json", + "public/**/*.json" + ], + "references": [{ "path": "../../core/tsconfig.json" }] +} diff --git a/src/plugins/index_pattern_field_editor/kibana.json b/src/plugins/index_pattern_field_editor/kibana.json index a3a7e61e9806e..02308b349d4ca 100644 --- a/src/plugins/index_pattern_field_editor/kibana.json +++ b/src/plugins/index_pattern_field_editor/kibana.json @@ -5,7 +5,7 @@ "ui": true, "requiredPlugins": ["data"], "optionalPlugins": ["usageCollection"], - "requiredBundles": ["kibanaReact", "esUiShared", "usageCollection"], + "requiredBundles": ["kibanaReact", "esUiShared", "usageCollection", "fieldFormats"], "owner": { "name": "App Services", "githubTeam": "kibana-app-services" diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx index 04be866a33ca7..219a51e421b44 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { coreMock } from 'src/core/public/mocks'; import { createKibanaReactContext } from '../../../../../../kibana_react/public'; -import { FieldFormat } from 'src/plugins/data/public'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { BytesFormatEditor } from './bytes'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/color.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/color.test.tsx index 1026012f3b887..4b0df63261496 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/color.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/color.test.tsx @@ -8,17 +8,16 @@ import React from 'react'; import { shallowWithI18nProvider } from '@kbn/test/jest'; -import { FieldFormat } from 'src/plugins/data/public'; import { ColorFormatEditor } from './color'; -import { fieldFormats } from '../../../../../../data/public'; +import { FieldFormat, DEFAULT_CONVERTER_COLOR } from '../../../../../../field_formats/common'; const fieldType = 'string'; const format = { getConverterFor: jest.fn(), }; const formatParams = { - colors: [{ ...fieldFormats.DEFAULT_CONVERTER_COLOR }], + colors: [{ ...DEFAULT_CONVERTER_COLOR }], }; const onChange = jest.fn(); const onError = jest.fn(); diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/color.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/color.tsx index 3570ef4c9d33a..67290212c04dd 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/color.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/color.tsx @@ -15,7 +15,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import { DefaultFormatEditor } from '../default/default'; import { formatId } from './constants'; -import { fieldFormats } from '../../../../../../data/public'; +import { DEFAULT_CONVERTER_COLOR } from '../../../../../../field_formats/common'; import { FormatEditorProps } from '../types'; interface Color { @@ -56,7 +56,7 @@ export class ColorFormatEditor extends DefaultFormatEditor { const colors = [...(this.props.formatParams.colors || [])]; this.onChange({ - colors: [...colors, { ...fieldFormats.DEFAULT_CONVERTER_COLOR }], + colors: [...colors, { ...DEFAULT_CONVERTER_COLOR }], }); }; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/date/date.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/date/date.test.tsx index f3f46cbbdda31..348ac86e209ea 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/date/date.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/date/date.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import { DateFormatEditor } from './date'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx index 4e8d56f91c6eb..8fc4f4dbdfdb6 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import type { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import { DateNanosFormatEditor } from './date_nanos'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/default/default.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/default/default.test.tsx index 90f1d43fa357a..c56d1c0261ed1 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/default/default.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/default/default.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { FieldFormat } from 'src/plugins/data/public'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { SampleInput } from '../../types'; import { DefaultFormatEditor, convertSampleInput } from './default'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/default/default.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/default/default.tsx index 7228a02afa2a5..129049e1b0565 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/default/default.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/default/default.tsx @@ -9,7 +9,7 @@ import React, { PureComponent, ReactText } from 'react'; import { i18n } from '@kbn/i18n'; -import { FieldFormatsContentType } from 'src/plugins/data/public'; +import type { FieldFormatsContentType } from 'src/plugins/field_formats/common'; import { Sample, SampleInput } from '../../types'; import { FormatEditorProps } from '../types'; import { formatId } from './constants'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx index 80a57b9419763..dbc369126d64e 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DurationFormatEditor } from './duration'; -import { FieldFormat } from 'src/plugins/data/public'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { EuiSwitch } from '@elastic/eui'; const fieldType = 'number'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.tsx index 2bfb0182cbb88..89bac89a95b76 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.tsx @@ -7,7 +7,7 @@ */ import React, { Fragment } from 'react'; -import { DurationFormat } from 'src/plugins/data/common'; +import { DurationFormat } from 'src/plugins/field_formats/common'; import { EuiFieldNumber, EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx index 053dff1213908..4c34af8748f59 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import { HistogramFormatEditor } from './histogram'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/number/number.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/number/number.test.tsx index ad71263978d9c..1554da93dac53 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/number/number.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/number/number.test.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { coreMock } from 'src/core/public/mocks'; import { createKibanaReactContext } from '../../../../../../kibana_react/public'; -import { FieldFormat } from 'src/plugins/data/public'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { NumberFormatEditor } from './number'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx index 6f6a88cfb7c95..ef71055deca7b 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { coreMock } from 'src/core/public/mocks'; import { createKibanaReactContext } from '../../../../../../kibana_react/public'; -import { FieldFormat } from 'src/plugins/data/public'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { PercentFormatEditor } from './percent'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx index 8d9cb17b33a40..68a65e5a0fa6c 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { shallowWithI18nProvider } from '@kbn/test/jest'; import { StaticLookupFormatEditorFormatParams } from './static_lookup'; -import { FieldFormat } from 'src/plugins/data/public'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { StaticLookupFormatEditor } from './static_lookup'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/string/string.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/string/string.test.tsx index 5b573d938ebb2..61076353dbf5e 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/string/string.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/string/string.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { FieldFormat } from 'src/plugins/data/public'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { StringFormatEditor } from './string'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx index 6a4ae0fde0c59..acba1fbedb206 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx @@ -9,7 +9,7 @@ import React, { ChangeEvent } from 'react'; import { shallow } from 'enzyme'; import { EuiFieldNumber } from '@elastic/eui'; -import { FieldFormat } from 'src/plugins/data/public'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { TruncateFormatEditor } from './truncate'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/types.ts b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/types.ts index 556078286e524..cbdd8efb2a4c8 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/types.ts +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/types.ts @@ -7,7 +7,7 @@ */ import type { ComponentType } from 'react'; -import type { FieldFormat } from '../../../../../data/common'; +import type { FieldFormat } from '../../../../../field_formats/common'; import type { FormatSelectEditorProps } from '../field_format_editor'; /** diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx index 1000d9d2b8650..79dc63230dc33 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx @@ -7,7 +7,7 @@ */ import React from 'react'; -import { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import { __IntlProvider as IntlProvider } from '@kbn/i18n/react'; import { UrlFormatEditor } from './url'; import { coreMock } from 'src/core/public/mocks'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/field_format_editor.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/field_format_editor.tsx index ccb6cf7794f87..1c0c7ecba3b2b 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/field_format_editor.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/field_format_editor.tsx @@ -12,12 +12,12 @@ import { EuiCode, EuiFormRow, EuiSelect } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; import { - FieldFormatInstanceType, IndexPattern, KBN_FIELD_TYPES, ES_FIELD_TYPES, DataPublicPluginStart, } from 'src/plugins/data/public'; +import type { FieldFormatInstanceType } from 'src/plugins/field_formats/common'; import { CoreStart } from 'src/core/public'; import { castEsToKbnFieldTypeName } from '../../../../data/public'; import { FormatEditor } from './format_editor'; diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/format_editor.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/format_editor.tsx index dbbaf51f114b1..c6f5fc9899ac7 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/format_editor.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/format_editor.tsx @@ -9,7 +9,7 @@ import { EuiDelayRender, EuiLoadingContent } from '@elastic/eui'; import { memoize } from 'lodash'; import React, { PureComponent, LazyExoticComponent } from 'react'; -import type { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import { FieldFormatEditorFactory, FieldFormatEditor } from './editors'; export interface FormatEditorProps { diff --git a/src/plugins/index_pattern_field_editor/public/shared_imports.ts b/src/plugins/index_pattern_field_editor/public/shared_imports.ts index 9caa5e093a96f..cfc36543780c1 100644 --- a/src/plugins/index_pattern_field_editor/public/shared_imports.ts +++ b/src/plugins/index_pattern_field_editor/public/shared_imports.ts @@ -6,12 +6,7 @@ * Side Public License, v 1. */ -export { - IndexPattern, - IndexPatternField, - DataPublicPluginStart, - FieldFormat, -} from '../../data/public'; +export { IndexPattern, IndexPatternField, DataPublicPluginStart } from '../../data/public'; export { UsageCollectionStart } from '../../usage_collection/public'; @@ -19,6 +14,8 @@ export { RuntimeType, RuntimeField, KBN_FIELD_TYPES, ES_FIELD_TYPES } from '../. export { createKibanaReactContext, toMountPoint, CodeEditor } from '../../kibana_react/public'; +export { FieldFormat } from '../../field_formats/common'; + export { useForm, useFormData, diff --git a/src/plugins/index_pattern_field_editor/tsconfig.json b/src/plugins/index_pattern_field_editor/tsconfig.json index 559b1aaf0fc26..5450ae74a91a0 100644 --- a/src/plugins/index_pattern_field_editor/tsconfig.json +++ b/src/plugins/index_pattern_field_editor/tsconfig.json @@ -16,5 +16,6 @@ { "path": "../kibana_react/tsconfig.json" }, { "path": "../kibana_utils/tsconfig.json" }, { "path": "../es_ui_shared/tsconfig.json" }, + { "path": "../field_formats/tsconfig.json" } ] } diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx b/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx index c2f0c7cbfd64c..1a06fdf425500 100644 --- a/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx +++ b/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx @@ -10,7 +10,7 @@ import React, { PureComponent } from 'react'; import { shallow } from 'enzyme'; import { FieldFormatEditor } from './field_format_editor'; -import type { FieldFormat } from '../../../../../../data/public'; +import type { FieldFormat } from '../../../../../../field_formats/common'; class TestEditor extends PureComponent { render() { diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx b/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx index 545a464da0eb3..3689ae70639c8 100644 --- a/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx +++ b/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx @@ -13,7 +13,7 @@ import type { FieldFormatEditorFactory, FieldFormatEditor as InnerFieldFormatEditor, } from 'src/plugins/index_pattern_field_editor/public'; -import type { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; export interface FieldFormatEditorProps { fieldType: string; diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx index ae3783ecfec09..18c749d448da8 100644 --- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx +++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx @@ -6,12 +6,8 @@ * Side Public License, v 1. */ -import { - IndexPattern, - IndexPatternField, - FieldFormatInstanceType, - IndexPatternsService, -} from 'src/plugins/data/public'; +import { IndexPattern, IndexPatternField, IndexPatternsService } from 'src/plugins/data/public'; +import { FieldFormatInstanceType } from 'src/plugins/field_formats/common'; import { findTestSubject } from '@elastic/eui/lib/test'; jest.mock('brace/mode/groovy', () => ({})); diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx index b5c0186cd998c..bdc18938f9d6c 100644 --- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx +++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx @@ -33,13 +33,13 @@ import { import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; +import type { FieldFormatInstanceType } from 'src/plugins/field_formats/common'; import { getEnabledScriptingLanguages, getDeprecatedScriptingLanguages, getSupportedScriptingLanguages, } from '../../scripting_languages'; import { - FieldFormatInstanceType, IndexPattern, IndexPatternField, KBN_FIELD_TYPES, diff --git a/src/plugins/vis_default_editor/kibana.json b/src/plugins/vis_default_editor/kibana.json index c89e5ec1abaff..93a5afed6a92e 100644 --- a/src/plugins/vis_default_editor/kibana.json +++ b/src/plugins/vis_default_editor/kibana.json @@ -3,7 +3,7 @@ "version": "kibana", "ui": true, "optionalPlugins": ["visualize"], - "requiredBundles": ["kibanaUtils", "kibanaReact", "data"], + "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "fieldFormats"], "owner": { "name": "Kibana App", "githubTeam": "kibana-app" diff --git a/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx b/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx index 542055d185ec5..74f254c6176bc 100644 --- a/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx +++ b/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx @@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import { EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui'; import { SwitchOption } from './switch'; import { useKibana } from '../../../../kibana_react/public'; -import { UI_SETTINGS } from '../../../../data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../field_formats/common'; export interface PercentageModeOptionProps { setValue: ( @@ -31,7 +31,9 @@ function PercentageModeOption({ formatPattern, }: PercentageModeOptionProps) { const { services } = useKibana(); - const defaultPattern = services.uiSettings?.get(UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN); + const defaultPattern = services.uiSettings?.get( + FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN + ); return ( <> diff --git a/src/plugins/vis_default_editor/tsconfig.json b/src/plugins/vis_default_editor/tsconfig.json index 27bb775c2d0e8..34003bced5ad0 100644 --- a/src/plugins/vis_default_editor/tsconfig.json +++ b/src/plugins/vis_default_editor/tsconfig.json @@ -16,5 +16,6 @@ { "path": "../visualize/tsconfig.json" }, { "path": "../kibana_utils/tsconfig.json" }, { "path": "../kibana_react/tsconfig.json" }, + { "path": "../field_formats/tsconfig.json" } ] } diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx b/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx index 66be8febc496f..87ca902f6c090 100644 --- a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx +++ b/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx @@ -11,7 +11,7 @@ import React, { Component } from 'react'; import { isColorDark } from '@elastic/eui'; import { MetricVisValue } from './metric_vis_value'; import { Input } from '../metric_vis_fn'; -import { FieldFormatsContentType, IFieldFormat } from '../../../data/public'; +import type { FieldFormatsContentType, IFieldFormat } from '../../../field_formats/common'; import { Datatable } from '../../../expressions/public'; import { getHeatmapColors } from '../../../charts/public'; import { VisParams, MetricVisMetric } from '../types'; diff --git a/src/plugins/vis_type_metric/tsconfig.json b/src/plugins/vis_type_metric/tsconfig.json index 7441848d5a430..bee666a5906cd 100644 --- a/src/plugins/vis_type_metric/tsconfig.json +++ b/src/plugins/vis_type_metric/tsconfig.json @@ -15,6 +15,7 @@ { "path": "../charts/tsconfig.json" }, { "path": "../expressions/tsconfig.json" }, { "path": "../kibana_utils/tsconfig.json" }, - { "path": "../vis_default_editor/tsconfig.json" } + { "path": "../vis_default_editor/tsconfig.json" }, + { "path": "../field_formats/tsconfig.json" } ] } diff --git a/src/plugins/vis_type_pie/public/pie_component.tsx b/src/plugins/vis_type_pie/public/pie_component.tsx index b79eed2087a16..c0f4a8a6112f8 100644 --- a/src/plugins/vis_type_pie/public/pie_component.tsx +++ b/src/plugins/vis_type_pie/public/pie_component.tsx @@ -26,7 +26,8 @@ import { ChartsPluginSetup, PaletteRegistry, } from '../../charts/public'; -import { DataPublicPluginStart, FieldFormat } from '../../data/public'; +import { DataPublicPluginStart } from '../../data/public'; +import type { FieldFormat } from '../../field_formats/common'; import type { PersistedState } from '../../visualizations/public'; import { Datatable, DatatableColumn, IInterpreterRenderHandlers } from '../../expressions/public'; import { DEFAULT_PERCENT_DECIMALS } from '../common'; diff --git a/src/plugins/vis_type_pie/public/utils/filter_helpers.ts b/src/plugins/vis_type_pie/public/utils/filter_helpers.ts index 251ff8acc698e..f1a4791821c12 100644 --- a/src/plugins/vis_type_pie/public/utils/filter_helpers.ts +++ b/src/plugins/vis_type_pie/public/utils/filter_helpers.ts @@ -8,7 +8,8 @@ import { LayerValue, SeriesIdentifier } from '@elastic/charts'; import { Datatable, DatatableColumn } from '../../../expressions/public'; -import { DataPublicPluginStart, FieldFormat } from '../../../data/public'; +import { DataPublicPluginStart } from '../../../data/public'; +import type { FieldFormat } from '../../../field_formats/common'; import { ClickTriggerEvent } from '../../../charts/public'; import { ValueClickContext } from '../../../embeddable/public'; import { BucketColumns } from '../types'; diff --git a/src/plugins/vis_type_pie/public/utils/get_split_dimension_accessor.ts b/src/plugins/vis_type_pie/public/utils/get_split_dimension_accessor.ts index e1029b11a7b75..5addae51dd011 100644 --- a/src/plugins/vis_type_pie/public/utils/get_split_dimension_accessor.ts +++ b/src/plugins/vis_type_pie/public/utils/get_split_dimension_accessor.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ import { AccessorFn } from '@elastic/charts'; -import { FieldFormatsStart } from '../../../data/public'; +import type { FieldFormatsStart } from '../../../field_formats/public'; import { DatatableColumn } from '../../../expressions/public'; import { Dimension } from '../types'; diff --git a/src/plugins/vis_type_pie/tsconfig.json b/src/plugins/vis_type_pie/tsconfig.json index f12db316f1972..69bd2855b9843 100644 --- a/src/plugins/vis_type_pie/tsconfig.json +++ b/src/plugins/vis_type_pie/tsconfig.json @@ -20,5 +20,6 @@ { "path": "../visualizations/tsconfig.json" }, { "path": "../usage_collection/tsconfig.json" }, { "path": "../vis_default_editor/tsconfig.json" }, + { "path": "../field_formats/tsconfig.json" } ] } \ No newline at end of file diff --git a/src/plugins/vis_type_table/public/legacy/agg_table/agg_table.test.js b/src/plugins/vis_type_table/public/legacy/agg_table/agg_table.test.js index cbc3db6585a7d..2f423538568bd 100644 --- a/src/plugins/vis_type_table/public/legacy/agg_table/agg_table.test.js +++ b/src/plugins/vis_type_table/public/legacy/agg_table/agg_table.test.js @@ -17,7 +17,7 @@ import { getFieldFormatsRegistry } from '../../../../data/public/test_utils'; import { coreMock } from '../../../../../core/public/mocks'; import { initAngularBootstrap } from '../../../../kibana_legacy/public/angular_bootstrap'; import { setUiSettings } from '../../../../data/public/services'; -import { UI_SETTINGS } from '../../../../data/public/'; +import { FORMATS_UI_SETTINGS } from '../../../../field_formats/common/'; import { CSV_SEPARATOR_SETTING, CSV_QUOTE_VALUES_SETTING } from '../../../../share/public'; import { setFormatService } from '../../services'; @@ -38,12 +38,12 @@ describe('Table Vis - AggTable Directive', function () { const defaultValues = { dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS', 'dateFormat:tz': 'UTC', - [UI_SETTINGS.SHORT_DOTS_ENABLE]: true, - [UI_SETTINGS.FORMAT_CURRENCY_DEFAULT_PATTERN]: '($0,0.[00])', - [UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN]: '0,0.[000]', - [UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: '0,0.[000]%', - [UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE]: 'en', - [UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP]: {}, + [FORMATS_UI_SETTINGS.SHORT_DOTS_ENABLE]: true, + [FORMATS_UI_SETTINGS.FORMAT_CURRENCY_DEFAULT_PATTERN]: '($0,0.[00])', + [FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN]: '0,0.[000]', + [FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: '0,0.[000]%', + [FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE]: 'en', + [FORMATS_UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP]: {}, [CSV_SEPARATOR_SETTING]: ',', [CSV_QUOTE_VALUES_SETTING]: true, }; diff --git a/src/plugins/vis_type_table/public/types.ts b/src/plugins/vis_type_table/public/types.ts index 8f35909d3bfba..4df6f2b94e17b 100644 --- a/src/plugins/vis_type_table/public/types.ts +++ b/src/plugins/vis_type_table/public/types.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IFieldFormat } from 'src/plugins/data/public'; +import type { IFieldFormat } from 'src/plugins/field_formats/common'; import { DatatableColumn, DatatableRow } from 'src/plugins/expressions'; import { ExpressionValueVisDimension } from 'src/plugins/visualizations/public'; import { TableVisParams } from '../common'; diff --git a/src/plugins/vis_type_table/public/utils/add_percentage_column.test.ts b/src/plugins/vis_type_table/public/utils/add_percentage_column.test.ts index 0280637acc099..51eef1446bac6 100644 --- a/src/plugins/vis_type_table/public/utils/add_percentage_column.test.ts +++ b/src/plugins/vis_type_table/public/utils/add_percentage_column.test.ts @@ -12,7 +12,7 @@ jest.mock('../services', () => ({ })), })); -import { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import { TableContext } from '../types'; import { addPercentageColumn } from './add_percentage_column'; diff --git a/src/plugins/vis_type_table/tsconfig.json b/src/plugins/vis_type_table/tsconfig.json index ccff3c349cf21..50277d51e8748 100644 --- a/src/plugins/vis_type_table/tsconfig.json +++ b/src/plugins/vis_type_table/tsconfig.json @@ -24,5 +24,6 @@ { "path": "../kibana_legacy/tsconfig.json" }, { "path": "../kibana_react/tsconfig.json" }, { "path": "../vis_default_editor/tsconfig.json" }, + { "path": "../field_formats/tsconfig.json" } ] } diff --git a/src/plugins/vis_type_timeseries/kibana.json b/src/plugins/vis_type_timeseries/kibana.json index 3a2ad6bdd77cf..c172640a4c14e 100644 --- a/src/plugins/vis_type_timeseries/kibana.json +++ b/src/plugins/vis_type_timeseries/kibana.json @@ -6,7 +6,7 @@ "ui": true, "requiredPlugins": ["charts", "data", "expressions", "visualizations", "visualize"], "optionalPlugins": ["usageCollection"], - "requiredBundles": ["kibanaUtils", "kibanaReact"], + "requiredBundles": ["kibanaUtils", "kibanaReact", "fieldFormats"], "owner": { "name": "Kibana App", "githubTeam": "kibana-app" diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.test.js b/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.test.js index 04af5786d2e8e..9b9beae67e44f 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.test.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.test.js @@ -10,6 +10,7 @@ import { createTickFormatter } from './tick_formatter'; import { getFieldFormatsRegistry } from '../../../../../data/public/test_utils'; import { setFieldFormats } from '../../../services'; import { UI_SETTINGS } from '../../../../../data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../field_formats/common'; const mockUiSettings = { get: (item) => { @@ -22,7 +23,7 @@ const mockUiSettings = { [UI_SETTINGS.QUERY_STRING_OPTIONS]: {}, [UI_SETTINGS.COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX]: true, 'dateFormat:tz': 'Browser', - [UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP]: {}, + [FORMATS_UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP]: {}, }; const mockCore = { @@ -45,7 +46,7 @@ describe('createTickFormatter(format, template)', () => { test('returns a percent with percent formatter', () => { const config = { - [UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: '0.[00]%', + [FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: '0.[00]%', }; const fn = createTickFormatter('percent', null, (key) => config[key]); expect(fn(0.5556)).toEqual('55.56%'); @@ -53,7 +54,7 @@ describe('createTickFormatter(format, template)', () => { test('returns a byte formatted string with byte formatter', () => { const config = { - [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0.0b', + [FORMATS_UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0.0b', }; const fn = createTickFormatter('bytes', null, (key) => config[key]); expect(fn(1500 ^ 10)).toEqual('1.5KB'); @@ -66,7 +67,7 @@ describe('createTickFormatter(format, template)', () => { test('returns a located string with custom locale setting', () => { const config = { - [UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE]: 'fr', + [FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE]: 'fr', }; const fn = createTickFormatter('0,0.0', null, (key) => config[key]); expect(fn(1500)).toEqual('1 500,0'); @@ -89,7 +90,7 @@ describe('createTickFormatter(format, template)', () => { test('returns formatted value if passed a bad template', () => { const config = { - [UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN]: '0,0.[00]', + [FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN]: '0,0.[00]', }; const fn = createTickFormatter('number', '{{value', (key) => config[key]); expect(fn(1.5556)).toEqual('1.56'); diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/vis.js index 4db038de912f5..ba235a20b97ce 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/vis.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/vis.js @@ -15,7 +15,7 @@ import { createTickFormatter } from '../../lib/tick_formatter'; import { isSortable } from './is_sortable'; import { EuiToolTip, EuiIcon } from '@elastic/eui'; import { replaceVars } from '../../lib/replace_vars'; -import { fieldFormats } from '../../../../../../../plugins/data/public'; +import { FIELD_FORMAT_IDS } from '../../../../../../../plugins/field_formats/common'; import { FormattedMessage } from '@kbn/i18n/react'; import { getFieldFormats, getCoreStart } from '../../../../services'; import { getValueOrEmpty } from '../../../../../common/empty_label'; @@ -47,7 +47,7 @@ class TableVis extends Component { super(props); const fieldFormatsService = getFieldFormats(); - const DateFormat = fieldFormatsService.getType(fieldFormats.FIELD_FORMAT_IDS.DATE); + const DateFormat = fieldFormatsService.getType(FIELD_FORMAT_IDS.DATE); this.dateFormatter = new DateFormat({}, this.props.getConfig); } diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.test.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.test.js index b2aa4a6d0c9fe..fd155623d5da7 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.test.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.test.js @@ -11,14 +11,14 @@ import { shallow } from 'enzyme'; import { TimeSeries } from '../../../visualizations/views/timeseries'; import TimeseriesVisualization from './vis'; import { setFieldFormats } from '../../../../services'; -import { UI_SETTINGS } from '../../../../../../data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common'; import { getFieldFormatsRegistry } from '../../../../../../data/public/test_utils'; describe('TimeseriesVisualization', () => { describe('TimeSeries Y-Axis formatted value', () => { const config = { - [UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: '0.[00]%', - [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0.0b', + [FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: '0.[00]%', + [FORMATS_UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0.0b', }; const id = 'default'; const value = 500; diff --git a/src/plugins/vis_type_vislib/kibana.json b/src/plugins/vis_type_vislib/kibana.json index 26d20b1ff839f..412264a3e7270 100644 --- a/src/plugins/vis_type_vislib/kibana.json +++ b/src/plugins/vis_type_vislib/kibana.json @@ -4,7 +4,7 @@ "server": true, "ui": true, "requiredPlugins": ["charts", "data", "expressions", "visualizations", "kibanaLegacy"], - "requiredBundles": ["kibanaUtils", "visDefaultEditor", "visTypeXy", "visTypePie"], + "requiredBundles": ["kibanaUtils", "visDefaultEditor", "visTypeXy", "visTypePie", "fieldFormats"], "owner": { "name": "Kibana App", "githubTeam": "kibana-app" diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js index 5e1f0bfbb4464..04ab8db1cda8f 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js @@ -9,7 +9,7 @@ import { last } from 'lodash'; import React from 'react'; import { renderToStaticMarkup } from 'react-dom/server'; -import { UI_SETTINGS } from '../../../../../../plugins/data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../../plugins/field_formats/common'; import { getValueForPercentageMode } from '../../percentage_mode_transform'; function getMax(handler, config, isGauge) { @@ -55,7 +55,7 @@ export function pointSeriesTooltipFormatter() { if (isPercentageMode && !isSetColorRange) { const percentageFormatPattern = config.get( isGauge ? 'gauge.percentageFormatPattern' : 'percentageFormatPattern', - uiSettings.get(UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN) + uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN) ); value = getValueForPercentageMode( value / getMax(handler, config, isGauge), diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts index 04afc86548f22..815d0e10aafb2 100644 --- a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts +++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IFieldFormatsRegistry } from '../../../../../data/common'; +import { IFieldFormatsRegistry } from '../../../../../field_formats/common'; import { getPoint } from './_get_point'; import { setFormatService } from '../../../services'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js index b7f5b966a08c6..65f7df6459bfe 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js @@ -10,7 +10,7 @@ import d3 from 'd3'; import _ from 'lodash'; import { getHeatmapColors } from '../../../../../charts/public'; -import { UI_SETTINGS } from '../../../../../data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../field_formats/common'; import { getValueForPercentageMode } from '../../percentage_mode_transform'; const arcAngles = { @@ -73,7 +73,7 @@ export class MeterGauge { const isPercentageMode = this.gaugeConfig.percentageMode; const percentageFormatPattern = this.gaugeConfig.percentageFormatPattern || - this.uiSettings.get(UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN); + this.uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN); const colorsRange = this.gaugeConfig.colorsRange; const max = _.last(colorsRange).to; const labels = []; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js index 0dc1e18270f78..a25d408769273 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js @@ -13,7 +13,7 @@ import { isColorDark } from '@elastic/eui'; import { PointSeries } from './_point_series'; import { getHeatmapColors } from '../../../../../../plugins/charts/public'; -import { UI_SETTINGS } from '../../../../../../plugins/data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../../plugins/field_formats/common'; import { getValueForPercentageMode } from '../../percentage_mode_transform'; const defaults = { @@ -54,7 +54,7 @@ export class HeatmapChart extends PointSeries { const percentageMode = cfg.get('percentageMode'); const percentageFormatPattern = cfg.get( 'percentageFormatPattern', - this.uiSettings.get(UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN) + this.uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN) ); const colorsNumber = cfg.get('colorsNumber'); const colorsRange = cfg.get('colorsRange'); diff --git a/test/functional/apps/visualize/legacy/index.ts b/test/functional/apps/visualize/legacy/index.ts index d474287860b25..37cf8a5950592 100644 --- a/test/functional/apps/visualize/legacy/index.ts +++ b/test/functional/apps/visualize/legacy/index.ts @@ -7,7 +7,7 @@ */ import { FtrProviderContext } from '../../../ftr_provider_context'; -import { UI_SETTINGS } from '../../../../../src/plugins/data/common'; +import { FORMATS_UI_SETTINGS } from '../../../../../src/plugins/field_formats/common'; export default function ({ getPageObjects, getService, loadTestFile }: FtrProviderContext) { const browser = getService('browser'); @@ -26,7 +26,7 @@ export default function ({ getPageObjects, getService, loadTestFile }: FtrProvid await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', - [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b', + [FORMATS_UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b', }); }); diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts index 617cd42c06546..966a9d29b3264 100644 --- a/test/functional/page_objects/visualize_page.ts +++ b/test/functional/page_objects/visualize_page.ts @@ -8,7 +8,7 @@ import { FtrService } from '../ftr_provider_context'; import { VisualizeConstants } from '../../../src/plugins/visualize/public/application/visualize_constants'; -import { UI_SETTINGS } from '../../../src/plugins/data/common'; +import { FORMATS_UI_SETTINGS } from '../../../src/plugins/field_formats/common'; // TODO: Remove & Refactor to use the TTV page objects interface VisualizeSaveModalArgs { @@ -55,7 +55,7 @@ export class VisualizePageObject extends FtrService { await this.kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', - [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b', + [FORMATS_UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b', 'visualization:visualize:legacyChartsLibrary': !isNewLibrary, 'visualization:visualize:legacyPieChartsLibrary': !isNewLibrary, }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts index 06376bf1d750b..76176f6ba2133 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts @@ -8,7 +8,7 @@ import { openSans } from '../../../common/lib/fonts'; import { ElementFactory } from '../../../types'; import { SetupInitializer } from '../../plugin'; -import { UI_SETTINGS } from '../../../../../../src/plugins/data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../../src/plugins/field_formats/common'; export const metricElementInitializer: SetupInitializer = (core, setup) => { return () => ({ @@ -22,10 +22,10 @@ export const metricElementInitializer: SetupInitializer = (core, expression: `filters | demodata | math "unique(country)" - | metric "Countries" - metricFont={font size=48 family="${openSans.value}" color="#000000" align="center" lHeight=48} + | metric "Countries" + metricFont={font size=48 family="${openSans.value}" color="#000000" align="center" lHeight=48} labelFont={font size=14 family="${openSans.value}" color="#000000" align="center"} - metricFormat="${core.uiSettings.get(UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN)}" + metricFormat="${core.uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN)}" | render`, }); }; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts index 90f5da78f79b2..7c7d573bcd76c 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts @@ -11,7 +11,7 @@ import { templateFromReactComponent } from '../../../../public/lib/template_from import { ArgumentFactory } from '../../../../types/arguments'; import { ArgumentStrings } from '../../../../i18n'; import { SetupInitializer } from '../../../plugin'; -import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../../../src/plugins/field_formats/common'; const { NumberFormat: strings } = ArgumentStrings; @@ -20,11 +20,11 @@ export const numberFormatInitializer: SetupInitializer { const formatMap = { - NUMBER: core.uiSettings.get(UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN), - PERCENT: core.uiSettings.get(UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN), - CURRENCY: core.uiSettings.get(UI_SETTINGS.FORMAT_CURRENCY_DEFAULT_PATTERN), + NUMBER: core.uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN), + PERCENT: core.uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN), + CURRENCY: core.uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_CURRENCY_DEFAULT_PATTERN), DURATION: '00:00:00', - BYTES: core.uiSettings.get(UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN), + BYTES: core.uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN), }; const numberFormats = [ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts index 501c3fb464c90..775588226aa80 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts @@ -8,7 +8,7 @@ import { openSans } from '../../../common/lib/fonts'; import { ViewStrings } from '../../../i18n'; import { SetupInitializer } from '../../plugin'; -import { UI_SETTINGS } from '../../../../../../src/plugins/data/public'; +import { FORMATS_UI_SETTINGS } from '../../../../../../src/plugins/field_formats/common'; const { Metric: strings } = ViewStrings; @@ -24,7 +24,7 @@ export const metricInitializer: SetupInitializer = (core, plugin) => { displayName: strings.getMetricFormatDisplayName(), help: strings.getMetricFormatHelp(), argType: 'numberFormat', - default: `"${core.uiSettings.get(UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN)}"`, + default: `"${core.uiSettings.get(FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN)}"`, }, { name: '_', diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json index 263284564de80..c465176e7ed01 100644 --- a/x-pack/plugins/canvas/kibana.json +++ b/x-pack/plugins/canvas/kibana.json @@ -36,6 +36,7 @@ "lens", "maps", "savedObjects", - "visualizations" + "visualizations", + "fieldFormats" ] } diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json index 01aca7c2bbaee..e7f2d71313abf 100644 --- a/x-pack/plugins/data_visualizer/kibana.json +++ b/x-pack/plugins/data_visualizer/kibana.json @@ -23,7 +23,8 @@ "home", "kibanaReact", "maps", - "esUiShared" + "esUiShared", + "fieldFormats" ], "extraPublicDirs": [ "common" diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js index 6a68ebeef7c30..5d54b6c936fb2 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js @@ -5,7 +5,8 @@ * 2.0. */ -import { FIELD_FORMAT_IDS, UI_SETTINGS } from '../../../../../../../src/plugins/data/common'; +import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common'; +import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common'; import { ary, assign, isPlainObject, isString, sortBy } from 'lodash'; import moment from 'moment'; import dateMath from '@elastic/datemath'; diff --git a/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx b/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx index f5d457db65234..b5ff0a7e6915b 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx +++ b/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx @@ -6,7 +6,7 @@ */ import { getSortingCriteria } from './sorting'; -import { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import { DatatableColumnType } from 'src/plugins/expressions'; function getMockFormatter() { diff --git a/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx b/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx index 13ca811b0b082..30060c10ea37e 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx +++ b/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx @@ -7,7 +7,7 @@ import ipaddr from 'ipaddr.js'; import type { IPv4, IPv6 } from 'ipaddr.js'; -import type { FieldFormat } from '../../../../../../src/plugins/data/common'; +import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common'; function isIPv6Address(ip: IPv4 | IPv6): ip is IPv6 { return ip.kind() === 'ipv6'; diff --git a/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts b/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts index 9f8f56cc92768..61e74e0ef3bc7 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { IFieldFormat } from 'src/plugins/data/common'; +import type { IFieldFormat } from 'src/plugins/field_formats/common'; import { Datatable } from 'src/plugins/expressions'; import { computeSummaryRowForColumn, getFinalSummaryConfiguration } from './summary'; diff --git a/x-pack/plugins/lens/common/expressions/datatable/summary.ts b/x-pack/plugins/lens/common/expressions/datatable/summary.ts index aceade2a3a513..76c607ca4c4ee 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/summary.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/summary.ts @@ -6,7 +6,7 @@ */ import { i18n } from '@kbn/i18n'; -import type { FieldFormat } from '../../../../../../src/plugins/data/common'; +import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common'; import type { Datatable } from '../../../../../../src/plugins/expressions/common'; import { ColumnConfigArg } from './datatable_column'; import { getOriginalId } from './transpose_helpers'; diff --git a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts index 7ac6b3d987c84..6adb8b59474db 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import type { Datatable } from 'src/plugins/expressions'; import { DatatableArgs } from './datatable'; diff --git a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts index 06798413c8f40..e2d928fda24ed 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts @@ -10,7 +10,7 @@ import type { DatatableColumn, DatatableRow, } from '../../../../../../src/plugins/expressions'; -import type { FieldFormat } from '../../../../../../src/plugins/data/common'; +import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common'; import type { DatatableArgs } from './datatable'; import type { ColumnConfig, ColumnConfigArg } from './datatable_column'; diff --git a/x-pack/plugins/lens/common/suffix_formatter/index.ts b/x-pack/plugins/lens/common/suffix_formatter/index.ts index 97fa8c067331e..00ae005c38b14 100644 --- a/x-pack/plugins/lens/common/suffix_formatter/index.ts +++ b/x-pack/plugins/lens/common/suffix_formatter/index.ts @@ -6,11 +6,11 @@ */ import { i18n } from '@kbn/i18n'; +import { KBN_FIELD_TYPES } from '@kbn/field-types'; import { FieldFormat, FieldFormatInstanceType, - KBN_FIELD_TYPES, -} from '../../../../../src/plugins/data/common'; +} from '../../../../../src/plugins/field_formats/common'; import type { FormatFactory } from '../types'; import type { TimeScaleUnit } from '../expressions/time_scale'; diff --git a/x-pack/plugins/lens/common/types.ts b/x-pack/plugins/lens/common/types.ts index a60061a3aa054..06fa31b87ce64 100644 --- a/x-pack/plugins/lens/common/types.ts +++ b/x-pack/plugins/lens/common/types.ts @@ -5,7 +5,8 @@ * 2.0. */ -import type { FilterMeta, Filter, IFieldFormat } from '../../../../src/plugins/data/common'; +import type { FilterMeta, Filter } from '../../../../src/plugins/data/common'; +import type { IFieldFormat } from '../../../../src/plugins/field_formats/common'; import type { Datatable, SerializedFieldFormat } from '../../../../src/plugins/expressions/common'; export type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat; diff --git a/x-pack/plugins/lens/kibana.json b/x-pack/plugins/lens/kibana.json index fd394aea90d66..6a3e0f40c48f4 100644 --- a/x-pack/plugins/lens/kibana.json +++ b/x-pack/plugins/lens/kibana.json @@ -36,7 +36,8 @@ "savedObjects", "kibanaUtils", "kibanaReact", - "embeddable" + "embeddable", + "fieldFormats" ], "owner": { "name": "Kibana App", diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx index fb9cb992fcf47..96413444d60c4 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx @@ -9,7 +9,7 @@ import { mountWithIntl } from '@kbn/test/jest'; import React from 'react'; import { DataContext } from './table_basic'; import { createGridCell } from './cell_value'; -import { FieldFormat } from 'src/plugins/data/public'; +import type { FieldFormat } from 'src/plugins/field_formats/common'; import { Datatable } from 'src/plugins/expressions/public'; import { IUiSettingsClient } from 'kibana/public'; import { act } from 'react-dom/test-utils'; diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx index bb678a361e174..a0d137b90e84c 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx @@ -10,7 +10,8 @@ import { ReactWrapper, shallow } from 'enzyme'; import { act } from 'react-dom/test-utils'; import { mountWithIntl } from '@kbn/test/jest'; import { EuiDataGrid } from '@elastic/eui'; -import { IAggType, IFieldFormat } from 'src/plugins/data/public'; +import { IAggType } from 'src/plugins/data/public'; +import { IFieldFormat } from 'src/plugins/field_formats/common'; import { VisualizationContainer } from '../../visualization_container'; import { EmptyPlaceholder } from '../../shared_components'; import { LensIconChartDatatable } from '../../assets/chart_datatable'; diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx index 4b4d2275d0dec..163971c4ba9fb 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx @@ -8,7 +8,7 @@ import { DatatableProps } from '../../common/expressions'; import type { LensMultiTable } from '../../common'; import { createMockExecutionContext } from '../../../../../src/plugins/expressions/common/mocks'; -import { IFieldFormat } from '../../../../../src/plugins/data/public'; +import type { IFieldFormat } from '../../../../../src/plugins/field_formats/common'; import { getDatatable } from './expression'; function sampleArgs() { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx index 43f5527e42d4b..84bcb48f95234 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx @@ -23,7 +23,7 @@ import { keys, } from '@elastic/eui'; import { useDebounceWithOptions } from '../../../../shared_components'; -import { IFieldFormat } from '../../../../../../../../src/plugins/data/common'; +import { IFieldFormat } from '../../../../../../../../src/plugins/field_formats/common'; import { RangeTypeLens, isValidRange } from './ranges'; import { FROM_PLACEHOLDER, TO_PLACEHOLDER, TYPING_DEBOUNCE_TIME } from './constants'; import { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx index 3389c723b4daf..69460c649c3e1 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx @@ -18,7 +18,7 @@ import { EuiRange, EuiToolTip, } from '@elastic/eui'; -import type { IFieldFormat } from 'src/plugins/data/public'; +import type { IFieldFormat } from 'src/plugins/field_formats/common'; import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/public'; import { RangeColumnParams, UpdateParamsFnType, MODES_TYPES } from './ranges'; import { AdvancedRangeEditor } from './advanced_editor'; @@ -59,7 +59,7 @@ const GranularityHelpPopover = () => {

{UI_SETTINGS.HISTOGRAM_MAX_BARS}, diff --git a/x-pack/plugins/lens/public/metric_visualization/expression.test.tsx b/x-pack/plugins/lens/public/metric_visualization/expression.test.tsx index 21c68a9fe1d82..10575f37dba6e 100644 --- a/x-pack/plugins/lens/public/metric_visualization/expression.test.tsx +++ b/x-pack/plugins/lens/public/metric_visualization/expression.test.tsx @@ -10,7 +10,7 @@ import { MetricConfig } from '../../common/expressions'; import React from 'react'; import { shallow } from 'enzyme'; import { createMockExecutionContext } from '../../../../../src/plugins/expressions/common/mocks'; -import { IFieldFormat } from '../../../../../src/plugins/data/public'; +import type { IFieldFormat } from '../../../../../src/plugins/field_formats/common'; import type { LensMultiTable } from '../../common'; function sampleArgs() { diff --git a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts index 83d86eb410b19..95c9140624e63 100644 --- a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts +++ b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts @@ -8,7 +8,7 @@ import { FormatFactory } from '../../common'; import { AxisExtentConfig, XYLayerConfig } from '../../common/expressions'; import { Datatable, SerializedFieldFormat } from '../../../../../src/plugins/expressions/public'; -import { IFieldFormat } from '../../../../../src/plugins/data/public'; +import type { IFieldFormat } from '../../../../../src/plugins/field_formats/common'; interface FormattedMetric { layer: string; diff --git a/x-pack/plugins/lens/tsconfig.json b/x-pack/plugins/lens/tsconfig.json index 134f0b4185b84..6c4d3631a12f3 100644 --- a/x-pack/plugins/lens/tsconfig.json +++ b/x-pack/plugins/lens/tsconfig.json @@ -37,5 +37,6 @@ { "path": "../../../src/plugins/kibana_react/tsconfig.json" }, { "path": "../../../src/plugins/embeddable/tsconfig.json"}, { "path": "../../../src/plugins/presentation_util/tsconfig.json"}, + { "path": "../../../src/plugins/field_formats/tsconfig.json"} ] - } \ No newline at end of file + } diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json index 7f3ad80968b7a..1196247fe4629 100644 --- a/x-pack/plugins/ml/kibana.json +++ b/x-pack/plugins/ml/kibana.json @@ -39,7 +39,8 @@ "savedObjects", "home", "maps", - "usageCollection" + "usageCollection", + "fieldFormats" ], "extraPublicDirs": [ "common" diff --git a/x-pack/plugins/ml/public/application/util/time_buckets.js b/x-pack/plugins/ml/public/application/util/time_buckets.js index 560972ee6c4b8..d9cfa7729d8d8 100644 --- a/x-pack/plugins/ml/public/application/util/time_buckets.js +++ b/x-pack/plugins/ml/public/application/util/time_buckets.js @@ -12,7 +12,8 @@ import dateMath from '@elastic/datemath'; import { timeBucketsCalcAutoIntervalProvider } from './calc_auto_interval'; import { parseInterval } from '../../../common/util/parse_interval'; import { getFieldFormats, getUiSettings } from './dependency_cache'; -import { FIELD_FORMAT_IDS, UI_SETTINGS } from '../../../../../../src/plugins/data/public'; +import { UI_SETTINGS } from '../../../../../../src/plugins/data/public'; +import { FIELD_FORMAT_IDS } from '../../../../../../src/plugins/field_formats/common'; const unitsDesc = dateMath.unitsDesc; diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.ts index 964de86ddf377..b61af3a61c3dc 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.ts @@ -5,11 +5,11 @@ * 2.0. */ +import type { FieldFormat as IFieldFormat } from 'src/plugins/field_formats/common'; import { SavedObjectNotFound } from '../../../../../../../../src/plugins/kibana_utils/public'; import { DataPublicPluginStart, IndexPattern, - FieldFormat as IFieldFormat, IndexPatternSpec, } from '../../../../../../../../src/plugins/data/public'; import { rumFieldFormats } from '../configurations/rum/field_formats'; diff --git a/x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts index 65b53b3b77eb4..835eddc03d9f9 100644 --- a/x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts +++ b/x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts @@ -14,7 +14,11 @@ import moment from 'moment'; import Puid from 'puid'; import sinon from 'sinon'; import { ReportingConfig, ReportingCore } from '../../'; -import { fieldFormats, UI_SETTINGS } from '../../../../../../src/plugins/data/server'; +import { + FieldFormatsRegistry, + StringFormat, + FORMATS_UI_SETTINGS, +} from '../../../../../../src/plugins/field_formats/common'; import { CSV_QUOTE_VALUES_SETTING, CSV_SEPARATOR_SETTING, @@ -104,15 +108,13 @@ describe('CSV Execute Job', function () { setFieldFormats({ fieldFormatServiceFactory() { const uiConfigMock = {}; - (uiConfigMock as any)[UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP] = { + (uiConfigMock as any)[FORMATS_UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP] = { _default_: { id: 'string', params: {} }, }; - const fieldFormatsRegistry = new fieldFormats.FieldFormatsRegistry(); + const fieldFormatsRegistry = new FieldFormatsRegistry(); - fieldFormatsRegistry.init((key) => (uiConfigMock as any)[key], {}, [ - fieldFormats.StringFormat, - ]); + fieldFormatsRegistry.init((key) => (uiConfigMock as any)[key], {}, [StringFormat]); return Promise.resolve(fieldFormatsRegistry); }, diff --git a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/field_format_map.test.ts b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/field_format_map.test.ts index ed303fb0c27bd..6e1ad21397e73 100644 --- a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/field_format_map.test.ts +++ b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/field_format_map.test.ts @@ -6,7 +6,13 @@ */ import expect from '@kbn/expect'; -import { fieldFormats, FieldFormatsGetConfigFn, UI_SETTINGS } from 'src/plugins/data/server'; +import { + FieldFormatsGetConfigFn, + FieldFormatsRegistry, + BytesFormat, + NumberFormat, + FORMATS_UI_SETTINGS, +} from 'src/plugins/field_formats/common'; import { IndexPatternSavedObjectDeprecatedCSV } from '../types'; import { fieldFormatMapFactory } from './field_format_map'; @@ -22,16 +28,16 @@ describe('field format map', function () { }, }; const configMock: Record = {}; - configMock[UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP] = { + configMock[FORMATS_UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP] = { number: { id: 'number', params: {} }, }; - configMock[UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN] = '0,0.[000]'; + configMock[FORMATS_UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN] = '0,0.[000]'; const getConfig = ((key: string) => configMock[key]) as FieldFormatsGetConfigFn; const testValue = '4000'; const mockTimezone = 'Browser'; - const fieldFormatsRegistry = new fieldFormats.FieldFormatsRegistry(); - fieldFormatsRegistry.init(getConfig, {}, [fieldFormats.BytesFormat, fieldFormats.NumberFormat]); + const fieldFormatsRegistry = new FieldFormatsRegistry(); + fieldFormatsRegistry.init(getConfig, {}, [BytesFormat, NumberFormat]); const formatMap = fieldFormatMapFactory( indexPatternSavedObject, diff --git a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/field_format_map.ts b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/field_format_map.ts index e5508f42f8c0d..9d094f4308ed7 100644 --- a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/field_format_map.ts +++ b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/field_format_map.ts @@ -6,8 +6,11 @@ */ import _ from 'lodash'; -import { FieldFormat } from 'src/plugins/data/common'; -import { FieldFormatConfig, IFieldFormatsRegistry } from 'src/plugins/data/server'; +import { + FieldFormat, + IFieldFormatsRegistry, + FieldFormatConfig, +} from 'src/plugins/field_formats/common'; import { IndexPatternSavedObjectDeprecatedCSV } from '../types'; /** diff --git a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/format_csv_values.ts b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/format_csv_values.ts index 440dcc69b1c73..006aa41c6a35e 100644 --- a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/format_csv_values.ts +++ b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/format_csv_values.ts @@ -6,7 +6,7 @@ */ import { isNull, isObject, isUndefined } from 'lodash'; -import { FieldFormat } from 'src/plugins/data/common'; +import { FieldFormat } from 'src/plugins/field_formats/common'; import { RawValue } from '../types'; export function createFormatCsvValues( diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts index b0a3a8c7001b1..8751200504405 100644 --- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts +++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts @@ -14,7 +14,8 @@ import { savedObjectsClientMock, uiSettingsServiceMock, } from 'src/core/server/mocks'; -import { FieldFormatsRegistry, ISearchStartSearchSource } from 'src/plugins/data/common'; +import { ISearchStartSearchSource } from 'src/plugins/data/common'; +import { FieldFormatsRegistry } from 'src/plugins/field_formats/common'; import { searchSourceInstanceMock } from 'src/plugins/data/common/search/search_source/mocks'; import { IScopedSearchClient } from 'src/plugins/data/server'; import { dataPluginMock } from 'src/plugins/data/server/mocks'; diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts index 3855eff3821b9..8488b54b77f00 100644 --- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts +++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts @@ -15,9 +15,6 @@ import { ReportingConfig } from '../../..'; import { cellHasFormulas, ES_SEARCH_STRATEGY, - FieldFormat, - FieldFormatConfig, - IFieldFormatsRegistry, IndexPattern, ISearchSource, ISearchStartSearchSource, @@ -25,6 +22,11 @@ import { SearchSourceFields, tabifyDocs, } from '../../../../../../../src/plugins/data/common'; +import { + FieldFormat, + FieldFormatConfig, + IFieldFormatsRegistry, +} from '../../../../../../../src/plugins/field_formats/common'; import { KbnServerError } from '../../../../../../../src/plugins/kibana_utils/server'; import { CancellationToken } from '../../../../common'; import { CONTENT_TYPE_CSV } from '../../../../common/constants'; diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts index 695f29dd8d632..8ad2e62d98c52 100644 --- a/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts +++ b/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts @@ -12,7 +12,7 @@ jest.mock('../browsers'); import _ from 'lodash'; import * as Rx from 'rxjs'; import { coreMock, elasticsearchServiceMock } from 'src/core/server/mocks'; -import { fieldFormats } from 'src/plugins/data/server'; +import { FieldFormatsRegistry } from 'src/plugins/field_formats/common'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths import { dataPluginMock } from 'src/plugins/data/server/mocks'; import { ReportingConfig, ReportingCore } from '../'; @@ -171,7 +171,7 @@ export const createMockReportingCore = async ( setFieldFormats({ fieldFormatServiceFactory() { - const fieldFormatsRegistry = new fieldFormats.FieldFormatsRegistry(); + const fieldFormatsRegistry = new FieldFormatsRegistry(); return Promise.resolve(fieldFormatsRegistry); }, }); diff --git a/x-pack/plugins/reporting/tsconfig.json b/x-pack/plugins/reporting/tsconfig.json index c28086b96aea2..406fe9965b8a0 100644 --- a/x-pack/plugins/reporting/tsconfig.json +++ b/x-pack/plugins/reporting/tsconfig.json @@ -24,6 +24,7 @@ { "path": "../../../src/plugins/share/tsconfig.json" }, { "path": "../../../src/plugins/ui_actions/tsconfig.json" }, { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../../../src/plugins/field_formats/tsconfig.json" }, { "path": "../features/tsconfig.json" }, { "path": "../licensing/tsconfig.json" }, { "path": "../security/tsconfig.json" }, diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx index d959bf19c7cd8..1db09d0492e68 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx +++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx @@ -30,7 +30,7 @@ import { } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { ChartsPluginSetup } from 'src/plugins/charts/public'; -import { FieldFormatsStart } from 'src/plugins/data/public'; +import { FieldFormatsStart } from 'src/plugins/field_formats/public'; import { useKibana } from '../../../../../../src/plugins/kibana_react/public'; import { getThresholdAlertVisualizationData, diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index cf3d52dca6167..c0d0866060d15 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -715,23 +715,6 @@ "data.advancedSettings.defaultIndexTitle": "デフォルトのインデックス", "data.advancedSettings.docTableHighlightText": "Discover と保存された検索ダッシュボードの結果をハイライトします。ハイライトすることで、大きなドキュメントを扱う際にリクエストが遅くなります。", "data.advancedSettings.docTableHighlightTitle": "結果をハイライト", - "data.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数字フォーマット", - "data.advancedSettings.format.bytesFormatText": "「バイト」フォーマットのデフォルト{numeralFormatLink}です", - "data.advancedSettings.format.bytesFormatTitle": "バイトフォーマット", - "data.advancedSettings.format.currencyFormat.numeralFormatLinkText": "数字フォーマット", - "data.advancedSettings.format.currencyFormatText": "「通貨」フォーマットのデフォルト{numeralFormatLink}です", - "data.advancedSettings.format.currencyFormatTitle": "通貨フォーマット", - "data.advancedSettings.format.defaultTypeMapText": "各フィールドタイプにデフォルトで使用するフォーマット名のマップです。フィールドタイプが特に指定されていない場合は {defaultFormat} が使用されます", - "data.advancedSettings.format.defaultTypeMapTitle": "フィールドタイプフォーマット名", - "data.advancedSettings.format.formattingLocale.numeralLanguageLinkText": "数字言語", - "data.advancedSettings.format.formattingLocaleText": "{numeralLanguageLink} ロケール", - "data.advancedSettings.format.formattingLocaleTitle": "フォーマットロケール", - "data.advancedSettings.format.numberFormat.numeralFormatLinkText": "数字フォーマット", - "data.advancedSettings.format.numberFormatText": "「数字」フォーマットのデフォルト{numeralFormatLink}です", - "data.advancedSettings.format.numberFormatTitle": "数字フォーマット", - "data.advancedSettings.format.percentFormat.numeralFormatLinkText": "数字フォーマット", - "data.advancedSettings.format.percentFormatText": "「パーセント」フォーマットのデフォルト{numeralFormatLink}です", - "data.advancedSettings.format.percentFormatTitle": "パーセントフォーマット", "data.advancedSettings.histogram.barTargetText": "日付ヒストグラムで「自動」間隔を使用する際、この数に近いバケットの作成を試みます", "data.advancedSettings.histogram.barTargetTitle": "目標バケット数", "data.advancedSettings.histogram.maxBarsText": "Kibana全体で日付の密度とヒストグラム数を制限し、\n テストクエリを使用するときのパフォーマンスを向上させます。テストクエリのバケットが多すぎる場合は、\n バケットの間隔が増えます。この設定は個別に\n 各ヒストグラムアグリゲーションに適用されます。他の種類のアグリゲーションには適用されません。\n この設定の最大値を求めるには、Elasticsearch「search.max_buckets」\n 値を各ビジュアライゼーションのアグリゲーションの最大数で除算します。", @@ -755,8 +738,6 @@ "data.advancedSettings.searchQueryLanguageTitle": "クエリ言語", "data.advancedSettings.searchTimeout": "検索タイムアウト", "data.advancedSettings.searchTimeoutDesc": "検索セッションの最大タイムアウトを変更するか、0 に設定してタイムアウトを無効にすると、クエリは完了するまで実行されます。", - "data.advancedSettings.shortenFieldsText": "長いフィールドを短くします。例：foo.bar.bazの代わりにf.b.bazと表示", - "data.advancedSettings.shortenFieldsTitle": "フィールドの短縮", "data.advancedSettings.sortOptions.optionsLinkText": "オプション", "data.advancedSettings.sortOptionsText": "Elasticsearch の並べ替えパラメーターの {optionsLink}", "data.advancedSettings.sortOptionsTitle": "並べ替えオプション", @@ -782,62 +763,6 @@ "data.aggTypes.buckets.ranges.rangesFormatMessage": "{gte} {from} と {lt} {to}", "data.aggTypes.buckets.ranges.rangesFormatMessageArrowRight": "{from} → {to}", "data.errors.fetchError": "ネットワークとプロキシ構成を確認してください。問題が解決しない場合は、ネットワーク管理者に問い合わせてください。", - "data.fieldFormats.boolean.title": "ブール", - "data.fieldFormats.bytes.title": "バイト", - "data.fieldFormats.color.title": "色", - "data.fieldFormats.date_nanos.title": "日付ナノ", - "data.fieldFormats.date.title": "日付", - "data.fieldFormats.duration.inputFormats.days": "日", - "data.fieldFormats.duration.inputFormats.hours": "時間", - "data.fieldFormats.duration.inputFormats.microseconds": "マイクロ秒", - "data.fieldFormats.duration.inputFormats.milliseconds": "ミリ秒", - "data.fieldFormats.duration.inputFormats.minutes": "分", - "data.fieldFormats.duration.inputFormats.months": "か月", - "data.fieldFormats.duration.inputFormats.nanoseconds": "ナノ秒", - "data.fieldFormats.duration.inputFormats.picoseconds": "ピコ秒", - "data.fieldFormats.duration.inputFormats.seconds": "秒", - "data.fieldFormats.duration.inputFormats.weeks": "週間", - "data.fieldFormats.duration.inputFormats.years": "年", - "data.fieldFormats.duration.negativeLabel": "マイナス", - "data.fieldFormats.duration.outputFormats.asDays": "日", - "data.fieldFormats.duration.outputFormats.asDays.short": "d", - "data.fieldFormats.duration.outputFormats.asHours": "時間", - "data.fieldFormats.duration.outputFormats.asHours.short": "h", - "data.fieldFormats.duration.outputFormats.asMilliseconds": "ミリ秒", - "data.fieldFormats.duration.outputFormats.asMilliseconds.short": "ms", - "data.fieldFormats.duration.outputFormats.asMinutes": "分", - "data.fieldFormats.duration.outputFormats.asMinutes.short": "分", - "data.fieldFormats.duration.outputFormats.asMonths": "か月", - "data.fieldFormats.duration.outputFormats.asMonths.short": "mon", - "data.fieldFormats.duration.outputFormats.asSeconds": "秒", - "data.fieldFormats.duration.outputFormats.asSeconds.short": "s", - "data.fieldFormats.duration.outputFormats.asWeeks": "週間", - "data.fieldFormats.duration.outputFormats.asWeeks.short": "w", - "data.fieldFormats.duration.outputFormats.asYears": "年", - "data.fieldFormats.duration.outputFormats.asYears.short": "y", - "data.fieldFormats.duration.outputFormats.humanize.approximate": "人間が読み取り可能 (近似値) ", - "data.fieldFormats.duration.outputFormats.humanize.precise": "人間が読み取り可能 (正確な値) ", - "data.fieldFormats.duration.title": "期間", - "data.fieldFormats.histogram.title": "ヒストグラム", - "data.fieldFormats.ip.title": "IP アドレス", - "data.fieldFormats.number.title": "数字", - "data.fieldFormats.percent.title": "割合 (%) ", - "data.fieldFormats.relative_date.title": "相対日付", - "data.fieldFormats.static_lookup.title": "静的ルックアップ", - "data.fieldFormats.string.emptyLabel": " (空) ", - "data.fieldFormats.string.title": "文字列", - "data.fieldFormats.string.transformOptions.base64": "Base64 デコード", - "data.fieldFormats.string.transformOptions.lower": "小文字", - "data.fieldFormats.string.transformOptions.none": "- なし -", - "data.fieldFormats.string.transformOptions.short": "短い点線", - "data.fieldFormats.string.transformOptions.title": "タイトルケース", - "data.fieldFormats.string.transformOptions.upper": "大文字", - "data.fieldFormats.string.transformOptions.url": "URL パラメーターデコード", - "data.fieldFormats.truncated_string.title": "切り詰めた文字列", - "data.fieldFormats.url.title": "Url", - "data.fieldFormats.url.types.audio": "音声", - "data.fieldFormats.url.types.img": "画像", - "data.fieldFormats.url.types.link": "リンク", "data.filter.applyFilterActionTitle": "現在のビューにフィルターを適用", "data.filter.applyFilters.popupHeader": "適用するフィルターの選択", "data.filter.applyFiltersPopup.cancelButtonLabel": "キャンセル", @@ -1949,6 +1874,81 @@ "expressions.functions.varset.name.help": "変数の名前を指定します。", "expressions.functions.varset.val.help": "変数の値を指定します。指定しないと、入力コンテキストが使用されます。", "expressions.types.number.fromStringConversionErrorMessage": "\"{string}\" 文字列を数字に変換できません", + "fieldFormats.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数字フォーマット", + "fieldFormats.advancedSettings.format.bytesFormatText": "「バイト」フォーマットのデフォルト{numeralFormatLink}です", + "fieldFormats.advancedSettings.format.bytesFormatTitle": "バイトフォーマット", + "fieldFormats.advancedSettings.format.currencyFormat.numeralFormatLinkText": "数字フォーマット", + "fieldFormats.advancedSettings.format.currencyFormatText": "「通貨」フォーマットのデフォルト{numeralFormatLink}です", + "fieldFormats.advancedSettings.format.currencyFormatTitle": "通貨フォーマット", + "fieldFormats.advancedSettings.format.defaultTypeMapText": "各フィールドタイプにデフォルトで使用するフォーマット名のマップです。フィールドタイプが特に指定されていない場合は {defaultFormat} が使用されます", + "fieldFormats.advancedSettings.format.defaultTypeMapTitle": "フィールドタイプフォーマット名", + "fieldFormats.advancedSettings.format.formattingLocale.numeralLanguageLinkText": "数字言語", + "fieldFormats.advancedSettings.format.formattingLocaleText": "{numeralLanguageLink} ロケール", + "fieldFormats.advancedSettings.format.formattingLocaleTitle": "フォーマットロケール", + "fieldFormats.advancedSettings.format.numberFormat.numeralFormatLinkText": "数字フォーマット", + "fieldFormats.advancedSettings.format.numberFormatText": "「数字」フォーマットのデフォルト{numeralFormatLink}です", + "fieldFormats.advancedSettings.format.numberFormatTitle": "数字フォーマット", + "fieldFormats.advancedSettings.format.percentFormat.numeralFormatLinkText": "数字フォーマット", + "fieldFormats.advancedSettings.format.percentFormatText": "「パーセント」フォーマットのデフォルト{numeralFormatLink}です", + "fieldFormats.advancedSettings.format.percentFormatTitle": "パーセントフォーマット", + "fieldFormats.advancedSettings.shortenFieldsText": "長いフィールドを短くします。例：foo.bar.bazの代わりにf.b.bazと表示", + "fieldFormats.advancedSettings.shortenFieldsTitle": "フィールドの短縮", + "fieldFormats.boolean.title": "ブール", + "fieldFormats.bytes.title": "バイト", + "fieldFormats.color.title": "色", + "fieldFormats.date_nanos.title": "日付ナノ", + "fieldFormats.date.title": "日付", + "fieldFormats.duration.inputFormats.days": "日", + "fieldFormats.duration.inputFormats.hours": "時間", + "fieldFormats.duration.inputFormats.microseconds": "マイクロ秒", + "fieldFormats.duration.inputFormats.milliseconds": "ミリ秒", + "fieldFormats.duration.inputFormats.minutes": "分", + "fieldFormats.duration.inputFormats.months": "か月", + "fieldFormats.duration.inputFormats.nanoseconds": "ナノ秒", + "fieldFormats.duration.inputFormats.picoseconds": "ピコ秒", + "fieldFormats.duration.inputFormats.seconds": "秒", + "fieldFormats.duration.inputFormats.weeks": "週間", + "fieldFormats.duration.inputFormats.years": "年", + "fieldFormats.duration.negativeLabel": "マイナス", + "fieldFormats.duration.outputFormats.asDays": "日", + "fieldFormats.duration.outputFormats.asDays.short": "d", + "fieldFormats.duration.outputFormats.asHours": "時間", + "fieldFormats.duration.outputFormats.asHours.short": "h", + "fieldFormats.duration.outputFormats.asMilliseconds": "ミリ秒", + "fieldFormats.duration.outputFormats.asMilliseconds.short": "ms", + "fieldFormats.duration.outputFormats.asMinutes": "分", + "fieldFormats.duration.outputFormats.asMinutes.short": "分", + "fieldFormats.duration.outputFormats.asMonths": "か月", + "fieldFormats.duration.outputFormats.asMonths.short": "mon", + "fieldFormats.duration.outputFormats.asSeconds": "秒", + "fieldFormats.duration.outputFormats.asSeconds.short": "s", + "fieldFormats.duration.outputFormats.asWeeks": "週間", + "fieldFormats.duration.outputFormats.asWeeks.short": "w", + "fieldFormats.duration.outputFormats.asYears": "年", + "fieldFormats.duration.outputFormats.asYears.short": "y", + "fieldFormats.duration.outputFormats.humanize.approximate": "人間が読み取り可能 (近似値) ", + "fieldFormats.duration.outputFormats.humanize.precise": "人間が読み取り可能 (正確な値) ", + "fieldFormats.duration.title": "期間", + "fieldFormats.histogram.title": "ヒストグラム", + "fieldFormats.ip.title": "IP アドレス", + "fieldFormats.number.title": "数字", + "fieldFormats.percent.title": "割合 (%) ", + "fieldFormats.relative_date.title": "相対日付", + "fieldFormats.static_lookup.title": "静的ルックアップ", + "fieldFormats.string.emptyLabel": " (空) ", + "fieldFormats.string.title": "文字列", + "fieldFormats.string.transformOptions.base64": "Base64 デコード", + "fieldFormats.string.transformOptions.lower": "小文字", + "fieldFormats.string.transformOptions.none": "- なし -", + "fieldFormats.string.transformOptions.short": "短い点線", + "fieldFormats.string.transformOptions.title": "タイトルケース", + "fieldFormats.string.transformOptions.upper": "大文字", + "fieldFormats.string.transformOptions.url": "URL パラメーターデコード", + "fieldFormats.truncated_string.title": "切り詰めた文字列", + "fieldFormats.url.title": "Url", + "fieldFormats.url.types.audio": "音声", + "fieldFormats.url.types.img": "画像", + "fieldFormats.url.types.link": "リンク", "flot.pie.unableToDrawLabelsInsideCanvasErrorMessage": "キャンバス内のラベルではパイを作成できません", "flot.time.aprLabel": "4 月", "flot.time.augLabel": "8 月", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 294759ec12173..5c50c17d866f9 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -718,23 +718,6 @@ "data.advancedSettings.defaultIndexTitle": "默认索引", "data.advancedSettings.docTableHighlightText": "在 Discover 和已保存搜索仪表板中突出显示结果。处理大文档时，突出显示会使请求变慢。", "data.advancedSettings.docTableHighlightTitle": "突出显示结果", - "data.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数值格式", - "data.advancedSettings.format.bytesFormatText": "“字节”格式的默认{numeralFormatLink}", - "data.advancedSettings.format.bytesFormatTitle": "字节格式", - "data.advancedSettings.format.currencyFormat.numeralFormatLinkText": "数值格式", - "data.advancedSettings.format.currencyFormatText": "“货币”格式的默认{numeralFormatLink}", - "data.advancedSettings.format.currencyFormatTitle": "货币格式", - "data.advancedSettings.format.defaultTypeMapText": "要默认用于每个字段类型的格式名称的映射。如果未显式提及字段类型，则将使用{defaultFormat}", - "data.advancedSettings.format.defaultTypeMapTitle": "字段类型格式名称", - "data.advancedSettings.format.formattingLocale.numeralLanguageLinkText": "数值语言", - "data.advancedSettings.format.formattingLocaleText": "{numeralLanguageLink}区域设置", - "data.advancedSettings.format.formattingLocaleTitle": "格式区域设置", - "data.advancedSettings.format.numberFormat.numeralFormatLinkText": "数值格式", - "data.advancedSettings.format.numberFormatText": "“数字”格式的默认{numeralFormatLink}", - "data.advancedSettings.format.numberFormatTitle": "数字格式", - "data.advancedSettings.format.percentFormat.numeralFormatLinkText": "数值格式", - "data.advancedSettings.format.percentFormatText": "“百分比”格式的默认{numeralFormatLink}", - "data.advancedSettings.format.percentFormatTitle": "百分比格式", "data.advancedSettings.histogram.barTargetText": "在日期和数值直方图中使用“auto”时间间隔时尝试生成大约此数目的存储桶", "data.advancedSettings.histogram.barTargetTitle": "目标存储桶", "data.advancedSettings.histogram.maxBarsText": "在 Kibana 中限制日期和数值直方图的密度\n 以提高使用测试查询的性能。如果测试查询有过多的存储桶，\n 存储桶间的时间间隔将会增加。此设置分别应用到\n 各个直方图聚合，不会应用到其他类型的聚合。\n 要查找此设置的最大值，请将 Elasticsearch 'search.max_buckets' 除以\n 各个可视化中的最大聚合数。", @@ -758,8 +741,6 @@ "data.advancedSettings.searchQueryLanguageTitle": "查询语言", "data.advancedSettings.searchTimeout": "搜索超时", "data.advancedSettings.searchTimeoutDesc": "更改搜索会话的最大超时值，或设置为 0 以禁用超时，让查询运行至结束。", - "data.advancedSettings.shortenFieldsText": "缩短长字段，例如，不显示 foo.bar.baz，而显示 f.b.baz", - "data.advancedSettings.shortenFieldsTitle": "缩短字段", "data.advancedSettings.sortOptions.optionsLinkText": "选项", "data.advancedSettings.sortOptionsText": "Elasticsearch 排序参数的{optionsLink}", "data.advancedSettings.sortOptionsTitle": "排序选项", @@ -785,62 +766,6 @@ "data.aggTypes.buckets.ranges.rangesFormatMessage": "{gte} {from} 且 {lt} {to}", "data.aggTypes.buckets.ranges.rangesFormatMessageArrowRight": "{from} → {to}", "data.errors.fetchError": "请检查您的网络和代理配置。如果问题持续存在，请联系网络管理员。", - "data.fieldFormats.boolean.title": "布尔型", - "data.fieldFormats.bytes.title": "字节", - "data.fieldFormats.color.title": "颜色", - "data.fieldFormats.date_nanos.title": "日期纳秒", - "data.fieldFormats.date.title": "日期", - "data.fieldFormats.duration.inputFormats.days": "天", - "data.fieldFormats.duration.inputFormats.hours": "小时", - "data.fieldFormats.duration.inputFormats.microseconds": "微秒", - "data.fieldFormats.duration.inputFormats.milliseconds": "毫秒", - "data.fieldFormats.duration.inputFormats.minutes": "分钟", - "data.fieldFormats.duration.inputFormats.months": "月", - "data.fieldFormats.duration.inputFormats.nanoseconds": "纳秒", - "data.fieldFormats.duration.inputFormats.picoseconds": "皮秒", - "data.fieldFormats.duration.inputFormats.seconds": "秒", - "data.fieldFormats.duration.inputFormats.weeks": "周", - "data.fieldFormats.duration.inputFormats.years": "年", - "data.fieldFormats.duration.negativeLabel": "负号", - "data.fieldFormats.duration.outputFormats.asDays": "天", - "data.fieldFormats.duration.outputFormats.asDays.short": "d", - "data.fieldFormats.duration.outputFormats.asHours": "小时", - "data.fieldFormats.duration.outputFormats.asHours.short": "h", - "data.fieldFormats.duration.outputFormats.asMilliseconds": "毫秒", - "data.fieldFormats.duration.outputFormats.asMilliseconds.short": "ms", - "data.fieldFormats.duration.outputFormats.asMinutes": "分钟", - "data.fieldFormats.duration.outputFormats.asMinutes.short": "最小值", - "data.fieldFormats.duration.outputFormats.asMonths": "月", - "data.fieldFormats.duration.outputFormats.asMonths.short": "月", - "data.fieldFormats.duration.outputFormats.asSeconds": "秒", - "data.fieldFormats.duration.outputFormats.asSeconds.short": "s", - "data.fieldFormats.duration.outputFormats.asWeeks": "周", - "data.fieldFormats.duration.outputFormats.asWeeks.short": "w", - "data.fieldFormats.duration.outputFormats.asYears": "年", - "data.fieldFormats.duration.outputFormats.asYears.short": "y", - "data.fieldFormats.duration.outputFormats.humanize.approximate": "可人工读取（近似）", - "data.fieldFormats.duration.outputFormats.humanize.precise": "可人工读取（精确）", - "data.fieldFormats.duration.title": "持续时间", - "data.fieldFormats.histogram.title": "直方图", - "data.fieldFormats.ip.title": "IP 地址", - "data.fieldFormats.number.title": "数字", - "data.fieldFormats.percent.title": "百分比", - "data.fieldFormats.relative_date.title": "相对日期", - "data.fieldFormats.static_lookup.title": "静态查找", - "data.fieldFormats.string.emptyLabel": "（空）", - "data.fieldFormats.string.title": "字符串", - "data.fieldFormats.string.transformOptions.base64": "Base64 解码", - "data.fieldFormats.string.transformOptions.lower": "小写", - "data.fieldFormats.string.transformOptions.none": "- 无 -", - "data.fieldFormats.string.transformOptions.short": "短名", - "data.fieldFormats.string.transformOptions.title": "标题大小写", - "data.fieldFormats.string.transformOptions.upper": "大写", - "data.fieldFormats.string.transformOptions.url": "URL 参数解码", - "data.fieldFormats.truncated_string.title": "已截短字符串", - "data.fieldFormats.url.title": "URL", - "data.fieldFormats.url.types.audio": "音频", - "data.fieldFormats.url.types.img": "图像", - "data.fieldFormats.url.types.link": "链接", "data.filter.applyFilterActionTitle": "将筛选应用于当前视图", "data.filter.applyFilters.popupHeader": "选择要应用的筛选", "data.filter.applyFiltersPopup.cancelButtonLabel": "取消", @@ -1961,6 +1886,81 @@ "expressions.functions.varset.val.help": "指定变量的值。如果未指定，则使用输入上下文。", "expressions.types.number.fromStringConversionErrorMessage": "无法将“{string}”字符串的类型转换为数字", "flot.pie.unableToDrawLabelsInsideCanvasErrorMessage": "无法用画布内包含的标签绘制饼图", + "fieldFormats.advancedSettings.shortenFieldsText": "缩短长字段，例如，不显示 foo.bar.baz，而显示 f.b.baz", + "fieldFormats.advancedSettings.shortenFieldsTitle": "缩短字段", + "fieldFormats.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数值格式", + "fieldFormats.advancedSettings.format.bytesFormatText": "“字节”格式的默认{numeralFormatLink}", + "fieldFormats.advancedSettings.format.bytesFormatTitle": "字节格式", + "fieldFormats.advancedSettings.format.currencyFormat.numeralFormatLinkText": "数值格式", + "fieldFormats.advancedSettings.format.currencyFormatText": "“货币”格式的默认{numeralFormatLink}", + "fieldFormats.advancedSettings.format.currencyFormatTitle": "货币格式", + "fieldFormats.advancedSettings.format.defaultTypeMapText": "要默认用于每个字段类型的格式名称的映射。如果未显式提及字段类型，则将使用{defaultFormat}", + "fieldFormats.advancedSettings.format.defaultTypeMapTitle": "字段类型格式名称", + "fieldFormats.advancedSettings.format.formattingLocale.numeralLanguageLinkText": "数值语言", + "fieldFormats.advancedSettings.format.formattingLocaleText": "{numeralLanguageLink}区域设置", + "fieldFormats.advancedSettings.format.formattingLocaleTitle": "格式区域设置", + "fieldFormats.advancedSettings.format.numberFormat.numeralFormatLinkText": "数值格式", + "fieldFormats.advancedSettings.format.numberFormatText": "“数字”格式的默认{numeralFormatLink}", + "fieldFormats.advancedSettings.format.numberFormatTitle": "数字格式", + "fieldFormats.advancedSettings.format.percentFormat.numeralFormatLinkText": "数值格式", + "fieldFormats.advancedSettings.format.percentFormatText": "“百分比”格式的默认{numeralFormatLink}", + "fieldFormats.advancedSettings.format.percentFormatTitle": "百分比格式", + "fieldFormats.boolean.title": "布尔型", + "fieldFormats.bytes.title": "字节", + "fieldFormats.color.title": "颜色", + "fieldFormats.date_nanos.title": "日期纳秒", + "fieldFormats.date.title": "日期", + "fieldFormats.duration.inputFormats.days": "天", + "fieldFormats.duration.inputFormats.hours": "小时", + "fieldFormats.duration.inputFormats.microseconds": "微秒", + "fieldFormats.duration.inputFormats.milliseconds": "毫秒", + "fieldFormats.duration.inputFormats.minutes": "分钟", + "fieldFormats.duration.inputFormats.months": "月", + "fieldFormats.duration.inputFormats.nanoseconds": "纳秒", + "fieldFormats.duration.inputFormats.picoseconds": "皮秒", + "fieldFormats.duration.inputFormats.seconds": "秒", + "fieldFormats.duration.inputFormats.weeks": "周", + "fieldFormats.duration.inputFormats.years": "年", + "fieldFormats.duration.negativeLabel": "负号", + "fieldFormats.duration.outputFormats.asDays": "天", + "fieldFormats.duration.outputFormats.asDays.short": "d", + "fieldFormats.duration.outputFormats.asHours": "小时", + "fieldFormats.duration.outputFormats.asHours.short": "h", + "fieldFormats.duration.outputFormats.asMilliseconds": "毫秒", + "fieldFormats.duration.outputFormats.asMilliseconds.short": "ms", + "fieldFormats.duration.outputFormats.asMinutes": "分钟", + "fieldFormats.duration.outputFormats.asMinutes.short": "最小值", + "fieldFormats.duration.outputFormats.asMonths": "月", + "fieldFormats.duration.outputFormats.asMonths.short": "月", + "fieldFormats.duration.outputFormats.asSeconds": "秒", + "fieldFormats.duration.outputFormats.asSeconds.short": "s", + "fieldFormats.duration.outputFormats.asWeeks": "周", + "fieldFormats.duration.outputFormats.asWeeks.short": "w", + "fieldFormats.duration.outputFormats.asYears": "年", + "fieldFormats.duration.outputFormats.asYears.short": "y", + "fieldFormats.duration.outputFormats.humanize.approximate": "可人工读取（近似）", + "fieldFormats.duration.outputFormats.humanize.precise": "可人工读取（精确）", + "fieldFormats.duration.title": "持续时间", + "fieldFormats.histogram.title": "直方图", + "fieldFormats.ip.title": "IP 地址", + "fieldFormats.number.title": "数字", + "fieldFormats.percent.title": "百分比", + "fieldFormats.relative_date.title": "相对日期", + "fieldFormats.static_lookup.title": "静态查找", + "fieldFormats.string.emptyLabel": "（空）", + "fieldFormats.string.title": "字符串", + "fieldFormats.string.transformOptions.base64": "Base64 解码", + "fieldFormats.string.transformOptions.lower": "小写", + "fieldFormats.string.transformOptions.none": "- 无 -", + "fieldFormats.string.transformOptions.short": "短名", + "fieldFormats.string.transformOptions.title": "标题大小写", + "fieldFormats.string.transformOptions.upper": "大写", + "fieldFormats.string.transformOptions.url": "URL 参数解码", + "fieldFormats.truncated_string.title": "已截短字符串", + "fieldFormats.url.title": "URL", + "fieldFormats.url.types.audio": "音频", + "fieldFormats.url.types.img": "图像", + "fieldFormats.url.types.link": "链接", "flot.time.aprLabel": "四月", "flot.time.augLabel": "八月", "flot.time.decLabel": "十二月", diff --git a/x-pack/plugins/watcher/kibana.json b/x-pack/plugins/watcher/kibana.json index b9df25d80e62e..84fe2b509b263 100644 --- a/x-pack/plugins/watcher/kibana.json +++ b/x-pack/plugins/watcher/kibana.json @@ -15,6 +15,7 @@ "ui": true, "requiredBundles": [ "esUiShared", - "kibanaReact" + "kibanaReact", + "fieldFormats" ] } diff --git a/x-pack/plugins/watcher/public/legacy/time_buckets.js b/x-pack/plugins/watcher/public/legacy/time_buckets.js index a65e069bb208b..173369152f8e0 100644 --- a/x-pack/plugins/watcher/public/legacy/time_buckets.js +++ b/x-pack/plugins/watcher/public/legacy/time_buckets.js @@ -7,7 +7,8 @@ import _ from 'lodash'; import moment from 'moment'; -import { search, FIELD_FORMAT_IDS, UI_SETTINGS } from '../../../../../src/plugins/data/public'; +import { search, UI_SETTINGS } from '../../../../../src/plugins/data/public'; +import { FIELD_FORMAT_IDS } from '../../../../../src/plugins/field_formats/common'; import { calcAutoIntervalLessThan, calcAutoIntervalNear } from './calc_auto_interval'; import { convertDurationToNormalizedEsInterval,