IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(table): fixes broken annotation rendering

Browse Source 
closes #7268
This commit is contained in:
bergquist 2017-01-17 12:17:18 +01:00
parent 2dd1eb81cd
commit 55af92eba1
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/plugins/panel/table/specs/transformers_specs.ts
View File

@ -153,14 +153,16 @@ describe('when transforming time series table', () => {
describe('Annnotations', () => {
var panel = {transform: 'annotations'};
var rawData = [
{
min: 1000,
text: 'hej',
tags: ['tags', 'asd'],
title: 'title',
}
];
var rawData = {
annotations: [
{
min: 1000,
text: 'hej',
tags: ['tags', 'asd'],
title: 'title',
}
]
};
beforeEach(() => {
table = transformDataToTable(rawData, panel);

6
public/app/plugins/panel/table/transformers.ts
View File

@ -125,12 +125,12 @@ transformers['annotations'] = {
model.columns.push({text: 'Text'});
model.columns.push({text: 'Tags'});
if (!data || data.length === 0) {
if (!data || !data.annotations || data.annotations.length === 0) {
return;
}
for (var i = 0; i < data.length; i++) {
var evt = data[i];
for (var i = 0; i < data.annotations.length; i++) {
var evt = data.annotations[i];
model.rows.push([evt.min, evt.title, evt.text, evt.tags]);
}
}