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

DataFrame: guess number field when on NaN (#19833)

Browse Source
This commit is contained in:
Kyle Brandt 2019-10-16 09:13:27 -04:00 committed by Ryan McKinley
parent 4d214f5aea
commit 1ffcb002db
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/grafana-data/src/dataframe/processDataFrame.test.ts
View File

@ -81,6 +81,7 @@ describe('toDataFrame', () => {
it('Guess Colum Types from strings', () => {
expect(guessFieldTypeFromValue('1')).toBe(FieldType.number);
expect(guessFieldTypeFromValue('1.234')).toBe(FieldType.number);
expect(guessFieldTypeFromValue('NaN')).toBe(FieldType.number);
expect(guessFieldTypeFromValue('3.125e7')).toBe(FieldType.number);
expect(guessFieldTypeFromValue('True')).toBe(FieldType.boolean);
expect(guessFieldTypeFromValue('FALSE')).toBe(FieldType.boolean);
@ -95,6 +96,7 @@ describe('toDataFrame', () => {
{ name: 'B (strings)', values: [null, 'Hello'] },
{ name: 'C (nulls)', values: [null, null] },
{ name: 'Time', values: ['2000', 1967] },
{ name: 'D (number strings)', values: ['NaN', null, 1] },
],
});
const norm = guessFieldTypes(series);
@ -102,6 +104,7 @@ describe('toDataFrame', () => {
expect(norm.fields[1].type).toBe(FieldType.string);
expect(norm.fields[2].type).toBe(FieldType.other);
expect(norm.fields[3].type).toBe(FieldType.time); // based on name
expect(norm.fields[4].type).toBe(FieldType.number);
});
it('converts JSON document data to series', () => {

2
packages/grafana-data/src/dataframe/processDataFrame.ts
View File

@ -156,7 +156,7 @@ function convertJSONDocumentDataToDataFrame(timeSeries: TimeSeries): DataFrame {
// PapaParse Dynamic Typing regex:
// https://github.com/mholt/PapaParse/blob/master/papaparse.js#L998
const NUMBER = /^\s*-?(\d*\.?\d+|\d+\.?\d*)(e[-+]?\d+)?\s*$/i;
const NUMBER = /^\s*(-?(\d*\.?\d+|\d+\.?\d*)(e[-+]?\d+)?|NAN)\s*$/i;
/**
* Given a value this will guess the best column type