github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Lens] Add bit formatter (#141372)

Browse source 
* add bit formatter

* default to 0 decimals

* make sure to set format id correctly

* fix test
This commit is contained in:
Joe Reuter 2022-09-23 18:59:51 +02:00 • committed by GitHub
parent f100343f41
commit 02a07f3dc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts
View file

@ -32,7 +32,7 @@ export const formatColumnFn: FormatColumnExpressionFunction['fn'] = (
if (!parentFormat) {
if (supportedFormats[format]) {
const serializedFormat: SerializedFieldFormat = {
id: format,
id: supportedFormats[format].formatId,
params: { pattern: supportedFormats[format].decimalsToPattern(decimals) },
};
return withParams(col, serializedFormat as Record<string, unknown>);
@ -64,7 +64,7 @@ export const formatColumnFn: FormatColumnExpressionFunction['fn'] = (
id: parentFormatId,
params: {
...col.meta.params?.params,
id: format,
id: supportedFormats[format].formatId,
...parentFormatParams,
// some wrapper formatters require params to be flatten out (i.e. terms) while others
// require them to be in the params property (i.e. ranges)
@ -83,7 +83,7 @@ export const formatColumnFn: FormatColumnExpressionFunction['fn'] = (
id: parentFormatId,
params: {
...col.meta.params?.params,
id: format,
id: supportedFormats[format].formatId,
// some wrapper formatters require params to be flatten out (i.e. terms) while others
// require them to be in the params property (i.e. ranges)
// so for now duplicate

14
x-pack/plugins/lens/common/expressions/format_column/supported_formats.ts
View file

@ -7,9 +7,10 @@
export const supportedFormats: Record<
string,
{ decimalsToPattern: (decimals?: number) => string }
{ decimalsToPattern: (decimals?: number) => string; formatId: string }
> = {
number: {
formatId: 'number',
decimalsToPattern: (decimals = 2) => {
if (decimals === 0) {
return `0,0`;
@ -18,6 +19,7 @@ export const supportedFormats: Record<
},
},
percent: {
formatId: 'percent',
decimalsToPattern: (decimals = 2) => {
if (decimals === 0) {
return `0,0%`;
@ -26,6 +28,7 @@ export const supportedFormats: Record<
},
},
bytes: {
formatId: 'bytes',
decimalsToPattern: (decimals = 2) => {
if (decimals === 0) {
return `0,0b`;
@ -33,4 +36,13 @@ export const supportedFormats: Record<
return `0,0.${'0'.repeat(decimals)}b`;
},
},
bits: {
formatId: 'number',
decimalsToPattern: (decimals = 2) => {
if (decimals === 0) {
return `0,0bitd`;
}
return `0,0.${'0'.repeat(decimals)}bitd`;
},
},
};

13
x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/format_selector.tsx
View file

@ -12,7 +12,7 @@ import { GenericIndexPatternColumn } from '../indexpattern';
import { isColumnFormatted } from '../operations/definitions/helpers';
import { useDebouncedValue } from '../../shared_components';
const supportedFormats: Record<string, { title: string }> = {
const supportedFormats: Record<string, { title: string; defaultDecimals?: number }> = {
number: {
title: i18n.translate('xpack.lens.indexPattern.numberFormatLabel', {
defaultMessage: 'Number',
@ -28,6 +28,12 @@ const supportedFormats: Record<string, { title: string }> = {
defaultMessage: 'Bytes (1024)',
}),
},
bits: {
title: i18n.translate('xpack.lens.indexPattern.bitsFormatLabel', {
defaultMessage: 'Bits (1000)',
}),
defaultDecimals: 0,
},
};
const defaultOption = {
@ -118,10 +124,13 @@ export function FormatSelector(props: FormatSelectorProps) {
onChange();
return;
}
const id = choices[0].value;
const defaultDecimals = supportedFormats[id].defaultDecimals;
onChange({
id: choices[0].value,
params: { decimals },
params: { decimals: defaultDecimals ?? decimals },
});
setDecimals(defaultDecimals ?? decimals);
},
[onChange, decimals]
);

4
x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
View file

@ -922,7 +922,7 @@ describe('ranges', () => {
const updateLayerSpy = jest.fn();
// now set a format on the range operation
(layer.columns.col1 as RangeIndexPatternColumn).params.format = {
id: 'custom',
id: 'bytes',
params: { decimals: 3 },
};
@ -942,7 +942,7 @@ describe('ranges', () => {
});
expect(updateLayerSpy.mock.calls[0][0].columns.col1.params.format).toEqual({
id: 'custom',
id: 'bytes',
params: { decimals: 3 },
});
});

3
x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
View file

@ -195,13 +195,14 @@ export const rangeOperation: OperationDefinition<
numberFormat &&
supportedFormats[numberFormat.id] &&
supportedFormats[numberFormat.id].decimalsToPattern(numberFormat.params?.decimals || 0);
const numberFormatId = numberFormat && supportedFormats[numberFormat.id].formatId;
const rangeFormatter = fieldFormats.deserialize({
...(currentColumn.params.parentFormat || { id: 'range' }),
params: {
...currentColumn.params.parentFormat?.params,
...(numberFormat
? { id: numberFormat.id, params: { pattern: numberFormatterPattern } }
? { id: numberFormatId, params: { pattern: numberFormatterPattern } }
: getFieldDefaultFormat(indexPattern, currentField)),
},
});