-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
DianaDerevyankina
merged 4 commits into
elastic:master
from
DianaDerevyankina:issues/92835
Mar 3, 2021
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
1f9273c
Visualize: Can't use ip range to split series in xy chart
DianaDerevyankina f2b088e
Refactor accessors.tsx
DianaDerevyankina ce750bf
Revert "Refactor accessors.tsx"
DianaDerevyankina 5a06926
Add accessors.test to cover getComplexAccessor function
DianaDerevyankina File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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(); | ||
}); | ||
}); |
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
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.
Nice fix!