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

TimeSeries: more thorough detection of negative values for stacking dir (#57863)

Browse Source
This commit is contained in:
Leon Sorokin 2022-11-03 08:24:01 -05:00 committed by GitHub
parent 372ba83534
commit 4d88e2b542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/src/components/uPlot/utils.test.ts
View File

@ -1061,7 +1061,7 @@ describe('auto stacking groups', () => {
}, },
{ {
name: 'd', name: 'd',
values: [-0, -10, -20], values: [null, -0, null],
config: { custom: { stacking: { mode: StackingMode.Normal } } }, config: { custom: { stacking: { mode: StackingMode.Normal } } },
}, },
], ],

48
packages/grafana-ui/src/components/uPlot/utils.ts
View File

@ -116,8 +116,7 @@ export function getStackingGroups(frame: DataFrame) {
// will this be stacked up or down after any transforms applied // will this be stacked up or down after any transforms applied
let vals = values.toArray(); let vals = values.toArray();
let transform = custom.transform; let transform = custom.transform;
let firstValue = vals.find((v) => v != null); let stackDir = getStackDirection(transform, vals);
let stackDir = getStackDirection(transform, firstValue);
let drawStyle = custom.drawStyle as GraphDrawStyle; let drawStyle = custom.drawStyle as GraphDrawStyle;
let drawStyle2 = let drawStyle2 =
@ -341,13 +340,48 @@ export function findMidPointYPosition(u: uPlot, idx: number) {
return y; return y;
} }
function getStackDirection(transform: GraphTransform, firstValue: number) { function getStackDirection(transform: GraphTransform, data: unknown[]) {
// Check if first value is negative zero. This can happen with a binary operation transform. const hasNegSamp = hasNegSample(data);
const isNegativeZero = Object.is(firstValue, -0);
if (transform === GraphTransform.NegativeY) { if (transform === GraphTransform.NegativeY) {
return !isNegativeZero && firstValue >= 0 ? StackDirection.Neg : StackDirection.Pos; return hasNegSamp ? StackDirection.Pos : StackDirection.Neg;
} }
return !isNegativeZero && firstValue >= 0 ? StackDirection.Pos : StackDirection.Neg; return hasNegSamp ? StackDirection.Neg : StackDirection.Pos;
}
// similar to isLikelyAscendingVector()
function hasNegSample(data: unknown[], samples = 50) {
const len = data.length;
if (len === 0) {
return false;
}
// skip leading & trailing nullish
let firstIdx = 0;
let lastIdx = len - 1;
while (firstIdx <= lastIdx && data[firstIdx] == null) {
firstIdx++;
}
while (lastIdx >= firstIdx && data[lastIdx] == null) {
lastIdx--;
}
if (lastIdx >= firstIdx) {
const stride = Math.max(1, Math.floor((lastIdx - firstIdx + 1) / samples));
for (let i = firstIdx; i <= lastIdx; i += stride) {
const v = data[i];
if (v != null && (v < 0 || Object.is(v, -0))) {
return true;
}
}
}
return false;
} }
// Dev helpers // Dev helpers