Skip to content

fixes split chart with no data #26872

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

Merged
ppisljar merged 1 commit into from
Dec 11, 2018
Merged

fixes split chart with no data #26872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 4 additions & 36 deletions src/ui/public/vis/__tests__/response_handlers/basic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,58 +20,26 @@
import ngMock from 'ng_mock';
import expect from 'expect.js';
import { VislibSeriesResponseHandlerProvider } from '../../response_handlers/vislib';
import { VisProvider } from '../..';
import fixtures from 'fixtures/fake_hierarchical_data';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';

const rowAgg = [
{ id: 'agg_1', type: 'avg', schema: 'metric', params: { field: 'bytes' } },
{ id: 'agg_2', type: 'terms', schema: 'split', params: { field: 'extension', rows: true } },
{ id: 'agg_3', type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
{ id: 'agg_4', type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
];


describe('Basic Response Handler', function () {
let basicResponseHandler;
let indexPattern;
let Vis;

beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
basicResponseHandler = Private(VislibSeriesResponseHandlerProvider).handler;
Vis = Private(VisProvider);
indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
}));

it('calls hierarchical converter if isHierarchical is set to true', () => {
const vis = new Vis(indexPattern, {
type: 'pie',
aggs: rowAgg
});
basicResponseHandler(vis, fixtures.threeTermBuckets).then(data => {
expect(data).to.not.be.an('undefined');
expect(data.rows[0].slices).to.not.be.an('undefined');
expect(data.rows[0].series).to.be.an('undefined');
});
});

it('returns empty object if conversion failed', () => {
basicResponseHandler({}, {}).then(data => {
basicResponseHandler({}).then(data => {
expect(data).to.not.be.an('undefined');
expect(data.rows).to.equal([]);
});
});

it('returns converted data', () => {
const vis = new Vis(indexPattern, {
type: 'histogram',
aggs: rowAgg.slice(0, 3)
});
basicResponseHandler(vis, fixtures.threeTermBuckets).then(data => {
it('returns empty object if no data was found', () => {
basicResponseHandler({ columns: [{ id: '1', title: '1', aggConfig: {} }], rows: [] }).then(data => {
expect(data).to.not.be.an('undefined');
expect(data.rows[0].slices).to.be.an('undefined');
expect(data.rows[0].series).to.not.be.an('undefined');
expect(data.rows).to.equal([]);
});
});

Expand Down
5 changes: 2 additions & 3 deletions src/ui/public/vis/response_handlers/vislib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ function convertTableGroup(tableGroup, convertTable) {
const tables = tableGroup.tables;
const firstChild = tables[0];

if (firstChild.columns) {
if (!tables.length) return;

if (firstChild.columns) {
const chart = convertTable(firstChild);
// if chart is within a split, assign group title to its label
if (tableGroup.$parent) {
Expand All @@ -36,8 +37,6 @@ function convertTableGroup(tableGroup, convertTable) {
return chart;
}

if (!tables.length) return;

const out = {};
let outList;

Expand Down