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.

Sign up for GitHub

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

Jump to bottom

[Lens][Visualize] Enables histogram for histogram fields #131379

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
+289 −12
Draft

[Lens][Visualize] Enables histogram for histogram fields #131379

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4329bd1
Enables histogram for histogram fields
stratoula May 3, 2022
8c08179
Add support for ranges agg on histogram field
stratoula May 3, 2022
844ce3d
Allows auto interval for histogram fields
stratoula May 3, 2022
c146309
Merge branch 'main' into histogram-on-histogram
stratoula May 3, 2022
f8c3ae6
Merge branch 'main' into histogram-on-histogram
stratoula May 4, 2022
48b41b8
Display a helper error in case a non-count aggregation or a breakdown…
stratoula May 4, 2022
1c9252b
Fix jest test
stratoula May 4, 2022
bd124ba
Refactor helpers jest test
stratoula May 4, 2022
35f7912
Merge branch 'main' into histogram-on-histogram
stratoula May 6, 2022
bef671e
Merge branch 'main' into histogram-on-histogram
stratoula May 9, 2022
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
6 changes: 5 additions & 1 deletion src/plugins/data/common/search/aggs/buckets/histogram.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ export const getHistogramBucketAgg = ({
{
name: 'field',
type: 'field',
filterFieldTypes: [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.NUMBER_RANGE],
filterFieldTypes: [
KBN_FIELD_TYPES.NUMBER,
KBN_FIELD_TYPES.NUMBER_RANGE,
KBN_FIELD_TYPES.HISTOGRAM,
],
},
{
/*
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/data/common/search/aggs/buckets/range.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const getRangeBucketAgg = ({ getFieldFormatsStart }: RangeBucketAggDepend
name: 'field',
type: 'field',
// number_range is not supported by Elasticsearch
filterFieldTypes: [KBN_FIELD_TYPES.NUMBER],
filterFieldTypes: [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.HISTOGRAM],
},
{
name: 'ranges',
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function NumberIntervalParamEditor({
setValue,
}: AggParamEditorProps<string | undefined>) {
const field = agg.getField();
const fieldSupportsAuto = !field || field.type === 'number';
const fieldSupportsAuto = !field || field.type === 'number' || field.type === 'histogram';
const isAutoChecked = fieldSupportsAuto && isAutoInterval(value);
const base: number = get(editorConfig, 'interval.base') as number;
const min = base || 0;
Expand Down
16 changes: 16 additions & 0 deletions ...plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,22 @@ describe('ranges', () => {
});
});

it('should return operation with the right type for histogram', () => {
expect(
rangeOperation.getPossibleOperationForField({
aggregatable: true,
searchable: true,
name: 'test',
displayName: 'test',
type: 'histogram',
})
).toEqual({
dataType: 'number',
isBucketed: true,
scale: 'interval',
});
});

it('should not return operation if field type is not number', () => {
expect(
rangeOperation.getPossibleOperationForField({
Expand Down
6 changes: 4 additions & 2 deletions x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ function getFieldDefaultFormat(indexPattern: IndexPattern, field: IndexPatternFi
return undefined;
}

const supportedTypes = ['number', 'histogram'];

export const rangeOperation: OperationDefinition<RangeIndexPatternColumn, 'field'> = {
type: 'range',
displayName: i18n.translate('xpack.lens.indexPattern.intervals', {
Expand All @@ -82,7 +84,7 @@ export const rangeOperation: OperationDefinition<RangeIndexPatternColumn, 'field
getInvalidFieldMessage(layer.columns[columnId] as FieldBasedIndexPatternColumn, indexPattern),
getPossibleOperationForField: ({ aggregationRestrictions, aggregatable, type }) => {
if (
type === 'number' &&
supportedTypes.includes(type) &&
aggregatable &&
(!aggregationRestrictions || aggregationRestrictions.range)
) {
Expand Down Expand Up @@ -121,7 +123,7 @@ export const rangeOperation: OperationDefinition<RangeIndexPatternColumn, 'field

return Boolean(
newField &&
newField.type === 'number' &&
supportedTypes.includes(newField.type) &&
newField.aggregatable &&
(!newField.aggregationRestrictions || newField.aggregationRestrictions.range)
);
Expand Down