public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reducers: minor reducer cleanup (#32656)

Browse Source
This commit is contained in:
Ryan McKinley
2021-04-03 01:14:42 +02:00
committed by GitHub
parent 948da25c13
commit 8ab223d79f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/grafana-data/src/transformations/fieldReducer.ts
+6 -3
View File
@@ -1,7 +1,7 @@
// Libraries // Libraries
import isNumber from 'lodash/isNumber'; import isNumber from 'lodash/isNumber';
import { NullValueMode, Field, FieldState, FieldCalcs } from '../types/index'; import { NullValueMode, Field, FieldState, FieldCalcs, FieldType } from '../types/index';
import { Registry, RegistryItem } from '../utils/Registry'; import { Registry, RegistryItem } from '../utils/Registry';
export enum ReducerID { export enum ReducerID {
@@ -260,6 +260,8 @@ export function doStandardCalcs(field: Field, ignoreNulls: boolean, nullAsZero:
const data = field.values; const data = field.values;
calcs.count = data.length; calcs.count = data.length;
const isNumberField = field.type === FieldType.number || FieldType.time;
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
let currentValue = data.get(i); let currentValue = data.get(i);
@@ -278,13 +280,14 @@ export function doStandardCalcs(field: Field, ignoreNulls: boolean, nullAsZero:
} }
} }
if (currentValue !== null && currentValue !== undefined) { if (currentValue != null) {
// null || undefined
const isFirst = calcs.firstNotNull === null; const isFirst = calcs.firstNotNull === null;
if (isFirst) { if (isFirst) {
calcs.firstNotNull = currentValue; calcs.firstNotNull = currentValue;
} }
if (isNumber(currentValue)) { if (isNumberField) {
calcs.sum += currentValue; calcs.sum += currentValue;
calcs.allIsNull = false; calcs.allIsNull = false;
calcs.nonNullCount++; calcs.nonNullCount++;