[Lens] Pass used histogram interval to chart #91370
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * 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 { getNumberHistogramIntervalByDatatableColumn } from '.'; | ||
| import { BUCKET_TYPES } from '../buckets'; | ||
|
|
||
| describe('getNumberHistogramIntervalByDatatableColumn', () => { | ||
| it('returns nothing on column from other data source', () => { | ||
| expect( | ||
| getNumberHistogramIntervalByDatatableColumn({ | ||
| id: 'test', | ||
| name: 'test', | ||
| meta: { | ||
| type: 'date', | ||
| source: 'essql', | ||
| }, | ||
| }) | ||
| ).toEqual(undefined); | ||
| }); | ||
|
|
||
| it('returns nothing on non histogram column', () => { | ||
| expect( | ||
| getNumberHistogramIntervalByDatatableColumn({ | ||
| id: 'test', | ||
| name: 'test', | ||
| meta: { | ||
| type: 'date', | ||
| source: 'esaggs', | ||
| sourceParams: { | ||
| type: BUCKET_TYPES.TERMS, | ||
| }, | ||
| }, | ||
| }) | ||
| ).toEqual(undefined); | ||
| }); | ||
|
|
||
| it('returns interval on resolved auto interval', () => { | ||
| expect( | ||
| getNumberHistogramIntervalByDatatableColumn({ | ||
| id: 'test', | ||
| name: 'test', | ||
| meta: { | ||
| type: 'date', | ||
| source: 'esaggs', | ||
| sourceParams: { | ||
| type: BUCKET_TYPES.HISTOGRAM, | ||
| params: { | ||
| interval: 'auto$$$20', | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| ).toEqual(20); | ||
| }); | ||
|
|
||
| it('returns interval on fixed interval', () => { | ||
| expect( | ||
| getNumberHistogramIntervalByDatatableColumn({ | ||
| id: 'test', | ||
| name: 'test', | ||
| meta: { | ||
| type: 'date', | ||
| source: 'esaggs', | ||
| sourceParams: { | ||
| type: BUCKET_TYPES.HISTOGRAM, | ||
| params: { | ||
| interval: 7, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| ).toEqual(7); | ||
| }); | ||
|
|
||
| it('returns undefined if information is not available', () => { | ||
| expect( | ||
| getNumberHistogramIntervalByDatatableColumn({ | ||
| id: 'test', | ||
| name: 'test', | ||
| meta: { | ||
| type: 'date', | ||
| source: 'esaggs', | ||
| sourceParams: { | ||
| type: BUCKET_TYPES.HISTOGRAM, | ||
| params: {}, | ||
| }, | ||
| }, | ||
| }) | ||
| ).toEqual(undefined); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * 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 { DatatableColumn } from 'src/plugins/expressions/common'; | ||
| import type { AggParamsHistogram } from '../buckets'; | ||
| import { BUCKET_TYPES } from '../buckets/bucket_agg_types'; | ||
|
|
||
| const SEPARATOR = '$$$'; | ||
|
|
||
| function parseSerializedInterval(interval: string | number) { | ||
| if (typeof interval === 'number') { | ||
| return interval; | ||
| } | ||
| if (interval === 'auto') { | ||
| return 'auto'; | ||
| } | ||
| return Number(interval.split(SEPARATOR)[1]); | ||
| } | ||
|
|
||
| export function buildSerializedAutoInterval(usedInterval: number) { | ||
| return `auto${SEPARATOR}${usedInterval}`; | ||
| } | ||
|
|
||
| export function isSerializedAutoInterval(interval: string | number) { | ||
| return typeof interval === 'string' && interval.startsWith('auto'); | ||
| } | ||
|
|
||
| /** | ||
| * Helper function returning the used interval for data table column created by the histogramm agg type. | ||
| * "auto" will get expanded to the actually used interval. | ||
| * If the column is not a column created by a histogram aggregation of the esaggs data source, | ||
| * this function will return undefined. | ||
| */ | ||
| export const getNumberHistogramIntervalByDatatableColumn = (column: DatatableColumn) => { | ||
| if (column.meta.source !== 'esaggs') return; | ||
| if (column.meta.sourceParams?.type !== BUCKET_TYPES.HISTOGRAM) return; | ||
| const params = (column.meta.sourceParams.params as unknown) as AggParamsHistogram; | ||
|
|
||
| if (!params.interval) { | ||
| return undefined; | ||
| } | ||
| return parseSerializedInterval(params.interval); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This logic is duplicated with the
writeandserializefunctions. I can't think of a better way, but maybe you can?