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

Combine responses: do not combine frames with different names (#90464)

Browse Source
This commit is contained in:
Matias Chomicki 2024-07-16 15:34:08 +02:00 committed by GitHub
parent 1ee9df8ac6
commit 8547148623
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/grafana-o11y-ds-frontend/src/combineResponses.test.ts
View File

@ -495,6 +495,36 @@ describe('combineResponses', () => {
expect(combineResponses(responseA, responseB).data[0].meta.stats).toHaveLength(0);
});
});
it('does not combine frames with different refId', () => {
const { metricFrameA, metricFrameB } = getMockFrames();
metricFrameA.refId = 'A';
metricFrameB.refId = 'B';
const responseA: DataQueryResponse = {
data: [metricFrameA],
};
const responseB: DataQueryResponse = {
data: [metricFrameB],
};
expect(combineResponses(responseA, responseB)).toEqual({
data: [metricFrameA, metricFrameB],
});
});
it('does not combine frames with different refId', () => {
const { metricFrameA, metricFrameB } = getMockFrames();
metricFrameA.name = 'A';
metricFrameB.name = 'B';
const responseA: DataQueryResponse = {
data: [metricFrameA],
};
const responseB: DataQueryResponse = {
data: [metricFrameB],
};
expect(combineResponses(responseA, responseB)).toEqual({
data: [metricFrameA, metricFrameB],
});
});
});
describe('combinePanelData', () => {

2
packages/grafana-o11y-ds-frontend/src/combineResponses.ts
View File

@ -130,7 +130,7 @@ function cloneDataFrame(frame: DataQueryResponseData): DataQueryResponseData {
}
function shouldCombine(frame1: DataFrame, frame2: DataFrame): boolean {
if (frame1.refId !== frame2.refId) {
if (frame1.refId !== frame2.refId || frame1.name !== frame2.name) {
return false;
}