Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FieldFormats] Break from data plugin #107173

Merged
merged 45 commits into from
Aug 5, 2021
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a5321c9
wip
Dosant Jul 26, 2021
cdcab7e
temp rollback the change
Dosant Jul 26, 2021
8dbf254
fix tests, fix docs
Dosant Jul 27, 2021
3c5587c
wip
Dosant Jul 27, 2021
be0195b
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Jul 29, 2021
7aff464
wip
Dosant Jul 29, 2021
8424487
wip
Dosant Jul 29, 2021
8cb7103
lost in translation
Dosant Jul 29, 2021
7dcd186
fix imports
Dosant Jul 29, 2021
408132f
update readme
Dosant Jul 29, 2021
419c673
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Jul 30, 2021
d0f010e
wip
Dosant Jul 30, 2021
112801e
wip
Dosant Jul 30, 2021
09818a6
wip
Dosant Jul 30, 2021
544dea4
wip
Dosant Jul 30, 2021
3ddfc5d
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Jul 30, 2021
39e7030
docs
Dosant Jul 30, 2021
fa85a8f
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Jul 30, 2021
370d1b5
improve
Dosant Jul 30, 2021
eef1caa
move uiSettings
Dosant Jul 30, 2021
69ceb06
revert reporting change
Dosant Jul 30, 2021
2234f0e
wip
Dosant Jul 30, 2021
c83bd1b
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Jul 30, 2021
bc22165
fix build
Dosant Jul 30, 2021
8cd80cf
update docs
Dosant Jul 30, 2021
ef89698
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Jul 30, 2021
6d57932
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Aug 2, 2021
ce41f58
fix imports
Dosant Aug 2, 2021
8077718
add missing bundle
Dosant Aug 2, 2021
0af2710
fix js imports
Dosant Aug 2, 2021
709868d
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Aug 2, 2021
f56ed81
fix docs
Dosant Aug 2, 2021
ba63473
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Aug 2, 2021
1fa9b05
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Aug 2, 2021
3314eff
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Aug 2, 2021
383e422
update docs
Dosant Aug 2, 2021
2ba4164
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Aug 3, 2021
65ace84
update docs and limits
Dosant Aug 3, 2021
867cf30
update limits
Dosant Aug 3, 2021
96ab5f2
Merge branch 'master' of github.com:elastic/kibana into dev/break-ff
Dosant Aug 3, 2021
e0d666a
fix deep import
Dosant Aug 3, 2021
1de3fd5
UI_SETTINGS -> FORMATS_UI_SETTINGS
Dosant Aug 3, 2021
8cb5b2e
UI_SETTINGS -> FORMATS_UI_SETTINGS
Dosant Aug 3, 2021
28a5a69
Merge branch 'master' into dev/break-ff
kibanamachine Aug 4, 2021
3d6609f
Merge branch 'master' into dev/break-ff
kibanamachine Aug 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lost in translation
Dosant committed Jul 29, 2021
commit 8cb71032984c236d1609b88bc7cfb5e607447b95
1 change: 1 addition & 0 deletions .i18nrc.json
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion src/plugins/field_formats/common/converters/boolean.ts
Original file line number Diff line number Diff line change
@@ -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];
2 changes: 1 addition & 1 deletion src/plugins/field_formats/common/converters/bytes.ts
Original file line number Diff line number Diff line change
@@ -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',
});

2 changes: 1 addition & 1 deletion src/plugins/field_formats/common/converters/color.tsx
Original file line number Diff line number Diff line change
@@ -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];
Original file line number Diff line number Diff line change
@@ -60,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;
62 changes: 31 additions & 31 deletions src/plugins/field_formats/common/converters/duration.ts
Original file line number Diff line number Diff line change
@@ -21,156 +21,156 @@ 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',
};
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',
}) + ' '
: '';
2 changes: 1 addition & 1 deletion src/plugins/field_formats/common/converters/histogram.ts
Original file line number Diff line number Diff line change
@@ -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',
});

2 changes: 1 addition & 1 deletion src/plugins/field_formats/common/converters/ip.ts
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion src/plugins/field_formats/common/converters/number.ts
Original file line number Diff line number Diff line change
@@ -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',
});

2 changes: 1 addition & 1 deletion src/plugins/field_formats/common/converters/percent.ts
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ import { 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',
});

Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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 = [
18 changes: 9 additions & 9 deletions src/plugins/field_formats/common/converters/string.ts
Original file line number Diff line number Diff line change
@@ -13,50 +13,50 @@ import { asPrettyString, getHighlightHtml, shortenDottedString } from '../utils'
import { FieldFormat } from '../field_format';
import { TextContextTypeConvert, FIELD_FORMAT_IDS, HtmlContextTypeConvert } from '../types';

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',
}),
},
@@ -65,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 = [
2 changes: 1 addition & 1 deletion src/plugins/field_formats/common/converters/truncate.ts
Original file line number Diff line number Diff line change
@@ -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;
Loading