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

Transformers: Removed display name from reduced fields (#27141)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-08-23 20:46:49 +02:00 committed by GitHub
parent c207ea12a4
commit c80da5f2f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
packages/grafana-data/src/transformations/transformers/reduce.test.ts
View File

@ -62,28 +62,28 @@ describe('Reducer Transformer', () => {
config: {},
},
{
name: 'first',
name: 'First',
type: FieldType.number,
values: new ArrayVector([3, 10000.3, 1, 11000.1]),
config: { displayName: 'First' },
config: {},
},
{
name: 'min',
name: 'Min',
type: FieldType.number,
values: new ArrayVector([3, 10000.3, 1, 11000.1]),
config: { displayName: 'Min' },
config: {},
},
{
name: 'max',
name: 'Max',
type: FieldType.number,
values: new ArrayVector([6, 10000.6, 7, 11000.7]),
config: { displayName: 'Max' },
config: {},
},
{
name: 'last',
name: 'Last',
type: FieldType.number,
values: new ArrayVector([6, 10000.6, 7, 11000.7]),
config: { displayName: 'Last' },
config: {},
},
];
@ -108,28 +108,28 @@ describe('Reducer Transformer', () => {
config: {},
},
{
name: 'first',
name: 'First',
type: FieldType.number,
values: new ArrayVector([3, 1]),
config: { displayName: 'First' },
config: {},
},
{
name: 'min',
name: 'Min',
type: FieldType.number,
values: new ArrayVector([3, 1]),
config: { displayName: 'Min' },
config: {},
},
{
name: 'max',
name: 'Max',
type: FieldType.number,
values: new ArrayVector([6, 7]),
config: { displayName: 'Max' },
config: {},
},
{
name: 'last',
name: 'Last',
type: FieldType.number,
values: new ArrayVector([6, 7]),
config: { displayName: 'Last' },
config: {},
},
];
@ -154,28 +154,28 @@ describe('Reducer Transformer', () => {
config: {},
},
{
name: 'first',
name: 'First',
type: FieldType.number,
values: new ArrayVector([3, 10000.3]),
config: { displayName: 'First' },
config: {},
},
{
name: 'min',
name: 'Min',
type: FieldType.number,
values: new ArrayVector([3, 10000.3]),
config: { displayName: 'Min' },
config: {},
},
{
name: 'max',
name: 'Max',
type: FieldType.number,
values: new ArrayVector([6, 10000.6]),
config: { displayName: 'Max' },
config: {},
},
{
name: 'last',
name: 'Last',
type: FieldType.number,
values: new ArrayVector([6, 10000.6]),
config: { displayName: 'Last' },
config: {},
},
];
@ -200,28 +200,28 @@ describe('Reducer Transformer', () => {
config: {},
},
{
name: 'first',
name: 'First',
type: FieldType.number,
values: new ArrayVector([3]),
config: { displayName: 'First' },
config: {},
},
{
name: 'min',
name: 'Min',
type: FieldType.number,
values: new ArrayVector([3]),
config: { displayName: 'Min' },
config: {},
},
{
name: 'max',
name: 'Max',
type: FieldType.number,
values: new ArrayVector([6]),
config: { displayName: 'Max' },
config: {},
},
{
name: 'last',
name: 'Last',
type: FieldType.number,
values: new ArrayVector([6]),
config: { displayName: 'Last' },
config: {},
},
];

7
packages/grafana-data/src/transformations/transformers/reduce.ts
View File

@ -56,13 +56,10 @@ export const reduceTransformer: DataTransformerInfo<ReduceTransformerOptions> =
values.push(vals);
fields.push({
name: info.id,
name: info.name,
type: FieldType.other, // UNKNOWN until after we call the functions
values: values[values.length - 1],
config: {
displayName: info.name,
// UNIT from original field?
},
config: {},
});
}