@dhis2/analytics 21.8.2 → 21.9.1

package/build/es/locales/en/translations.json

@@ -147,20 +147,6 @@
     "Fixed periods": "Fixed periods",
     "Selected Periods": "Selected Periods",
     "No periods selected": "No periods selected",
-    "January": "January",
-    "February": "February",
-    "March": "March",
-    "April": "April",
-    "May": "May",
-    "June": "June",
-    "July": "July",
-    "August": "August",
-    "September": "September",
-    "October": "October",
-    "November": "November",
-    "December": "December",
-    "Week {{weekNumber}}": "Week {{weekNumber}}",
-    "Bi-Week {{biWeekNumber}}": "Bi-Week {{biWeekNumber}}",
     "Daily": "Daily",
     "Weekly": "Weekly",
     "Weekly (Start Wednesday)": "Weekly (Start Wednesday)",

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

@@ -3,6 +3,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import times from 'lodash/times';
 import { DIMENSION_ID_ORGUNIT } from '../predefinedDimensions.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, VALUE_TYPE_NUMBER, NUMBER_TYPE_COLUMN_PERCENTAGE, NUMBER_TYPE_ROW_PERCENTAGE, DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGUNIT, DIMENSION_TYPE_PERIOD, VALUE_TYPE_TEXT, NUMBER_TYPE_VALUE } from './pivotTableConstants.js';
 import { renderValue } from './renderValue.js';
@@ -596,10 +597,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]);
         });
       }
 
@@ -618,10 +616,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) {
@@ -636,10 +631,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]);
         });
       }
 
@@ -655,10 +647,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]);
         });
       }
     }
@@ -675,10 +664,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) {
@@ -693,10 +679,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]);
         });
       }
 
@@ -712,10 +695,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.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": "21.8.2",
+    "version": "21.9.1",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -59,6 +59,7 @@
     },
     "dependencies": {
         "@dhis2/d2-ui-translation-dialog": "^7.3.1",
+        "@dhis2/multi-calendar-dates": "1.0.0",
         "classnames": "^2.3.1",
         "d2-utilizr": "^0.2.16",
         "d3-color": "^1.2.3",