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

Transformations: make sure that we copy all the values from a field when using MutableDataFrame. (#27446)

Browse Source
This commit is contained in:
Marcus Andersson 2020-09-08 14:01:42 +02:00 committed by GitHub
parent 7762839853
commit 02d19f0380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,11 +110,11 @@ export class MutableDataFrame<T = any> extends FunctionalVector<T> implements Da
} }
const field: MutableField = { const field: MutableField = {
...f,
name, name,
type, type,
config: f.config || {}, config: f.config || {},
values: this.creator(buffer), values: this.creator(buffer),
labels: f.labels,
}; };
if (type === FieldType.other) { if (type === FieldType.other) {

40
packages/grafana-data/src/transformations/transformers/merge.test.ts
View File

@ -1,5 +1,5 @@
import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry'; import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
import { DataTransformerConfig, Field, FieldType } from '../../types'; import { DataTransformerConfig, Field, FieldType, DisplayProcessor } from '../../types';
import { DataTransformerID } from './ids'; import { DataTransformerID } from './ids';
import { toDataFrame } from '../../dataframe'; import { toDataFrame } from '../../dataframe';
import { transformDataFrame } from '../transformDataFrame'; import { transformDataFrame } from '../transformDataFrame';
@ -356,6 +356,37 @@ describe('Merge multipe to single', () => {
expect(fields).toEqual(expected); expect(fields).toEqual(expected);
}); });
it('combine two time series, where first serie fields has display processor, into one', () => {
const displayProcessor: DisplayProcessor = jest.fn();
const serieA = toDataFrame({
name: 'A',
fields: [
{ name: 'Time', type: FieldType.time, values: [100, 150, 200], display: displayProcessor },
{ name: 'Temp', type: FieldType.number, values: [1, 4, 5] },
],
});
const serieB = toDataFrame({
name: 'B',
fields: [
{ name: 'Time', type: FieldType.time, values: [100, 125, 126] },
{ name: 'Temp', type: FieldType.number, values: [-1, 2, 3] },
],
});
const result = transformDataFrame([cfg], [serieA, serieB]);
const expected: Field[] = [
createField('Time', FieldType.time, [100, 150, 200, 100, 125, 126], {}, displayProcessor),
createField('Temp', FieldType.number, [1, 4, 5, -1, 2, 3]),
];
const fields = unwrap(result[0].fields);
expect(fields[0].display).toBe(displayProcessor);
expect(fields).toEqual(expected);
});
it('combine two time series, where first serie fields has units, into one', () => { it('combine two time series, where first serie fields has units, into one', () => {
const serieA = toDataFrame({ const serieA = toDataFrame({
name: 'A', name: 'A',
@ -500,8 +531,8 @@ describe('Merge multipe to single', () => {
}); });
}); });
const createField = (name: string, type: FieldType, values: any[], config = {}): Field => { const createField = (name: string, type: FieldType, values: any[], config = {}, display?: DisplayProcessor): Field => {
return { name, type, values: new ArrayVector(values), config, labels: undefined }; return { name, type, values: new ArrayVector(values), config, labels: undefined, display };
}; };
const unwrap = (fields: Field[]): Field[] => { const unwrap = (fields: Field[]): Field[] => {
@ -510,7 +541,8 @@ const unwrap = (fields: Field[]): Field[] => {
field.name, field.name,
field.type, field.type,
field.values.toArray().map((value: any) => value), field.values.toArray().map((value: any) => value),
field.config field.config,
field.display
) )
); );
}; };