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

Allow splitting series on multiple fields #17855

Merged
merged 4 commits into from
May 9, 2018
Merged

Allow splitting series on multiple fields #17855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20e0e23
adding support for multiple split series buckets
ppisljar Apr 24, 2018
a03aafe
fixing tests
ppisljar May 8, 2018
c5a8584
adding selenium tests
ppisljar May 8, 2018
387a84e
fixing test
ppisljar May 8, 2018
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
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/area.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default function PointSeriesVisType(Private) {
name: 'group',
title: 'Split Series',
min: 0,
max: 1,
max: 3,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are only 3 splits allowed? Should this be made configurable via an advanced setting?

Copy link
Member Author

Choose a reason for hiding this comment

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

we are guessing it doesn't make much sense at this point ... lets wait for somebody to ask for more than 3

aggFilter: ['!geohash_grid', '!filter']
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/histogram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export default function PointSeriesVisType(Private) {
name: 'group',
title: 'Split Series',
min: 0,
max: 1,
max: 3,
aggFilter: ['!geohash_grid', '!filter']
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default function PointSeriesVisType(Private) {
name: 'group',
title: 'Split Series',
min: 0,
max: 1,
max: 3,
aggFilter: ['!geohash_grid', '!filter']
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export default function PointSeriesVisType(Private) {
name: 'group',
title: 'Split Series',
min: 0,
max: 1,
max: 3,
aggFilter: ['!geohash_grid', '!filter']
},
{
Expand Down
8 changes: 0 additions & 8 deletions src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,6 @@ describe('getAspects', function () {
}).to.throwError(TypeError);
});

it('throws an error if there are multiple series aspects', function () {
init(2, 1, 1);

expect(function () {
getAspects(vis, table);
}).to.throwError(TypeError);
});

it('creates a fake x aspect if the column does not exist', function () {
init(0, 0, 1);

Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/agg_response/point_series/__tests__/_get_point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('getPoint', function () {

expect(point)
.to.have.property('x', 1)
.and.have.property('series', 2)
.and.have.property('series', '2')
.and.have.property('y', 3)
.and.have.property('aggConfigResult', row[2]);
});
Expand All @@ -80,7 +80,7 @@ describe('getPoint', function () {

expect(point)
.to.have.property('x', 1)
.and.have.property('series', true)
.and.have.property('series', 'true')
.and.have.property('y', 3)
.and.have.property('aggConfigResult', row[2]);
});
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/agg_response/point_series/_get_aspects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export function PointSeriesGetAspectsProvider(Private) {
.transform(columnToAspect, {})
// unwrap groups that only have one value, and validate groups that have more
.transform(function (aspects, group, name) {
if (name !== 'y' && group.length > 1) {
throw new TypeError('Only multiple metrics are supported in point series');
if ((name !== 'y' && name !== 'series') && group.length > 1) {
throw new TypeError('Only multiple metrics and series are supported in point series');
}

aspects[name] = group.length > 1 ? group : group[0];
Expand Down
5 changes: 3 additions & 2 deletions src/ui/public/agg_response/point_series/_get_point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ export function PointSeriesGetPointProvider() {
}

if (series) {
point.aggConfig = series.agg;
point.series = series.agg.fieldFormatter()(unwrap(row[series.i]));
const seriesArray = series.length ? series : [ series ];
point.aggConfig = seriesArray[0].agg;
point.series = seriesArray.map(s => s.agg.fieldFormatter()(unwrap(row[s.i]))).join(' - ');
} else if (y) {
// If the data is not split up with a series aspect, then
// each point's "series" becomes the y-agg that produced it
Expand Down
51 changes: 50 additions & 1 deletion test/functional/apps/visualize/_vertical_bar_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function ({ getService, getPageObjects }) {
const fromTime = '2015-09-19 06:31:44.000';
const toTime = '2015-09-23 18:31:44.000';

before(function () {
beforeEach(function () {
log.debug('navigateToApp visualize');
return PageObjects.common.navigateToUrl('visualize', 'new')
.then(function () {
Expand Down Expand Up @@ -118,5 +118,54 @@ export default function ({ getService, getPageObjects }) {
});
});
});

describe('vertical bar with split series', function () {
it('should show correct series', async function () {
await PageObjects.visualize.toggleOpenEditor(2, 'false');
await PageObjects.visualize.clickAddBucket();
await PageObjects.visualize.clickBucket('Split Series');
await PageObjects.visualize.selectAggregation('Terms');
await PageObjects.visualize.selectField('response.raw');
await PageObjects.header.waitUntilLoadingHasFinished();

await PageObjects.common.sleep(1003);
await PageObjects.visualize.clickGo();
await PageObjects.header.waitUntilLoadingHasFinished();

const expectedEntries = ['200', '404', '503'];
const legendEntries = await PageObjects.visualize.getLegendEntries();
expect(legendEntries).to.eql(expectedEntries);
});
});

describe('vertical bar with multiple splits', function () {
it('should show correct series', async function () {
await PageObjects.visualize.toggleOpenEditor(2, 'false');
await PageObjects.visualize.clickAddBucket();
await PageObjects.visualize.clickBucket('Split Series');
await PageObjects.visualize.selectAggregation('Terms');
await PageObjects.visualize.selectField('response.raw');
await PageObjects.header.waitUntilLoadingHasFinished();

await PageObjects.visualize.toggleOpenEditor(3, 'false');
await PageObjects.visualize.clickAddBucket();
await PageObjects.visualize.clickBucket('Split Series');
await PageObjects.visualize.selectAggregation('Terms');
await PageObjects.visualize.selectField('machine.os');
await PageObjects.header.waitUntilLoadingHasFinished();

await PageObjects.common.sleep(1003);
await PageObjects.visualize.clickGo();
await PageObjects.header.waitUntilLoadingHasFinished();

const expectedEntries = [
'200 - win 8', '200 - win xp', '200 - ios', '200 - osx', '200 - win 7',
'404 - ios', '503 - ios', '503 - osx', '503 - win 7', '503 - win 8',
'503 - win xp', '404 - osx', '404 - win 7', '404 - win 8', '404 - win xp'
];
const legendEntries = await PageObjects.visualize.getLegendEntries();
expect(legendEntries).to.eql(expectedEntries);
});
});
});
}
13 changes: 11 additions & 2 deletions test/functional/page_objects/visualize_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
await find.clickByCssSelector('[group-name="metrics"] [data-test-subj="visualizeEditorAddAggregationButton"]');
}

async clickAddBucket() {
await find.clickByCssSelector('[group-name="buckets"] [data-test-subj="visualizeEditorAddAggregationButton"]');
}

async clickMetric() {
await find.clickByPartialLinkText('Metric');
}
Expand Down Expand Up @@ -375,12 +379,12 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
});
}

async toggleOpenEditor(index) {
async toggleOpenEditor(index, toState = 'true') {
// index, see selectYAxisAggregation
const toggle = await find.byCssSelector(`button[aria-controls="visAggEditorParams${index}"]`);
const toggleOpen = await toggle.getAttribute('aria-expanded');
log.debug(`toggle ${index} expand = ${toggleOpen}`);
if (toggleOpen === 'false') {
if (toggleOpen !== toState) {
log.debug(`toggle ${index} click()`);
await toggle.click();
}
Expand Down Expand Up @@ -880,6 +884,11 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
}
}

async getLegendEntries() {
const legendEntries = await find.allByCssSelector('.legend-value-title', defaultFindTimeout * 2);
return await Promise.all(legendEntries.map(async chart => await chart.getAttribute('data-label')));
}

async clickLegendOption(name) {
await testSubjects.click(`legend-${name}`);
}
Expand Down