@dhis2/analytics 24.10.1 → 24.10.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [24.10.2](https://github.com/dhis2/analytics/compare/v24.10.1...v24.10.2) (2023-10-25)
+
+
+### Bug Fixes
+
+* avoid undefined in totals DHIS2-14511 v39 ([#1587](https://github.com/dhis2/analytics/issues/1587)) ([9831c17](https://github.com/dhis2/analytics/commit/9831c17f696f763b4ef6125fef9a9999c520f5aa))
+
 ## [24.10.1](https://github.com/dhis2/analytics/compare/v24.10.0...v24.10.1) (2023-04-24)
 
 

package/build/cjs/modules/pivotTable/PivotTableEngine.js

@@ -17,6 +17,8 @@ var _valueTypes = require("../valueTypes.js");
 
 var _AdaptiveClippingController = require("./AdaptiveClippingController.js");
 
+var _addToTotalIfNumber = require("./addToTotalIfNumber.js");
+
 var _parseValue = require("./parseValue.js");
 
 var _pivotTableConstants = require("./pivotTableConstants.js");
@@ -626,10 +628,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            totalCell[field] = (totalCell[field] || 0) + value;
-          }
+          totalCell[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, totalCell[field]);
         });
       }
 
@@ -648,10 +647,7 @@ class PivotTableEngine {
       dataFields.forEach(field => {
         const headerIndex = this.dimensionLookup.dataHeaders[field];
         const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-        if (value && !isNaN(value)) {
-          percentageTotal[field] = (percentageTotal[field] || 0) + value;
-        }
+        percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
       });
 
       if (totals.columnSubtotal) {
@@ -666,10 +662,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
         });
       }
 
@@ -685,10 +678,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
         });
       }
     }
@@ -705,10 +695,7 @@ class PivotTableEngine {
       dataFields.forEach(field => {
         const headerIndex = this.dimensionLookup.dataHeaders[field];
         const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-        if (value && !isNaN(value)) {
-          percentageTotal[field] = (percentageTotal[field] || 0) + value;
-        }
+        percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
       });
 
       if (totals.rowSubtotal) {
@@ -723,10 +710,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
         });
       }
 
@@ -742,10 +726,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
         });
       }
     }

package/build/cjs/modules/pivotTable/__tests__/addToTotalIfNumber.spec.js

@@ -0,0 +1,72 @@
+"use strict";
+
+var _addToTotalIfNumber = require("../addToTotalIfNumber.js");
+
+const tests = [{
+  testName: 'negative value',
+  value: -1,
+  total: undefined,
+  expected: -1
+}, {
+  testName: 'zero value',
+  value: 0,
+  total: undefined,
+  expected: 0
+}, {
+  testName: 'positive value',
+  value: 1,
+  total: undefined,
+  expected: 1
+}, {
+  testName: 'null value',
+  value: null,
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'undefined value',
+  value: undefined,
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'string value',
+  value: 'string',
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'negative value with existing total',
+  value: -1,
+  total: 100,
+  expected: 99
+}, {
+  testName: 'zero value with existing total',
+  value: 0,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'positive value with existing total',
+  value: 1,
+  total: 100,
+  expected: 101
+}, {
+  testName: 'null value with existing total',
+  value: null,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'undefined value with existing total',
+  value: undefined,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'string value with existing total',
+  value: 'string',
+  total: 100,
+  expected: 100
+}];
+describe('addToTotalIfNumber', () => {
+  tests.forEach(t => {
+    it(t.testName, () => {
+      expect((0, _addToTotalIfNumber.addToTotalIfNumber)(t.value, t.total)).toEqual(t.expected);
+    });
+  });
+});

package/build/cjs/modules/pivotTable/addToTotalIfNumber.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addToTotalIfNumber = void 0;
+
+const addToTotalIfNumber = (value, total) => typeof value === 'number' && Number.isFinite(value) ? (total !== null && total !== void 0 ? total : 0) + value : total;
+
+exports.addToTotalIfNumber = addToTotalIfNumber;

package/build/es/modules/pivotTable/PivotTableEngine.js

@@ -6,6 +6,7 @@ import { DIMENSION_ID_ORGUNIT } from '../predefinedDimensions.js';
 import { renderValue } from '../renderValue.js';
 import { VALUE_TYPE_NUMBER, VALUE_TYPE_TEXT } from '../valueTypes.js';
 import { AdaptiveClippingController } from './AdaptiveClippingController.js';
