IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-28 03:34:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

TimeSeries: fix regression with hardMin + hardMax ranging (#53922)

Browse Source
This commit is contained in:
Leon Sorokin 2022-08-19 12:20:21 -05:00 committed by GitHub
parent c7b93ec331
commit d5cc1bfff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
View File

@ -72,6 +72,7 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
let hardMinOnly = softMin == null && hardMin != null;
let hardMaxOnly = softMax == null && hardMax != null;
let hasFixedRange = hardMinOnly && hardMaxOnly;
// uPlot range function
const rangeFn = (u: uPlot, dataMin: number | null, dataMax: number | null, scaleKey: string) => {
@ -80,14 +81,14 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
let minMax: uPlot.Range.MinMax = [dataMin, dataMax];
// happens when all series on a scale are `show: false`, re-returning nulls will auto-disable axis
if (dataMin == null || dataMax == null) {
if (!hasFixedRange && dataMin == null && dataMax == null) {
return minMax;
}
if (scale.distr === 1 || scale.distr === 2) {
if (centeredZero) {
let absMin = Math.abs(dataMin);
let absMax = Math.abs(dataMax);
let absMin = Math.abs(dataMin!);
let absMax = Math.abs(dataMax!);
let max = Math.max(absMin, absMax);
dataMin = -max;
dataMax = max;
@ -96,7 +97,7 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
// @ts-ignore here we may use hardMin / hardMax to make sure any extra padding is computed from a more accurate delta
minMax = uPlot.rangeNum(hardMinOnly ? hardMin : dataMin, hardMaxOnly ? hardMax : dataMax, rangeConfig);
} else if (scale.distr === 3) {
minMax = uPlot.rangeLog(dataMin, dataMax, scale.log ?? 10, true);
minMax = uPlot.rangeLog(dataMin!, dataMax!, scale.log ?? 10, true);
}
// if all we got were hard limits, treat them as static min/max
@ -111,7 +112,8 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
return minMax;
};
let auto = !isTime && !(hardMinOnly && hardMaxOnly);
let auto = !isTime && !hasFixedRange;
if (isBooleanUnit(scaleKey)) {
auto = false;
range = [0, 1];