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

[XY Chart] Fix "No data to display" error when using IP range aggregation to split series #93024

Merged
merged 4 commits into from
Mar 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
101 changes: 101 additions & 0 deletions src/plugins/vis_type_xy/public/utils/accessors.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* 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 { COMPLEX_SPLIT_ACCESSOR, getComplexAccessor } from './accessors';
import { BUCKET_TYPES } from '../../../data/common';
import { AccessorFn, Datum } from '@elastic/charts';

describe('XY chart datum accessors', () => {
const aspectBase = {
accessor: 'col-0-2',
formatter: (value: Datum) => value,
aggId: '',
title: '',
params: {},
};

it('should return complex accessor for IP range aggregation', () => {
const aspect = {
aggType: BUCKET_TYPES.IP_RANGE,
...aspectBase,
};
const accessor = getComplexAccessor(COMPLEX_SPLIT_ACCESSOR)(aspect);
const datum = {
'col-0-2': { type: 'range', from: '0.0.0.0', to: '127.255.255.255' },
};

expect(typeof accessor).toBe('function');
expect((accessor as AccessorFn)(datum)).toStrictEqual({
type: 'range',
from: '0.0.0.0',
to: '127.255.255.255',
});
});

it('should return complex accessor for date range aggregation', () => {
const aspect = {
aggType: BUCKET_TYPES.DATE_RANGE,
...aspectBase,
};
const accessor = getComplexAccessor(COMPLEX_SPLIT_ACCESSOR)(aspect);
const datum = {
'col-0-2': { from: '1613941200000', to: '1614685113537' },
};

expect(typeof accessor).toBe('function');
expect((accessor as AccessorFn)(datum)).toStrictEqual({
from: '1613941200000',
to: '1614685113537',
});
});

it('should return complex accessor when isComplex option set to true', () => {
const aspect = {
aggType: BUCKET_TYPES.TERMS,
...aspectBase,
};
const accessor = getComplexAccessor(COMPLEX_SPLIT_ACCESSOR, true)(aspect);

expect(typeof accessor).toBe('function');
expect((accessor as AccessorFn)({ 'col-0-2': 'some value' })).toBe('some value');
});

it('should return simple string accessor for not range (date histogram) aggregation', () => {
const aspect = {
aggType: BUCKET_TYPES.DATE_HISTOGRAM,
...aspectBase,
};
const accessor = getComplexAccessor(COMPLEX_SPLIT_ACCESSOR)(aspect);

expect(typeof accessor).toBe('string');
expect(accessor).toBe('col-0-2');
});

it('should return simple string accessor when aspect has no formatter', () => {
const aspect = {
aggType: BUCKET_TYPES.RANGE,
...aspectBase,
formatter: undefined,
};
const accessor = getComplexAccessor(COMPLEX_SPLIT_ACCESSOR)(aspect);

expect(typeof accessor).toBe('string');
expect(accessor).toBe('col-0-2');
});

it('should return undefined when aspect has no accessor', () => {
const aspect = {
aggType: BUCKET_TYPES.RANGE,
...aspectBase,
accessor: null,
};
const accessor = getComplexAccessor(COMPLEX_SPLIT_ACCESSOR)(aspect);

expect(accessor).toBeUndefined();
});
});
2 changes: 1 addition & 1 deletion src/plugins/vis_type_xy/public/utils/accessors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const getFieldName = (fieldName: string, index?: number) => {
};

export const isRangeAggType = (type: string | null) =>
type === BUCKET_TYPES.DATE_RANGE || type === BUCKET_TYPES.RANGE;
type === BUCKET_TYPES.DATE_RANGE || type === BUCKET_TYPES.RANGE || type === BUCKET_TYPES.IP_RANGE;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice fix!


/**
* Returns accessor function for complex accessor types
Expand Down