root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 243 Packages Projects Releases Wiki Activity

StatusHistory: Fix rendering of value-mapped null (#69033)

This commit is contained in:
Leon Sorokin 2023-05-25 13:38:32 -05:00 committed by GitHub
parent 56812def50
commit 37e2becdd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-data/src/types/fieldColor.ts
View File

@ -37,4 +37,4 @@ export interface FieldColor {
*/
export type FieldColorSeriesByMode = 'min' | 'max' | 'last';
export const FALLBACK_COLOR = 'gray';
export const FALLBACK_COLOR = '#808080';

16
public/app/core/components/TimelineChart/timeline.ts
View File

@ -47,6 +47,7 @@ export interface TimelineCoreOptions {
showValue: VisibilityMode;
mergeValues?: boolean;
isDiscrete: (seriesIdx: number) => boolean;
hasMappedNull: (seriesIdx: number) => boolean;
getValueColor: (seriesIdx: number, value: unknown) => string;
label: (seriesIdx: number) => string;
getTimeRange: () => TimeRange;
@ -64,6 +65,7 @@ export function getConfig(opts: TimelineCoreOptions) {
mode,
numSeries,
isDiscrete,
hasMappedNull,
rowHeight = 0,
colWidth = 0,
showValue,
@ -210,6 +212,7 @@ export function getConfig(opts: TimelineCoreOptions) {
let strokeWidth = round((series.width || 0) * uPlot.pxRatio);
let discrete = isDiscrete(sidx);
let mappedNull = discrete && hasMappedNull(sidx);
u.ctx.save();
rect(u.ctx, u.bbox.left, u.bbox.top, u.bbox.width, u.bbox.height);
@ -220,7 +223,7 @@ export function getConfig(opts: TimelineCoreOptions) {
for (let ix = 0; ix < dataY.length; ix++) {
let yVal = dataY[ix];
if (yVal != null) {
if (yVal != null || mappedNull) {
let left = Math.round(valToPosX(dataX[ix], scaleX, xDim, xOff));
let nextIx = ix;
@ -262,7 +265,9 @@ export function getConfig(opts: TimelineCoreOptions) {
//let xShift = align === 1 ? 0 : align === -1 ? barWid : barWid / 2;
for (let ix = idx0; ix <= idx1; ix++) {
if (dataY[ix] != null) {
let yVal = dataY[ix];
if (yVal != null || mappedNull) {
// TODO: all xPos can be pre-computed once for all series in aligned set
let left = valToPosX(dataX[ix], scaleX, xDim, xOff);
@ -278,7 +283,7 @@ export function getConfig(opts: TimelineCoreOptions) {
strokeWidth,
iy,
ix,
dataY[ix],
yVal,
discrete
);
}
@ -316,10 +321,13 @@ export function getConfig(opts: TimelineCoreOptions) {
(series, dataX, dataY, scaleX, scaleY, valToPosX, valToPosY, xOff, yOff, xDim, yDim) => {
let strokeWidth = round((series.width || 0) * uPlot.pxRatio);
let discrete = isDiscrete(sidx);
let mappedNull = discrete && hasMappedNull(sidx);
let y = round(yOff + yMids[sidx - 1]);
for (let ix = 0; ix < dataY.length; ix++) {
if (dataY[ix] != null) {
if (dataY[ix] != null || mappedNull) {
const boxRect = boxRectsBySeries[sidx - 1][ix];
if (!boxRect || boxRect.x >= xDim) {

10
public/app/core/components/TimelineChart/utils.ts
View File

@ -31,6 +31,7 @@ import {
VisibilityMode,
TimelineValueAlignment,
HideableFieldConfig,
MappingType,
} from '@grafana/schema';
import {
FIXED_UNIT,
@ -112,6 +113,14 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<UPlotConfigOptions> = (
return !(mode && field.display && mode.startsWith('continuous-'));
};
const hasMappedNull = (field: Field) => {
return (
field.config.mappings?.some(
(mapping) => mapping.type === MappingType.SpecialValue && mapping.options.match === 'null'
) || false
);
};
const getValueColorFn = (seriesIdx: number, value: unknown) => {
const field = frame.fields[seriesIdx];
@ -130,6 +139,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<UPlotConfigOptions> = (
mode: mode!,
numSeries: frame.fields.length - 1,
isDiscrete: (seriesIdx) => isDiscrete(frame.fields[seriesIdx]),
hasMappedNull: (seriesIdx) => hasMappedNull(frame.fields[seriesIdx]),
mergeValues,
rowHeight: rowHeight,
colWidth: colWidth,