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

Fixing the raw data to do sensible things.

Browse source
This commit is contained in:
Chris Cowan 2014-10-16 13:21:06 -07:00
parent 6778d813a8
commit 519089a541
2 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/kibana/components/visualize/_create_raw_data.js
View file

@ -10,8 +10,15 @@ define(function (require) {
var metrics = vis.aggs.bySchemaGroup.metrics;
var buckets = vis.aggs.bySchemaGroup.buckets;
var aggs = [];
if (buckets) aggs.push(buckets);
if (metrics) aggs.push(metrics);
if (buckets) {
_.each(buckets, function (bucket) {
aggs.push(bucket);
aggs.push(metrics);
});
} else {
aggs.push(metrics);
}
// Create the columns
results.columns = _(aggs).flatten().map(function (agg) {
@ -52,6 +59,10 @@ define(function (require) {
_.each(extractBuckets(data[agg.id]), function (bucket) {
var _record = _.flatten([record, bucket.key]);
_.each(metrics, function (metric) {
var value = bucket[metric.id] && bucket[metric.id].value || bucket.doc_count;
_record.push(value);
});
// If there is another agg to call we need to check to see if it has
// buckets. If it does then we need to keep on walking the tree.
@ -62,13 +73,8 @@ define(function (require) {
walkBuckets(agg._next, bucket, _record);
}
}
// if there are no more aggs to walk then we need to write each metric
// to the record and push the record to the rows.
// if there are no more aggs to walk then push the record to the rows.
else {
_.each(metrics, function (metric) {
var value = bucket[metric.id] && bucket[metric.id].value || bucket.doc_count;
_record.push(value);
});
results.rows.push(_record);
}
});

32
test/unit/specs/visualize/_create_raw_data.js
View file

@ -39,7 +39,7 @@ define(function (require) {
it('should have columns set', function () {
expect(results).to.have.property('columns');
expect(results.columns).to.have.length(4);
expect(results.columns).to.have.length(6);
_.each(results.columns, function (column) {
expect(column).to.have.property('aggConfig');
var agg = column.aggConfig;
@ -49,23 +49,29 @@ define(function (require) {
expect(column).to.have.property('field', agg.params.field);
expect(column).to.have.property('label', agg.type.makeLabel(agg));
});
expect(results.columns[0].aggConfig.id).to.be('agg_2');
expect(results.columns[1].aggConfig.id).to.be('agg_1');
expect(results.columns[2].aggConfig.id).to.be('agg_3');
expect(results.columns[3].aggConfig.id).to.be('agg_1');
expect(results.columns[4].aggConfig.id).to.be('agg_4');
expect(results.columns[5].aggConfig.id).to.be('agg_1');
});
it('should have rows set', function () {
expect(results).to.have.property('rows');
expect(results.rows).to.eql([
['png', 'IT', 'win', 4992],
['png', 'IT', 'mac', 5892],
['png', 'US', 'linux', 3992],
['png', 'US', 'mac', 3029],
['css', 'MX', 'win', 4992],
['css', 'MX', 'mac', 5892],
['css', 'US', 'linux', 3992],
['css', 'US', 'mac', 3029],
['html', 'CN', 'win', 4992],
['html', 'CN', 'mac', 5892],
['html', 'FR', 'win', 3992],
['html', 'FR', 'mac', 3029]
['png', 412032, 'IT', 9299, 'win', 4992],
['png', 412032, 'IT', 9299, 'mac', 5892],
['png', 412032, 'US', 8293, 'linux', 3992],
['png', 412032, 'US', 8293, 'mac', 3029],
['css', 412032, 'MX', 9299, 'win', 4992],
['css', 412032, 'MX', 9299, 'mac', 5892],
['css', 412032, 'US', 8293, 'linux', 3992],
['css', 412032, 'US', 8293, 'mac', 3029],
['html', 412032, 'CN', 9299, 'win', 4992],
['html', 412032, 'CN', 9299, 'mac', 5892],
['html', 412032, 'FR', 8293, 'win', 3992],
['html', 412032, 'FR', 8293, 'mac', 3029]
]);
});