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

BarChart: fix explicit yAxis min (#51768)

Browse Source
This commit is contained in:
Leon Sorokin 2022-07-06 07:47:49 -05:00 committed by GitHub
parent edfbdc4b63
commit d122449a97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/panel/barchart/models.gen.ts
View File

@ -45,5 +45,4 @@ export const defaultBarChartFieldConfig: BarChartFieldConfig = {
lineWidth: 1,
fillOpacity: 80,
gradientMode: GraphGradientMode.None,
axisSoftMin: 0,
};

20
public/app/plugins/panel/barchart/utils.ts
View File

@ -173,6 +173,18 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
const scaleColor = getFieldSeriesColor(field, theme);
const seriesColor = scaleColor.color;
// make barcharts start at 0 unless explicitly overridden
let softMin = customConfig.axisSoftMin;
let softMax = customConfig.axisSoftMax;
if (softMin == null && field.config.min == null) {
softMin = 0;
}
if (softMax == null && field.config.max == null) {
softMax = 0;
}
builder.addSeries({
scaleKey,
pxAlign: true,
@ -187,8 +199,8 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
thresholds: field.config.thresholds,
hardMin: field.config.min,
hardMax: field.config.max,
softMin: customConfig.axisSoftMin,
softMax: customConfig.axisSoftMax,
softMin,
softMax,
// The following properties are not used in the uPlot config, but are utilized as transport for legend config
// PlotLegend currently gets unfiltered DataFrame[], so index must be into that field array, not the prepped frame's which we're iterating here
@ -207,8 +219,8 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
scaleKey,
min: field.config.min,
max: field.config.max,
softMin: customConfig.axisSoftMin,
softMax: customConfig.axisSoftMax,
softMin,
softMax,
orientation: vizOrientation.yOri,
direction: vizOrientation.yDir,
distribution: customConfig.scaleDistribution?.type,