+import { addToTotalIfNumber } from './addToTotalIfNumber.js';
 import { parseValue } from './parseValue.js';
 import { AGGREGATE_TYPE_NA, AGGREGATE_TYPE_AVERAGE, AGGREGATE_TYPE_SUM, CELL_TYPE_VALUE, CELL_TYPE_TOTAL, CELL_TYPE_SUBTOTAL, SORT_ORDER_ASCENDING, SORT_ORDER_DESCENDING, DISPLAY_DENSITY_PADDING_COMPACT, DISPLAY_DENSITY_PADDING_COMFORTABLE, DISPLAY_DENSITY_OPTION_COMFORTABLE, DISPLAY_DENSITY_OPTION_COMPACT, DISPLAY_DENSITY_OPTION_NORMAL, DISPLAY_DENSITY_PADDING_NORMAL, FONT_SIZE_OPTION_SMALL, FONT_SIZE_SMALL, FONT_SIZE_OPTION_LARGE, FONT_SIZE_LARGE, FONT_SIZE_OPTION_NORMAL, FONT_SIZE_NORMAL, NUMBER_TYPE_COLUMN_PERCENTAGE, NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_VALUE } from './pivotTableConstants.js';
 const dataFields = ['value', 'numerator', 'denominator', 'factor', 'multiplier', 'divisor'];
@@ -609,10 +610,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            totalCell[field] = (totalCell[field] || 0) + value;
-          }
+          totalCell[field] = addToTotalIfNumber(value, totalCell[field]);
         });
       }
 
@@ -631,10 +629,7 @@ export class PivotTableEngine {
       dataFields.forEach(field => {
         const headerIndex = this.dimensionLookup.dataHeaders[field];
         const value = parseValue(dataRow[headerIndex]);
-
-        if (value && !isNaN(value)) {
-          percentageTotal[field] = (percentageTotal[field] || 0) + value;
-        }
+        percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
       });
 
       if (totals.columnSubtotal) {
@@ -649,10 +644,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
         });
       }
 
@@ -668,10 +660,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
         });
       }
     }
@@ -688,10 +677,7 @@ export class PivotTableEngine {
       dataFields.forEach(field => {
         const headerIndex = this.dimensionLookup.dataHeaders[field];
         const value = parseValue(dataRow[headerIndex]);
-
-        if (value && !isNaN(value)) {
-          percentageTotal[field] = (percentageTotal[field] || 0) + value;
-        }
+        percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
       });
 
       if (totals.rowSubtotal) {
@@ -706,10 +692,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
         });
       }
 
@@ -725,10 +708,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
         });
       }
     }

package/build/es/modules/pivotTable/__tests__/addToTotalIfNumber.spec.js

@@ -0,0 +1,69 @@
+import { addToTotalIfNumber } from '../addToTotalIfNumber.js';
+const tests = [{
+  testName: 'negative value',
+  value: -1,
+  total: undefined,
+  expected: -1
+}, {
+  testName: 'zero value',
+  value: 0,
+  total: undefined,
+  expected: 0
+}, {
+  testName: 'positive value',
+  value: 1,
+  total: undefined,
+  expected: 1
+}, {
+  testName: 'null value',
+  value: null,
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'undefined value',
+  value: undefined,
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'string value',
+  value: 'string',
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'negative value with existing total',
+  value: -1,
+  total: 100,
+  expected: 99
+}, {
+  testName: 'zero value with existing total',
+  value: 0,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'positive value with existing total',
+  value: 1,
+  total: 100,
+  expected: 101
+}, {
+  testName: 'null value with existing total',
+  value: null,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'undefined value with existing total',
+  value: undefined,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'string value with existing total',
+  value: 'string',
+  total: 100,
+  expected: 100
+}];
+describe('addToTotalIfNumber', () => {
+  tests.forEach(t => {
+    it(t.testName, () => {
+      expect(addToTotalIfNumber(t.value, t.total)).toEqual(t.expected);
+    });
+  });
+});

package/build/es/modules/pivotTable/addToTotalIfNumber.js

@@ -0,0 +1 @@
+export const addToTotalIfNumber = (value, total) => typeof value === 'number' && Number.isFinite(value) ? (total !== null && total !== void 0 ? total : 0) + value : total;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "24.10.1",
+    "version": "24.10.2",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {