').css({
diff --git a/src/ui/public/vislib/__tests__/visualizations/area_chart.js b/src/ui/public/vislib/__tests__/visualizations/area_chart.js
index d7286260d835c..1736a6de8af1a 100644
--- a/src/ui/public/vislib/__tests__/visualizations/area_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/area_chart.js
@@ -22,187 +22,188 @@ const visLibParams = {
mode: 'stacked'
};
+describe('', function () {
+ _.forOwn(dataTypesArray, function (dataType, dataTypeName) {
+ describe('Vislib Area Chart Test Suite for ' + dataTypeName + ' Data', function () {
+ let vis;
+ let persistedState;
+
+ beforeEach(ngMock.module('kibana'));
+ beforeEach(ngMock.inject(function (Private, $injector) {
+ vis = Private(FixturesVislibVisFixtureProvider)(visLibParams);
+ persistedState = new ($injector.get('PersistedState'))();
+ vis.on('brush', _.noop);
+ vis.render(dataType, persistedState);
+ }));
-_.forOwn(dataTypesArray, function (dataType, dataTypeName) {
- describe('Vislib Area Chart Test Suite for ' + dataTypeName + ' Data', function () {
- let vis;
- let persistedState;
-
- beforeEach(ngMock.module('kibana'));
- beforeEach(ngMock.inject(function (Private, $injector) {
- vis = Private(FixturesVislibVisFixtureProvider)(visLibParams);
- persistedState = new ($injector.get('PersistedState'))();
- vis.on('brush', _.noop);
- vis.render(dataType, persistedState);
- }));
-
- afterEach(function () {
- vis.destroy();
- });
+ afterEach(function () {
+ vis.destroy();
+ });
- describe('stackData method', function () {
- let stackedData;
- let isStacked;
+ describe('stackData method', function () {
+ let stackedData;
+ let isStacked;
- beforeEach(function () {
- vis.handler.charts.forEach(function (chart) {
- stackedData = chart.chartData;
+ beforeEach(function () {
+ vis.handler.charts.forEach(function (chart) {
+ stackedData = chart.chartData;
- isStacked = stackedData.series.every(function (arr) {
- return arr.values.every(function (d) {
- return _.isNumber(d.y0);
+ isStacked = stackedData.series.every(function (arr) {
+ return arr.values.every(function (d) {
+ return _.isNumber(d.y0);
+ });
});
});
});
- });
- it('should append a d.y0 key to the data object', function () {
- expect(isStacked).to.be(true);
+ it('should append a d.y0 key to the data object', function () {
+ expect(isStacked).to.be(true);
+ });
});
- });
- describe('addPath method', function () {
- it('should append a area paths', function () {
- vis.handler.charts.forEach(function (chart) {
- expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
+ describe('addPath method', function () {
+ it('should append a area paths', function () {
+ vis.handler.charts.forEach(function (chart) {
+ expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
+ });
});
});
- });
- describe('addPathEvents method', function () {
- let path;
- let d3selectedPath;
- let onMouseOver;
+ describe('addPathEvents method', function () {
+ let path;
+ let d3selectedPath;
+ let onMouseOver;
- beforeEach(ngMock.inject(function () {
- vis.handler.charts.forEach(function (chart) {
- path = $(chart.chartEl).find('path')[0];
- d3selectedPath = d3.select(path)[0][0];
+ beforeEach(ngMock.inject(function () {
+ vis.handler.charts.forEach(function (chart) {
+ path = $(chart.chartEl).find('path')[0];
+ d3selectedPath = d3.select(path)[0][0];
- // d3 instance of click and hover
- onMouseOver = (!!d3selectedPath.__onmouseover);
- });
- }));
+ // d3 instance of click and hover
+ onMouseOver = (!!d3selectedPath.__onmouseover);
+ });
+ }));
- it('should attach a hover event', function () {
- vis.handler.charts.forEach(function () {
- expect(onMouseOver).to.be(true);
+ it('should attach a hover event', function () {
+ vis.handler.charts.forEach(function () {
+ expect(onMouseOver).to.be(true);
+ });
});
});
- });
- describe('addCircleEvents method', function () {
- let circle;
- let brush;
- let d3selectedCircle;
- let onBrush;
- let onClick;
- let onMouseOver;
-
- beforeEach(ngMock.inject(function () {
- vis.handler.charts.forEach(function (chart) {
- circle = $(chart.chartEl).find('circle')[0];
- brush = $(chart.chartEl).find('.brush');
- d3selectedCircle = d3.select(circle)[0][0];
-
- // d3 instance of click and hover
- onBrush = (!!brush);
- onClick = (!!d3selectedCircle.__onclick);
- onMouseOver = (!!d3selectedCircle.__onmouseover);
+ describe('addCircleEvents method', function () {
+ let circle;
+ let brush;
+ let d3selectedCircle;
+ let onBrush;
+ let onClick;
+ let onMouseOver;
+
+ beforeEach(ngMock.inject(function () {
+ vis.handler.charts.forEach(function (chart) {
+ circle = $(chart.chartEl).find('circle')[0];
+ brush = $(chart.chartEl).find('.brush');
+ d3selectedCircle = d3.select(circle)[0][0];
+
+ // d3 instance of click and hover
+ onBrush = (!!brush);
+ onClick = (!!d3selectedCircle.__onclick);
+ onMouseOver = (!!d3selectedCircle.__onmouseover);
+ });
+ }));
+
+ // D3 brushing requires that a g element is appended that
+ // listens for mousedown events. This g element includes
+ // listeners, however, I was not able to test for the listener
+ // function being present. I will need to update this test
+ // in the future.
+ it('should attach a brush g element', function () {
+ vis.handler.charts.forEach(function () {
+ expect(onBrush).to.be(true);
+ });
});
- }));
- // D3 brushing requires that a g element is appended that
- // listens for mousedown events. This g element includes
- // listeners, however, I was not able to test for the listener
- // function being present. I will need to update this test
- // in the future.
- it('should attach a brush g element', function () {
- vis.handler.charts.forEach(function () {
- expect(onBrush).to.be(true);
+ it('should attach a click event', function () {
+ vis.handler.charts.forEach(function () {
+ expect(onClick).to.be(true);
+ });
});
- });
- it('should attach a click event', function () {
- vis.handler.charts.forEach(function () {
- expect(onClick).to.be(true);
+ it('should attach a hover event', function () {
+ vis.handler.charts.forEach(function () {
+ expect(onMouseOver).to.be(true);
+ });
});
});
- it('should attach a hover event', function () {
- vis.handler.charts.forEach(function () {
- expect(onMouseOver).to.be(true);
+ describe('addCircles method', function () {
+ it('should append circles', function () {
+ vis.handler.charts.forEach(function (chart) {
+ expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0);
+ });
});
- });
- });
- describe('addCircles method', function () {
- it('should append circles', function () {
- vis.handler.charts.forEach(function (chart) {
- expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0);
- });
- });
+ it('should not draw circles where d.y === 0', function () {
+ vis.handler.charts.forEach(function (chart) {
+ const series = chart.chartData.series;
+ const isZero = series.some(function (d) {
+ return d.y === 0;
+ });
+ const circles = $.makeArray($(chart.chartEl).find('circle'));
+ const isNotDrawn = circles.some(function (d) {
+ return d.__data__.y === 0;
+ });
- it('should not draw circles where d.y === 0', function () {
- vis.handler.charts.forEach(function (chart) {
- const series = chart.chartData.series;
- const isZero = series.some(function (d) {
- return d.y === 0;
- });
- const circles = $.makeArray($(chart.chartEl).find('circle'));
- const isNotDrawn = circles.some(function (d) {
- return d.__data__.y === 0;
+ if (isZero) {
+ expect(isNotDrawn).to.be(false);
+ }
});
-
- if (isZero) {
- expect(isNotDrawn).to.be(false);
- }
});
});
- });
- describe('draw method', function () {
- it('should return a function', function () {
- vis.handler.charts.forEach(function (chart) {
- expect(_.isFunction(chart.draw())).to.be(true);
+ describe('draw method', function () {
+ it('should return a function', function () {
+ vis.handler.charts.forEach(function (chart) {
+ expect(_.isFunction(chart.draw())).to.be(true);
+ });
});
- });
- it('should return a yMin and yMax', function () {
- vis.handler.charts.forEach(function (chart) {
- const yAxis = chart.handler.valueAxes[0];
- const domain = yAxis.getScale().domain();
+ it('should return a yMin and yMax', function () {
+ vis.handler.charts.forEach(function (chart) {
+ const yAxis = chart.handler.valueAxes[0];
+ const domain = yAxis.getScale().domain();
- expect(domain[0]).to.not.be(undefined);
- expect(domain[1]).to.not.be(undefined);
+ expect(domain[0]).to.not.be(undefined);
+ expect(domain[1]).to.not.be(undefined);
+ });
});
- });
- it('should render a zero axis line', function () {
- vis.handler.charts.forEach(function (chart) {
- const yAxis = chart.handler.valueAxes[0];
+ it('should render a zero axis line', function () {
+ vis.handler.charts.forEach(function (chart) {
+ const yAxis = chart.handler.valueAxes[0];
- if (yAxis.yMin < 0 && yAxis.yMax > 0) {
- expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
- }
+ if (yAxis.yMin < 0 && yAxis.yMax > 0) {
+ expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
+ }
+ });
});
});
- });
- describe('defaultYExtents is true', function () {
- beforeEach(function () {
- vis.visConfigArgs.defaultYExtents = true;
- vis.render(dataType, persistedState);
- });
+ describe('defaultYExtents is true', function () {
+ beforeEach(function () {
+ vis.visConfigArgs.defaultYExtents = true;
+ vis.render(dataType, persistedState);
+ });
- it('should return yAxis extents equal to data extents', function () {
- vis.handler.charts.forEach(function (chart) {
- const yAxis = chart.handler.valueAxes[0];
- const min = vis.handler.valueAxes[0].axisScale.getYMin();
- const max = vis.handler.valueAxes[0].axisScale.getYMax();
- const domain = yAxis.getScale().domain();
- expect(domain[0]).to.equal(min);
- expect(domain[1]).to.equal(max);
+ it('should return yAxis extents equal to data extents', function () {
+ vis.handler.charts.forEach(function (chart) {
+ const yAxis = chart.handler.valueAxes[0];
+ const min = vis.handler.valueAxes[0].axisScale.getYMin();
+ const max = vis.handler.valueAxes[0].axisScale.getYMax();
+ const domain = yAxis.getScale().domain();
+ expect(domain[0]).to.equal(min);
+ expect(domain[1]).to.equal(max);
+ });
});
});
});
diff --git a/src/ui/public/vislib/__tests__/visualizations/chart.js b/src/ui/public/vislib/__tests__/visualizations/chart.js
index 862991505d508..f6257497d83dc 100644
--- a/src/ui/public/vislib/__tests__/visualizations/chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/chart.js
@@ -15,67 +15,69 @@ describe('Vislib _chart Test Suite', function () {
let config;
const data = {
hits : 621,
- label : '',
- ordered : {
- date: true,
- interval: 30000,
- max : 1408734982458,
- min : 1408734082458
- },
- series : [
- {
- values: [
- {
- x: 1408734060000,
- y: 8
- },
- {
- x: 1408734090000,
- y: 23
- },
- {
- x: 1408734120000,
- y: 30
- },
- {
- x: 1408734150000,
- y: 28
- },
- {
- x: 1408734180000,
- y: 36
- },
- {
- x: 1408734210000,
- y: 30
- },
- {
- x: 1408734240000,
- y: 26
- },
- {
- x: 1408734270000,
- y: 22
- },
- {
- x: 1408734300000,
- y: 29
- },
- {
- x: 1408734330000,
- y: 24
- }
- ]
- }
- ],
- tooltipFormatter: function (datapoint) {
- return datapoint;
- },
- xAxisFormatter: function (thing) {
- return thing;
- },
- xAxisLabel: 'Date Histogram',
- yAxisLabel: 'Count'
+ charts: [{
+ label : '',
+ ordered : {
+ date: true,
+ interval: 30000,
+ max : 1408734982458,
+ min : 1408734082458
+ },
+ series : [
+ {
+ values: [
+ {
+ x: 1408734060000,
+ y: 8
+ },
+ {
+ x: 1408734090000,
+ y: 23
+ },
+ {
+ x: 1408734120000,
+ y: 30
+ },
+ {
+ x: 1408734150000,
+ y: 28
+ },
+ {
+ x: 1408734180000,
+ y: 36
+ },
+ {
+ x: 1408734210000,
+ y: 30
+ },
+ {
+ x: 1408734240000,
+ y: 26
+ },
+ {
+ x: 1408734270000,
+ y: 22
+ },
+ {
+ x: 1408734300000,
+ y: 29
+ },
+ {
+ x: 1408734330000,
+ y: 24
+ }
+ ]
+ }
+ ],
+ tooltipFormatter: function (datapoint) {
+ return datapoint;
+ },
+ xAxisFormatter: function (thing) {
+ return thing;
+ },
+ xAxisLabel: 'Date Histogram',
+ yAxisLabel: 'Count'
+ }]
};
beforeEach(ngMock.module('kibana'));
diff --git a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
index b4ba0ca5c6622..bbbb0f99c54da 100644
--- a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
@@ -2,45 +2,10 @@ import d3 from 'd3';
import expect from 'expect.js';
import ngMock from 'ng_mock';
import _ from 'lodash';
-import fixtures from 'fixtures/fake_hierarchical_data';
import $ from 'jquery';
import FixturesVislibVisFixtureProvider from 'fixtures/vislib/_vis_fixture';
-import { VisProvider } from 'ui/vis';
import 'ui/persisted_state';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { BuildHierarchicalDataProvider } from 'ui/agg_response/hierarchical/build_hierarchical_data';
-
-const rowAgg = [
- { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
- { type: 'terms', schema: 'split', params: { field: 'extension', rows: true } },
- { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
- { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
-];
-
-const colAgg = [
- { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
- { type: 'terms', schema: 'split', params: { field: 'extension', row: false } },
- { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
- { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
-];
-
-const sliceAgg = [
- { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
- { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
- { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
-];
-
-const aggArray = [
- rowAgg,
- colAgg,
- sliceAgg
-];
-
-const names = [
- 'rows',
- 'columns',
- 'slices'
-];
+import pieData from 'fixtures/vislib/mock_data/pie/_histogram';
const sizes = [
0,
@@ -52,147 +17,64 @@ const sizes = [
];
describe('No global chart settings', function () {
- const visLibParams1 = {
- el: '
',
- type: 'pie',
- addLegend: true,
- addTooltip: true
- };
- const visLibParams2 = {
- el: '
',
+ const visLibParams = {
+ el: $('
'),
type: 'pie',
addLegend: true,
addTooltip: true
};
- let chart1;
- let chart2;
- let Vis;
+ let vis;
let persistedState;
- let indexPattern;
- let buildHierarchicalData;
- let data1;
- let data2;
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
- chart1 = Private(FixturesVislibVisFixtureProvider)(visLibParams1);
- chart2 = Private(FixturesVislibVisFixtureProvider)(visLibParams2);
- Vis = Private(VisProvider);
+ vis = Private(FixturesVislibVisFixtureProvider)(visLibParams);
persistedState = new ($injector.get('PersistedState'))();
- indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
- buildHierarchicalData = Private(BuildHierarchicalDataProvider);
-
- let id1 = 1;
- let id2 = 1;
- const stubVis1 = new Vis(indexPattern, {
- type: 'pie',
- aggs: rowAgg
- });
- const stubVis2 = new Vis(indexPattern, {
- type: 'pie',
- aggs: colAgg
- });
-
- // We need to set the aggs to a known value.
- _.each(stubVis1.aggs, function (agg) {
- agg.id = 'agg_' + id1++;
- });
- _.each(stubVis2.aggs, function (agg) {
- agg.id = 'agg_' + id2++;
- });
-
- data1 = buildHierarchicalData(stubVis1, fixtures.threeTermBuckets);
- data2 = buildHierarchicalData(stubVis2, fixtures.threeTermBuckets);
-
- chart1.render(data1, persistedState);
- chart2.render(data2, persistedState);
+ vis.on('brush', _.noop);
+ vis.render(pieData, persistedState);
}));
afterEach(function () {
- chart1.destroy();
- chart2.destroy();
+ vis.destroy();
});
it('should render chart titles for all charts', function () {
- expect($(chart1.el).find('.y-axis-chart-title').length).to.be(1);
- expect($(chart2.el).find('.x-axis-chart-title').length).to.be(1);
+ expect($(vis.el).find('.x-axis-chart-title').length).to.be(1);
});
describe('_validatePieData method', function () {
const allZeros = [
- { slices: { children: [] } },
- { slices: { children: [] } },
- { slices: { children: [] } }
+ { children: [] },
+ { children: [] },
+ { children: [] }
];
const someZeros = [
- { slices: { children: [{}] } },
- { slices: { children: [{}] } },
- { slices: { children: [] } }
+ { children: [{}] },
+ { children: [{}] },
+ { children: [] }
];
const noZeros = [
- { slices: { children: [{}] } },
- { slices: { children: [{}] } },
- { slices: { children: [{}] } }
+ { children: [{}] },
+ { children: [{}] },
+ { children: [{}] }
];
it('should throw an error when all charts contain zeros', function () {
expect(function () {
- chart1.handler.ChartClass.prototype._validatePieData(allZeros);
+ vis.handler.ChartClass.prototype._validatePieData(allZeros);
}).to.throwError();
});
it('should not throw an error when only some or no charts contain zeros', function () {
expect(function () {
- chart1.handler.ChartClass.prototype._validatePieData(someZeros);
+ vis.handler.ChartClass.prototype._validatePieData(someZeros);
}).to.not.throwError();
expect(function () {
- chart1.handler.ChartClass.prototype._validatePieData(noZeros);
+ vis.handler.ChartClass.prototype._validatePieData(noZeros);
}).to.not.throwError();
});
- });
-});
-
-aggArray.forEach(function (dataAgg, i) {
- describe('Vislib PieChart Class Test Suite for ' + names[i] + ' data', function () {
- const visLibParams = {
- type: 'pie',
- addLegend: true,
- addTooltip: true
- };
- let vis;
- let Vis;
- let persistedState;
- let indexPattern;
- let buildHierarchicalData;
- let data;
-
- beforeEach(ngMock.module('kibana'));
- beforeEach(ngMock.inject(function (Private, $injector) {
- vis = Private(FixturesVislibVisFixtureProvider)(visLibParams);
- Vis = Private(VisProvider);
- persistedState = new ($injector.get('PersistedState'))();
- indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
- buildHierarchicalData = Private(BuildHierarchicalDataProvider);
-
- let id = 1;
- const stubVis = new Vis(indexPattern, {
- type: 'pie',
- aggs: dataAgg
- });
-
- // We need to set the aggs to a known value.
- _.each(stubVis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-
- data = buildHierarchicalData(stubVis, fixtures.threeTermBuckets);
-
- vis.render(data, persistedState);
- }));
-
- afterEach(function () {
- vis.destroy();
- });
describe('addPathEvents method', function () {
let path;
@@ -235,7 +117,7 @@ aggArray.forEach(function (dataAgg, i) {
width = $(chart.chartEl).width();
height = $(chart.chartEl).height();
svg = d3.select($(chart.chartEl).find('svg')[0]);
- slices = chart.chartData.slices;
+ slices = chart.chartData;
});
}));
@@ -292,6 +174,5 @@ aggArray.forEach(function (dataAgg, i) {
});
});
});
-
});
});
diff --git a/src/ui/public/vislib/__tests__/visualizations/time_marker.js b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
index fdc6273abeeec..883de31064a83 100644
--- a/src/ui/public/vislib/__tests__/visualizations/time_marker.js
+++ b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
@@ -42,8 +42,8 @@ describe('Vislib Time Marker Test Suite', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
TimeMarker = Private(VislibVisualizationsTimeMarkerProvider);
- minDomain = getExtent(series.series, d3.min);
- maxDomain = getExtent(series.series, d3.max);
+ minDomain = getExtent(series.charts[0].series, d3.min);
+ maxDomain = getExtent(series.charts[0].series, d3.max);
domain = [minDomain, maxDomain];
xScale = d3.time.scale().domain(domain).range([0, 500]);
defaultMarker = new TimeMarker(times, xScale, height);
diff --git a/src/ui/public/vislib/lib/axis/axis_config.js b/src/ui/public/vislib/lib/axis/axis_config.js
index f5c99b0fb3cb1..48dcf961a0c52 100644
--- a/src/ui/public/vislib/lib/axis/axis_config.js
+++ b/src/ui/public/vislib/lib/axis/axis_config.js
@@ -95,7 +95,7 @@ export function VislibLibAxisConfigProvider() {
this.values = this._values.values;
}
if (!this._values.labels.axisFormatter) {
- this._values.labels.axisFormatter = this.data.data.xAxisFormatter || this.data.get('xAxisFormatter');
+ this._values.labels.axisFormatter = this.data.get('xAxisFormatter');
}
}
diff --git a/src/ui/public/vislib/lib/data.js b/src/ui/public/vislib/lib/data.js
index 121314bc69644..bfd95eca755a0 100644
--- a/src/ui/public/vislib/lib/data.js
+++ b/src/ui/public/vislib/lib/data.js
@@ -1,15 +1,12 @@
import d3 from 'd3';
import _ from 'lodash';
import { VislibComponentsZeroInjectionInjectZerosProvider } from '../components/zero_injection/inject_zeros';
-import { VislibComponentsZeroInjectionOrderedXKeysProvider } from '../components/zero_injection/ordered_x_keys';
-import { VislibComponentsLabelsLabelsProvider } from '../components/labels/labels';
import { VislibComponentsColorColorProvider } from 'ui/vis/components/color/color';
+import { tooltipFormatter } from 'ui/vis/components/tooltip/formatter';
export function VislibLibDataProvider(Private) {
const injectZeros = Private(VislibComponentsZeroInjectionInjectZerosProvider);
- const orderKeys = Private(VislibComponentsZeroInjectionOrderedXKeysProvider);
- const getLabels = Private(VislibComponentsLabelsLabelsProvider);
const color = Private(VislibComponentsColorColorProvider);
/**
@@ -24,92 +21,47 @@ export function VislibLibDataProvider(Private) {
class Data {
constructor(data, uiState) {
this.uiState = uiState;
+ this.type = this.getDataType(data);
this.data = this.copyDataObj(data);
- this.type = this.getDataType();
- this.labels = this._getLabels(this.data);
+ this.labels = this.getLabels();
this.color = this.labels ? color(this.labels, uiState.get('vis.colors')) : undefined;
this._normalizeOrdered();
+
+ this.chartData()[0].tooltipFormatter = tooltipFormatter;
}
- copyDataObj(data) {
- const copyChart = data => {
- const newData = {};
- Object.keys(data).forEach(key => {
- if (key !== 'series') {
- newData[key] = data[key];
- } else {
- newData[key] = data[key].map(seri => {
- return {
- label: seri.label,
- aggLabel: seri.aggLabel,
- aggId: seri.aggId,
- values: seri.values.map(val => {
- const newVal = _.clone(val);
- newVal.aggConfig = val.aggConfig;
- newVal.aggConfigResult = val.aggConfigResult;
- newVal.extraMetrics = val.extraMetrics;
- newVal.series = val.series || seri.label;
- return newVal;
- })
- };
- });
- }
- });
- return newData;
- };
+ getDataType(data) {
+ if (!data.charts || !data.charts.length) return 'no data';
+ if (data.charts[0].series) return 'series';
+ if (data.charts[0].children) return 'slices';
+ if (data.charts[0].cells) return 'table';
- if (!data.series) {
- const newData = {};
- Object.keys(data).forEach(key => {
- if (!['rows', 'columns'].includes(key)) {
- newData[key] = data[key];
- }
- else {
- newData[key] = data[key].map(chart => {
- return copyChart(chart);
- });
- }
- });
- return newData;
- }
- return copyChart(data);
+ throw ('vislib: invalid data format');
}
- _getLabels(data) {
- return this.type === 'series' ? getLabels(data) : this.pieNames();
+ copyDataObj(data) {
+ if (data.split === 'row') {
+ return { rows: _.cloneDeep(data.charts) };
+ }
+ return { columns: _.cloneDeep(data.charts) };
}
- getDataType() {
- const data = this.getVisData();
- let type;
-
- data.forEach(function (obj) {
- if (obj.series) {
- type = 'series';
- } else if (obj.slices) {
- type = 'slices';
- } else if (obj.geoJson) {
- type = 'geoJson';
- }
- });
-
- return type;
+ getLabels(data = this.chartData()) {
+ const getSeriesLabels = (data) => {
+ const labels = {};
+ data.forEach(chart => {
+ _.each(chart.series, series => {
+ if (!labels[series.label]) labels[series.label] = 1;
+ });
+ });
+ return _.keys(labels);
+ };
+ return this.type === 'series' ? getSeriesLabels(data) : this.pieNames();
}
- /**
- * Returns an array of the actual x and y data value objects
- * from data with series keys
- *
- * @method chartData
- * @returns {*} Array of data objects
- */
chartData() {
- if (!this.data.series) {
- const arr = this.data.rows ? this.data.rows : this.data.columns;
- return _.toArray(arr);
- }
- return [this.data];
+ return this.data.columns || this.data.rows;
}
shouldBeStacked(seriesConfig) {
@@ -141,65 +93,9 @@ export function VislibLibDataProvider(Private) {
}
stackData(handler) {
- const data = this.data;
- if (data.rows || data.columns) {
- const charts = data.rows ? data.rows : data.columns;
- charts.forEach((chart, i) => {
- this.stackChartData(handler, chart.series, handler.visConfig.get(`charts[${i}]`));
- });
- } else {
- this.stackChartData(handler, data.series, handler.visConfig.get('charts[0]'));
- }
- }
-
- /**
- * Returns an array of chart data objects
- *
- * @method getVisData
- * @returns {*} Array of chart data objects
- */
- getVisData() {
- let visData;
-
- if (this.data.rows) {
- visData = this.data.rows;
- } else if (this.data.columns) {
- visData = this.data.columns;
- } else {
- visData = [this.data];
- }
-
- return visData;
- }
-
- /**
- * get min and max for all cols, rows of data
- *
- * @method getMaxMin
- * @return {Object}
- */
- getGeoExtents() {
- const visData = this.getVisData();
-
- return _.reduce(_.pluck(visData, 'geoJson.properties'), function (minMax, props) {
- return {
- min: Math.min(props.min, minMax.min),
- max: Math.max(props.max, minMax.max)
- };
- }, { min: Infinity, max: -Infinity });
- }
-
- /**
- * Returns array of chart data objects for pie data objects
- *
- * @method pieData
- * @returns {*} Array of chart data objects
- */
- pieData() {
- if (!this.data.slices) {
- return this.data.rows ? this.data.rows : this.data.columns;
- }
- return [this.data];
+ this.chartData().forEach((chart, i) => {
+ this.stackChartData(handler, chart.series, handler.visConfig.get(`charts[${i}]`));
+ });
}
/**
@@ -213,7 +109,7 @@ export function VislibLibDataProvider(Private) {
* @returns {*} Data object value
*/
get(thing, def) {
- const source = (this.data.rows || this.data.columns || [this.data])[0];
+ const source = this.chartData()[0];
return _.get(source, thing, def);
}
@@ -250,79 +146,17 @@ export function VislibLibDataProvider(Private) {
.value();
}
- /**
- * Validates that the Y axis min value defined by user input
- * is a number.
- *
- * @param val {Number} Y axis min value
- * @returns {Number} Y axis min value
- */
- validateUserDefinedYMin(val) {
- if (!_.isNumber(val)) {
- throw new Error('validateUserDefinedYMin expects a number');
- }
- return val;
- }
-
- /**
- * Helper function for getNames
- * Returns an array of objects with a name (key) value and an index value.
- * The index value allows us to sort the names in the correct nested order.
- *
- * @method returnNames
- * @param array {Array} Array of data objects
- * @param index {Number} Number of times the object is nested
- * @param columns {Object} Contains name formatter information
- * @returns {Array} Array of labels (strings)
- */
- returnNames(array, index, columns) {
- const names = [];
- const self = this;
-
- _.forEach(array, function (obj) {
- names.push({
- label: obj.name,
- values: obj,
- index: index
- });
-
- if (obj.children) {
- const plusIndex = index + 1;
-
- _.forEach(self.returnNames(obj.children, plusIndex, columns), function (namedObj) {
- names.push(namedObj);
+ getNames(slices) {
+ return slices
+ .reduce((slices, slice) => {
+ if (slice.children && slice.children.length) {
+ slices = slices.concat(this.getNames(slice.children));
+ }
+ slices.push({
+ label: slice.label
});
- }
- });
-
- return names;
- }
-
- /**
- * Flattens hierarchical data into an array of objects with a name and index value.
- * The indexed value determines the order of nesting in the data.
- * Returns an array with names sorted by the index value.
- *
- * @method getNames
- * @param data {Object} Chart data object
- * @param columns {Object} Contains formatter information
- * @returns {Array} Array of names (strings)
- */
- getNames(data, columns) {
- const slices = data.slices;
-
- if (slices.children) {
- const namedObj = this.returnNames(slices.children, 0, columns);
-
- return _(namedObj)
- .sortBy(function (obj) {
- return obj.index;
- })
- .unique(function (d) {
- return d.label;
- })
- .value();
- }
+ return slices;
+ }, []);
}
/**
@@ -330,20 +164,19 @@ export function VislibLibDataProvider(Private) {
* @param slices
* @returns {*}
*/
- _removeZeroSlices(slices) {
+ _removeZeroSlices(data) {
const self = this;
- if (!slices.children) return slices;
+ if (!data.children || !data.children.length) return data;
- slices = _.clone(slices);
- slices.children = slices.children.reduce(function (children, child) {
- if (child.size !== 0) {
+ data.children = data.children.reduce(function (children, child) {
+ if (child.values[0].value !== 0) {
children.push(self._removeZeroSlices(child));
}
return children;
}, []);
- return slices;
+ return data;
}
/**
@@ -358,10 +191,9 @@ export function VislibLibDataProvider(Private) {
const names = [];
_.forEach(data, function (obj) {
- const columns = obj.raw ? obj.raw.columns : undefined;
- obj.slices = self._removeZeroSlices(obj.slices);
+ obj = self._removeZeroSlices(obj);
- _.forEach(self.getNames(obj, columns), function (name) {
+ _.forEach(self.getNames(obj.children), function (name) {
names.push(name);
});
});
@@ -386,19 +218,26 @@ export function VislibLibDataProvider(Private) {
* @returns {Array} Array of x axis values
*/
xValues(orderBucketsBySum = false) {
- return orderKeys(this.data, orderBucketsBySum);
- }
-
- /**
- * Return an array of unique labels
- * Curently, only used for vertical bar and line charts,
- * or any data object with series values
- *
- * @method getLabels
- * @returns {Array} Array of labels (strings)
- */
- getLabels() {
- return getLabels(this.data);
+ const buckets = [];
+ this.chartData().forEach(chart => {
+ _.each(chart.series, series => {
+ series.values.forEach(value => {
+ const bucket = buckets.find(bucket => bucket.label === value.x);
+ if (bucket) {
+ bucket.value += value.y;
+ } else {
+ buckets.push({
+ label: value.x,
+ value: value.y
+ });
+ }
+ });
+ });
+ });
+ if (orderBucketsBySum) {
+ return _.sortByOrder(buckets, 'value', 'desc').map(bucket => bucket.label);
+ }
+ return buckets.map(bucket => bucket.label);
}
/**
@@ -424,7 +263,7 @@ export function VislibLibDataProvider(Private) {
* @returns {Function} Performs lookup on string and returns hex color
*/
getPieColorFunc() {
- return color(this.pieNames(this.getVisData()).map(function (d) {
+ return color(this.pieNames(this.chartData()).map(function (d) {
return d.label;
}), this.uiState.get('vis.colors'));
}
@@ -436,7 +275,7 @@ export function VislibLibDataProvider(Private) {
* @return {undefined}
*/
_normalizeOrdered() {
- const data = this.getVisData();
+ const data = this.chartData();
const self = this;
data.forEach(function (d) {
@@ -447,29 +286,12 @@ export function VislibLibDataProvider(Private) {
if (missingMax || missingMin) {
const extent = d3.extent(self.xValues());
- if (missingMin) d.ordered.min = extent[0];
- if (missingMax) d.ordered.max = extent[1];
+ if (missingMin) d.ordered.min = parseInt(extent[0]);
+ if (missingMax) d.ordered.max = parseInt(extent[1]);
}
});
}
- /**
- * Calculates min and max values for all map data
- * series.rows is an array of arrays
- * each row is an array of values
- * last value in row array is bucket count
- *
- * @method mapDataExtents
- * @param series {Array} Array of data objects
- * @returns {Array} min and max values
- */
- mapDataExtents(series) {
- const values = _.map(series.rows, function (row) {
- return row[row.length - 1];
- });
- return [_.min(values), _.max(values)];
- }
-
/**
* Get the maximum number of series, considering each chart
* individually.
diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index 74edb63fe54c4..470b9d7b9099d 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -30,52 +30,40 @@ export function VislibLibDispatchProvider(Private, config) {
* e: (d3.event|*), handler: (Object|*)}} Event response object
*/
eventResponse(d, i) {
- const datum = d._input || d;
- const data = d3.event.target.nearestViewportElement ?
- d3.event.target.nearestViewportElement.__data__ : d3.event.target.__data__;
- const label = d.label ? d.label : (d.series || 'Count');
- const isSeries = !!(data && data.series);
- const isSlices = !!(data && data.slices);
- const series = isSeries ? data.series : undefined;
- const slices = isSlices ? data.slices : undefined;
const handler = this.handler;
- const color = _.get(handler, 'data.color');
+
+ const chartData = d3.event.target.nearestViewportElement ?
+ d3.event.target.nearestViewportElement.__data__ : d3.event.target.__data__;
const eventData = {
- value: d.y,
- point: datum,
- datum: datum,
- label: label,
- color: color ? color(label) : undefined,
+ point: d3.event.target.__data__,
pointIndex: i,
- series: series,
- slices: slices,
- config: handler && handler.visConfig,
- data: data,
+ handler: handler,
+ chartData: chartData,
e: d3.event,
- handler: handler
+ label: 'Count',
+ color: _.get(handler, 'data.color')
};
- if (isSeries) {
- let percentageMode = false;
- //only series charts work in percentage mode.
- if (handler.charts && handler.charts[0] && handler.charts[0].getSeries && d3.event.target.parentElement.__data__) {
- const aggId = d3.event.target.parentElement.__data__.aggId;
- const seriesFromAggId = handler.charts[0].getSeries(aggId);
- if (seriesFromAggId && seriesFromAggId.getValueAxis) {
- percentageMode = seriesFromAggId.getValueAxis().axisConfig.isPercentage();
- }
- }
-
- const object = _.find(series, { 'label': label });
- if (object) {
- eventData.value = +object.values[i].y;
-
- if (percentageMode) {
- // Add the formatted percentage to the point object
- eventData.percent = (100 * d.y).toFixed(1) + '%';
+ switch (handler.data.type) {
+ case 'series':
+ let element = d3.event.target.parentNode;
+ while (true) {
+ if (!element.__data__) throw('vislib dispatch: series data was not found');
+ if (element.__data__.label) break;
+ element = element.parentNode;
}
- }
+ eventData.seriesData = element.__data__;
+ eventData.aggs = eventData.seriesData.aggs;
+ eventData.label = eventData.seriesData.label;
+ break;
+ case 'slices':
+ eventData.point = _.cloneDeep(d);
+ eventData.aggs = eventData.point.values[0].aggs || eventData.point.aggs;
+ delete eventData.point.values;
+ break;
+ default:
+ throw('vislib dispatch: unknown data type');
}
return eventData;
diff --git a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
index 014582b2ee135..dd6e652ca5741 100644
--- a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
@@ -41,7 +41,7 @@ export function VislibLibLayoutSplitsPieChartChartSplitProvider() {
return divClass;
});
- if (!data.slices) {
+ if (!data.children) {
charts.call(split);
}
});
diff --git a/src/ui/public/vislib/lib/types/point_series.js b/src/ui/public/vislib/lib/types/point_series.js
index be3cf56c7f246..4df6f989efb9f 100644
--- a/src/ui/public/vislib/lib/types/point_series.js
+++ b/src/ui/public/vislib/lib/types/point_series.js
@@ -120,7 +120,7 @@ export function VislibTypesPointSeries() {
id: 'CategoryAxis-1',
type: 'category',
labels: {
- axisFormatter: data.data.xAxisFormatter || data.get('xAxisFormatter')
+ axisFormatter: data.get('xAxisFormatter')
},
scale: {
expandLastBucket: opts.expandLastBucket
diff --git a/src/ui/public/vislib/visualizations/gauges/meter.js b/src/ui/public/vislib/visualizations/gauges/meter.js
index 94a87eb27e8b9..50b91cce0854d 100644
--- a/src/ui/public/vislib/visualizations/gauges/meter.js
+++ b/src/ui/public/vislib/visualizations/gauges/meter.js
@@ -155,13 +155,11 @@ export function MeterGaugeProvider() {
const angleFactor = this.gaugeConfig.gaugeType === 'Meter' ? 0.75 : 1;
const maxRadius = (Math.min(width, height / angleFactor) / 2) * marginFactor;
- const extendRange = this.gaugeConfig.extendRange;
- const maxY = _.max(data.values, 'y').y;
const min = this.gaugeConfig.colorsRange[0].from;
const max = _.last(this.gaugeConfig.colorsRange).to;
const angle = d3.scale.linear()
.range([minAngle, maxAngle])
- .domain([min, extendRange && max < maxY ? maxY : max]);
+ .domain([min, max]);
const radius = d3.scale.linear()
.range([0, maxRadius])
.domain([this.gaugeConfig.innerSpace + 1, 0]);
@@ -197,12 +195,12 @@ export function MeterGaugeProvider() {
.data([data])
.enter()
.append('g')
- .attr('data-label', (d) => this.getLabel(d.values[0].y));
+ .attr('data-label', (d) => this.getLabel(_.last(d.values).y));
const gauges = gaugeHolders
.selectAll('g')
- .data(d => d.values)
+ .data(d => [ _.last(d.values) ])
.enter();
@@ -262,10 +260,7 @@ export function MeterGaugeProvider() {
const percentage = Math.round(100 * (d.y - min) / (max - min));
return `${percentage}%`;
}
- if (d.aggConfig) {
- return d.aggConfig.fieldFormatter('text')(d.y);
- }
- return d.y;
+ return data.formatter ? data.formatter(d.y) : d.y;
})
.attr('style', 'dominant-baseline: central;')
.style('text-anchor', 'middle')
diff --git a/src/ui/public/vislib/visualizations/gauges/simple.js b/src/ui/public/vislib/visualizations/gauges/simple.js
index 3116aa752b484..c40c56a7e96fd 100644
--- a/src/ui/public/vislib/visualizations/gauges/simple.js
+++ b/src/ui/public/vislib/visualizations/gauges/simple.js
@@ -116,12 +116,12 @@ export function SimpleGaugeProvider() {
.data([data])
.enter()
.append('g')
- .attr('data-label', (d) => this.getLabel(d.values[0].y));
+ .attr('data-label', (d) => this.getLabel(_.last(d.values).y));
const gauges = gaugeHolders
.selectAll('g')
- .data(d => d.values)
+ .data(d => { return [ _.last(d.values) ]; })
.enter();
@@ -178,16 +178,13 @@ export function SimpleGaugeProvider() {
const percentage = Math.round(100 * (d.y - min) / (max - min));
return `${percentage}%`;
}
- if (d.aggConfig) {
- return d.aggConfig.fieldFormatter('text')(d.y);
- }
- return d.y;
+ return data.formatter ? data.formatter(d.y) : d.y;
})
.attr('style', 'dominant-baseline: central; font-weight: bold; white-space: nowrap;text-overflow: ellipsis;overflow: hidden;')
.style('text-anchor', 'middle')
.style('font-size', fontSize + 'pt')
.style('fill', function () {
- return !bgColor && labelColor ? self.getColorBucket(data.values[0].y) : bgFill;
+ return !bgColor && labelColor ? self.getColorBucket(data.value) : bgFill;
});
if (isTooltip) {
diff --git a/src/ui/public/vislib/visualizations/pie_chart.js b/src/ui/public/vislib/visualizations/pie_chart.js
index 7bb27deaf167f..b2f1077b84909 100644
--- a/src/ui/public/vislib/visualizations/pie_chart.js
+++ b/src/ui/public/vislib/visualizations/pie_chart.js
@@ -28,7 +28,7 @@ export function VislibVisualizationsPieChartProvider(Private) {
constructor(handler, chartEl, chartData) {
super(handler, chartEl, chartData);
- const charts = this.handler.data.getVisData();
+ const charts = this.handler.data.chartData();
this._validatePieData(charts);
this._attr = _.defaults(handler.visConfig.get('chart', {}), defaults);
@@ -41,7 +41,7 @@ export function VislibVisualizationsPieChartProvider(Private) {
*/
_validatePieData(charts) {
const isAllZeros = charts.every(function (chart) {
- return chart.slices.children.length === 0;
+ return chart.children.length === 0;
});
if (isAllZeros) {
@@ -74,11 +74,11 @@ export function VislibVisualizationsPieChartProvider(Private) {
const parentPercent = parent.percentOfParent;
const sum = parent.sumOfChildren = Math.abs(children.reduce(function (sum, child) {
- return sum + Math.abs(child.size);
+ return sum + Math.abs(child.values[0].value);
}, 0));
children.forEach(function (child) {
- child.percentOfGroup = Math.abs(child.size) / sum;
+ child.percentOfGroup = Math.abs(child.values[0].value) / sum;
child.percentOfParent = child.percentOfGroup;
if (parentPercent != null) {
@@ -154,13 +154,13 @@ export function VislibVisualizationsPieChartProvider(Private) {
}
return 'slice';
})
- .call(self._addIdentifier, 'name')
+ .call(self._addIdentifier, 'label')
.style('stroke', '#fff')
.style('fill', function (d) {
if (d.depth === 0) {
return 'none';
}
- return color(d.name);
+ return color(d.label);
});
if (isTooltip) {
@@ -190,14 +190,11 @@ export function VislibVisualizationsPieChartProvider(Private) {
return function (selection) {
selection.each(function (data) {
- const slices = data.slices;
const div = d3.select(this);
const width = $(this).width();
const height = $(this).height();
- if (!slices.children.length) return;
-
- self.convertToPercentage(slices);
+ self.convertToPercentage(data);
self._validateContainerSize(width, height);
const svg = div.append('svg')
@@ -206,7 +203,7 @@ export function VislibVisualizationsPieChartProvider(Private) {
.append('g')
.attr('transform', 'translate(' + width / 2 + ',' + height / 2 + ')');
- const path = self.addPath(width, height, svg, slices);
+ const path = self.addPath(width, height, svg, data);
self.addPathEvents(path);
self.events.emit('rendered', {
diff --git a/src/ui/public/vislib/visualizations/point_series/area_chart.js b/src/ui/public/vislib/visualizations/point_series/area_chart.js
index cd7aeb4d581e0..178d1d4a761a5 100644
--- a/src/ui/public/vislib/visualizations/point_series/area_chart.js
+++ b/src/ui/public/vislib/visualizations/point_series/area_chart.js
@@ -69,6 +69,14 @@ export function VislibVisualizationsAreaChartProvider(Private) {
const yScale = this.getValueAxis().getScale();
const interpolate = this.seriesConfig.interpolate;
const isHorizontal = this.getCategoryAxis().axisConfig.isHorizontal();
+ const isPercentage = this.getValueAxis().axisConfig.isPercentage();
+
+ if (isPercentage && this.chartData.aggs) {
+ data.aggs[0].value = 'val';
+ data.values.forEach(value => {
+ value.val = Math.round(value.y * 100) + '%';
+ });
+ }
// Data layers
const layer = svg.append('g')
diff --git a/src/ui/public/vislib/visualizations/point_series/column_chart.js b/src/ui/public/vislib/visualizations/point_series/column_chart.js
index 46c307a99ce4e..27c79f1b99134 100644
--- a/src/ui/public/vislib/visualizations/point_series/column_chart.js
+++ b/src/ui/public/vislib/visualizations/point_series/column_chart.js
@@ -49,6 +49,7 @@ export function VislibVisualizationsColumnChartProvider(Private) {
const color = this.handler.data.getColorFunc();
const tooltip = this.baseChart.tooltip;
const isTooltip = this.handler.visConfig.get('tooltip.show');
+ const isPercentage = this.getValueAxis().axisConfig.isPercentage();
const layer = svg.append('g')
.attr('class', 'series histogram')
@@ -59,6 +60,13 @@ export function VislibVisualizationsColumnChartProvider(Private) {
return !_.isNull(d.y);
}));
+ if (isPercentage && this.chartData.aggs) {
+ data.aggs[0].value = 'val';
+ data.values.forEach(value => {
+ value.val = Math.round(value.y * 100) + '%';
+ });
+ }
+
bars
.exit()
.remove();
diff --git a/src/ui/public/vislib/visualizations/point_series/heatmap_chart.js b/src/ui/public/vislib/visualizations/point_series/heatmap_chart.js
index 81cb4cb739409..c5ef0af757a7e 100644
--- a/src/ui/public/vislib/visualizations/point_series/heatmap_chart.js
+++ b/src/ui/public/vislib/visualizations/point_series/heatmap_chart.js
@@ -114,6 +114,15 @@ export function VislibVisualizationsHeatmapChartProvider(Private) {
const zAxisConfig = this.getValueAxis().axisConfig;
const zAxisFormatter = zAxisConfig.get('labels.axisFormatter');
const showLabels = zAxisConfig.get('labels.show');
+ const percentageMode = this.handler.visConfig.get('percentageMode');
+
+ const [min, max] = zScale.domain();
+ if (percentageMode && this.chartData.aggs) {
+ this.chartData.aggs[0].value = 'val';
+ this.chartData.values.forEach(value => {
+ value.val = Math.round(100 * (value.y - min) / (max - min)) + '%';
+ });
+ }
const layer = svg.append('g')
.attr('class', 'series');
@@ -140,11 +149,10 @@ export function VislibVisualizationsHeatmapChartProvider(Private) {
return xScale(d.x);
}
- function y(d) {
- return yScale(d.series);
+ function y() {
+ return yScale(data.label);
}
- const [min, max] = zScale.domain();
function getColorBucket(d) {
let val = 0;
if (setColorRange && colorsRange.length) {
diff --git a/src/ui/public/vislib/visualizations/point_series/line_chart.js b/src/ui/public/vislib/visualizations/point_series/line_chart.js
index 4b9d8521c1039..9d7fb7d345be0 100644
--- a/src/ui/public/vislib/visualizations/point_series/line_chart.js
+++ b/src/ui/public/vislib/visualizations/point_series/line_chart.js
@@ -43,6 +43,14 @@ export function VislibVisualizationsLineChartProvider(Private) {
const isTooltip = this.handler.visConfig.get('tooltip.show');
const isHorizontal = this.getCategoryAxis().axisConfig.isHorizontal();
const lineWidth = this.seriesConfig.lineWidth;
+ const isPercentage = this.getValueAxis().axisConfig.isPercentage();
+
+ if (isPercentage && this.chartData.aggs) {
+ data.aggs[0].value = 'val';
+ data.values.forEach(value => {
+ value.val = Math.round(value.y * 100) + '%';
+ });
+ }
const radii = this.baseChart.radii;
@@ -77,18 +85,18 @@ export function VislibVisualizationsLineChartProvider(Private) {
return yScale(y0 + y);
}
- function cColor(d) {
- return color(d.series);
+ function cColor() {
+ return color(data.label);
}
- function colorCircle(d) {
+ function colorCircle() {
const parent = d3.select(this).node().parentNode;
const lengthOfParent = d3.select(parent).data()[0].length;
const isVisible = (lengthOfParent === 1);
// If only 1 point exists, show circle
if (!showCircles && !isVisible) return 'none';
- return cColor(d);
+ return cColor();
}
function getCircleRadiusFn(modifier) {
diff --git a/src/ui/public/vislib/visualizations/time_marker.js b/src/ui/public/vislib/visualizations/time_marker.js
index 06845d69b2c1f..b257dc2a5083c 100644
--- a/src/ui/public/vislib/visualizations/time_marker.js
+++ b/src/ui/public/vislib/visualizations/time_marker.js
@@ -27,7 +27,7 @@ export function VislibVisualizationsTimeMarkerProvider() {
}
_isTimeBasedChart(selection) {
- const data = selection.data();
+ const data = selection.data()[0].charts;
return data.every(function (datum) {
return (datum.ordered && datum.ordered.date);
});
diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js
index a3211ceef8ec2..818ebd1a221d5 100644
--- a/src/ui/public/visualize/visualize_legend.js
+++ b/src/ui/public/visualize/visualize_legend.js
@@ -134,7 +134,7 @@ uiModules.get('kibana')
// Most of these functions were moved directly from the old Legend class. Not a fan of this.
function getLabels(data, type) {
if (!data) return [];
- data = data.columns || data.rows || [data];
+ data = data.charts;
if (type === 'pie') return Data.prototype.pieNames(data);
return getSeriesLabels(data);
}
diff --git a/src/ui/ui_exports.js b/src/ui/ui_exports.js
index ba8c57f8479d2..60f172e620c7a 100644
--- a/src/ui/ui_exports.js
+++ b/src/ui/ui_exports.js
@@ -16,7 +16,9 @@ export default class UiExports {
],
visResponseHandlers: [
'ui/vis/response_handlers/basic',
- 'ui/vis/response_handlers/none'
+ 'ui/vis/response_handlers/none',
+ 'ui/vis/response_handlers/series_data',
+ 'ui/vis/response_handlers/hierarchical_data',
],
visEditorTypes: [
'ui/vis/editors/default/default',