github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix sending of ordered key to vislib

Browse source
This commit is contained in:
Rashid Khan 2014-08-21 16:43:10 -07:00
parent 1a5b1ff967
commit fe04820efa
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kibana/components/agg_types/_agg_type.js
View file

@ -7,6 +7,7 @@ define(function (require) {
this.name = config.name;
this.title = config.title;
this.makeLabel = config.makeLabel || _.constant(this.name);
this.ordered = config.ordered;
var params = this.params = config.params || [];

6
src/kibana/components/vis_types/converters/histogram.js
View file

@ -61,14 +61,14 @@ define(function (require) {
date: true,
min: timeBounds.min.valueOf(),
max: timeBounds.max.valueOf(),
interval: interval.toMs(colX.aggParams.interval)
interval: interval.toMs(colX.params.interval)
};
}
else {
chart.xAxisFormatter = colX.field && colX.field.format.convert;
chart.ordered = aggX && aggX.ordered && {};
if (aggX !== false && colX && colX.aggParams && colX.aggParams.interval) {
chart.ordered.interval = colX.aggParams.interval;
if (aggX !== false && colX && colX.params && colX.params.interval) {
chart.ordered.interval = colX.params.interval;
}
}

16
src/kibana/components/visualize/_build_chart_data.js
View file

@ -18,18 +18,24 @@ define(function (require) {
// the list of "configs" that we will use to read the response
var configs = vis.aggs.getSorted().map(function (aggConfig) {
return _.assign(
aggConfig.type.params.write(aggConfig),
aggConfig.schema.params.write(aggConfig),
var aggParams = aggConfig.schema.params.write(aggConfig);
var chartDataConfig = _.assign(
{
categoryName: aggConfig.schema.name,
id: aggConfig.id,
aggConfig: aggConfig,
aggType: aggConfig.type,
field: aggConfig.params.field,
label: aggConfig.type.title
}
label: aggConfig.type.title,
},
_.merge(
aggConfig.schema.params.write(aggConfig),
aggConfig.type.params.write(aggConfig)
)
);
return chartDataConfig;
});
var lastConfig = configs[configs.length - 1];