From 62984d2aa03de750c11b2c18f4614faa1e4face9 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 10 Jan 2023 07:04:08 +0000 Subject: [PATCH] [v9.3.x] TimeSeries: Fix y-axis Yes/No and On/Off boolean units (#61208) TimeSeries: Fix y-axis Yes/No and On/Off boolean units (#61207) (cherry picked from commit a1609230f8ad98b7705bc4ecb18d5eb45b4b8070) Co-authored-by: Leon Sorokin --- packages/grafana-data/src/field/displayProcessor.ts | 2 +- .../grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/grafana-data/src/field/displayProcessor.ts b/packages/grafana-data/src/field/displayProcessor.ts index 0761d29897d..4a95a435b48 100644 --- a/packages/grafana-data/src/field/displayProcessor.ts +++ b/packages/grafana-data/src/field/displayProcessor.ts @@ -73,7 +73,7 @@ export function getDisplayProcessor(options?: DisplayProcessorOptions): DisplayP } const hasCurrencyUnit = unit?.startsWith('currency'); - const hasBoolUnit = unit === 'bool'; + const hasBoolUnit = isBooleanUnit(unit); const isNumType = field.type === FieldType.number; const isLocaleFormat = unit === 'locale'; const canTrimTrailingDecimalZeros = diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts index 3fff07ecd41..30fbbfc72ba 100644 --- a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts +++ b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts @@ -130,6 +130,7 @@ export class UPlotAxisBuilder extends PlotConfigBuilder { const gridColor = theme.isDark ? 'rgba(240, 250, 255, 0.09)' : 'rgba(0, 10, 23, 0.09)'; + // TODO: this is pretty flimsy now that scaleKey is composed from multiple parts :/ if (isBooleanUnit(scaleKey)) { splits = [0, 1]; }