From 3fae28be525d4a2a1bc92e841f5d7c45b13a8fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 5 Apr 2020 06:52:33 +0200 Subject: [PATCH] FieldOverride: Fixed number override so that it return undefined for null/undefined values and not NaN (#23344) * FieldOverride: Fixed number override so that it return undefined for null/undefined values and not NaN * Made process function be able to return undefined an null --- packages/grafana-data/src/field/overrides/processors.ts | 8 ++++---- packages/grafana-data/src/types/fieldOverrides.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/grafana-data/src/field/overrides/processors.ts b/packages/grafana-data/src/field/overrides/processors.ts index ea195ecca52..2d79553a05d 100644 --- a/packages/grafana-data/src/field/overrides/processors.ts +++ b/packages/grafana-data/src/field/overrides/processors.ts @@ -17,11 +17,11 @@ export const numberOverrideProcessor = ( context: FieldOverrideContext, settings?: NumberFieldConfigSettings ) => { - const v = parseFloat(`${value}`); - if (settings && settings.max && v > settings.max) { - // ???? + if (value === undefined || value === null) { + return undefined; } - return v; + + return parseFloat(value); }; export interface DataLinksFieldConfigSettings {} diff --git a/packages/grafana-data/src/types/fieldOverrides.ts b/packages/grafana-data/src/types/fieldOverrides.ts index 6015e2b05df..55584003a0f 100644 --- a/packages/grafana-data/src/types/fieldOverrides.ts +++ b/packages/grafana-data/src/types/fieldOverrides.ts @@ -69,7 +69,7 @@ export interface FieldPropertyEditorItem>; // Convert the override value to a well typed value - process: (value: any, context: FieldOverrideContext, settings?: TSettings) => TValue; + process: (value: any, context: FieldOverrideContext, settings?: TSettings) => TValue | undefined | null; // Checks if field should be processed shouldApply: (field: Field) => boolean;