fixed a bug where multiple SLA queries not handled correctly (#1910)
* fixed a bug where multiple SLA queries not handled correctly * added test
This commit is contained in:
28
src/datasource/responseHandler.spec.ts
Normal file
28
src/datasource/responseHandler.spec.ts
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import { FieldType, MutableDataFrame, TIME_SERIES_TIME_FIELD_NAME } from '@grafana/data';
|
||||||
|
import { convertToWide } from './responseHandler';
|
||||||
|
|
||||||
|
describe('convertToWide', () => {
|
||||||
|
it('merge multiple SLI frames correctly', () => {
|
||||||
|
let frames = convertToWide([
|
||||||
|
new MutableDataFrame({
|
||||||
|
name: 'SLI',
|
||||||
|
fields: [
|
||||||
|
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1], type: FieldType.time },
|
||||||
|
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1.1], type: FieldType.number },
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
new MutableDataFrame({
|
||||||
|
name: 'SLI',
|
||||||
|
fields: [
|
||||||
|
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1], type: FieldType.time },
|
||||||
|
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1.2], type: FieldType.number },
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
expect(frames.length).toStrictEqual(1);
|
||||||
|
expect(frames[0].fields.length).toStrictEqual(3);
|
||||||
|
expect(frames[0].fields[0].values.at(0)).toStrictEqual(1);
|
||||||
|
expect(frames[0].fields[1].values.at(0)).toStrictEqual(1.1);
|
||||||
|
expect(frames[0].fields[2].values.at(0)).toStrictEqual(1.2);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -377,7 +377,10 @@ export function convertToWide(data: MutableDataFrame[]): DataFrame[] {
|
|||||||
const fields: MutableField[] = [timeField];
|
const fields: MutableField[] = [timeField];
|
||||||
|
|
||||||
for (let i = 0; i < data.length; i++) {
|
for (let i = 0; i < data.length; i++) {
|
||||||
const valueField = data[i].fields.find((f) => f.name === TIME_SERIES_VALUE_FIELD_NAME);
|
let valueField = data[i].fields.find((f) => f.name === TIME_SERIES_VALUE_FIELD_NAME);
|
||||||
|
if (data[i].name === 'SLI') {
|
||||||
|
valueField = data[i].fields.find((f) => f.type === FieldType.number);
|
||||||
|
}
|
||||||
if (!valueField) {
|
if (!valueField) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user