IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-24 15:27:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Annotations: check for null or undefined fields before conversion (#27712)

Browse Source
This commit is contained in:
Ryan McKinley 2020-09-22 10:45:26 -07:00 committed by GitHub
parent f6c91d1318
commit d46f33c34c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/features/annotations/standardAnnotationSupport.test.ts
View File

@ -5,9 +5,9 @@ describe('DataFrame to annotations', () => {
test('simple conversion', () => { test('simple conversion', () => {
const frame = toDataFrame({ const frame = toDataFrame({
fields: [ fields: [
{ type: FieldType.time, values: [1, 2, 3] }, { type: FieldType.time, values: [1, 2, 3, 4, 5] },
{ name: 'first string field', values: ['t1', 't2', 't3'] }, { name: 'first string field', values: ['t1', 't2', 't3', null, undefined] },
{ name: 'tags', values: ['aaa,bbb', 'bbb,ccc', 'zyz'] }, { name: 'tags', values: ['aaa,bbb', 'bbb,ccc', 'zyz', null, undefined] },
], ],
}); });
@ -37,6 +37,12 @@ describe('DataFrame to annotations', () => {
"text": "t3", "text": "t3",
"time": 3, "time": 3,
}, },
Object {
"time": 4,
},
Object {
"time": 5,
},
] ]
`); `);
}); });

4
public/app/features/annotations/standardAnnotationSupport.ts
View File

@ -175,8 +175,8 @@ export function getAnnotationsFromData(data: DataFrame[], options?: AnnotationEv
} }
} }
if (v !== undefined) { if (!(v === null || v === undefined)) {
if (f.split) { if (v && f.split) {
v = (v as string).split(','); v = (v as string).split(',');
} }
(anno as any)[f.key] = v; (anno as any)[f.key] = v;