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

Explore/Table: Keep existing field types if possible (#24944)

Browse Source 
* Explore/Table: Keep existing field types if possible
This commit is contained in:
kay delaney 2020-05-25 15:54:24 +01:00 committed by GitHub
parent 83d933d010
commit f5a9b23d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,12 +26,12 @@ import { getFieldDisplayName } from '../field/fieldState';
function convertTableToDataFrame(table: TableData): DataFrame {
const fields = table.columns.map(c => {
const { text, ...disp } = c;
const { text, type, ...disp } = c as any;
return {
name: text, // rename 'text' to the 'name' field
config: (disp || {}) as FieldConfig,
values: new ArrayVector(),
type: FieldType.other,
type: type && Object.values(FieldType).includes(type as FieldType) ? (type as FieldType) : FieldType.other,
};
});
@ -46,9 +46,11 @@ function convertTableToDataFrame(table: TableData): DataFrame {
}
for (const f of fields) {
const t = guessFieldTypeForField(f);
if (t) {
f.type = t;
if (f.type === FieldType.other) {
const t = guessFieldTypeForField(f);
if (t) {
f.type = t;
}
}
}