@dhis2/analytics 21.8.2 → 21.9.1

package/build/cjs/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/cjs/modules/pivotTable/PivotTableEngine.js

@@ -11,6 +11,8 @@ var _predefinedDimensions = require("../predefinedDimensions.js");
 
 var _AdaptiveClippingController = require("./AdaptiveClippingController.js");
 
+var _addToTotalIfNumber = require("./addToTotalIfNumber.js");
+
 var _parseValue = require("./parseValue.js");
 
 var _pivotTableConstants = require("./pivotTableConstants.js");
@@ -611,10 +613,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]);
         });
       }
 
@@ -633,10 +632,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) {
@@ -651,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]);
         });
       }
 
@@ -670,10 +663,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]);
         });
       }
     }
@@ -690,10 +680,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) {
@@ -708,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]);
         });
       }
 
@@ -727,10 +711,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.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/components/PeriodDimension/PeriodDimension.js

@@ -1,7 +1,16 @@
+import { useConfig, useDataQuery } from '@dhis2/app-runtime';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { DIMENSION_ID_PERIOD } from '../../modules/predefinedDimensions.js';
 import PeriodTransfer from './PeriodTransfer.js';
+const userSettingsQuery = {
+  userSettings: {
+    resource: 'userSettings',
+    params: {
+      key: ['keyUiLocale']
+    }
+  }
+};
 
 const PeriodDimension = ({
   onSelect,
@@ -9,6 +18,25 @@ const PeriodDimension = ({
   rightFooter,
   excludedPeriodTypes
 }) => {
+  const {
+    systemInfo
+  } = useConfig();
+  const result = useDataQuery(userSettingsQuery);
+  const {
+    calendar = 'gregory'
+  } = systemInfo;
+  const {
+    data: {
+      userSettings: {
+        keyUiLocale: locale
+      } = {}
+    } = {}
+  } = result;
+  const periodsSettings = {
+    calendar,
+    locale
+  };
+
   const selectPeriods = periods => {
     onSelect({
       dimensionId: DIMENSION_ID_PERIOD,
@@ -21,7 +49,8 @@ const PeriodDimension = ({
     initialSelectedPeriods: selectedPeriods,
     rightFooter: rightFooter,
     dataTest: 'period-dimension',
-    excludedPeriodTypes: excludedPeriodTypes
+    excludedPeriodTypes: excludedPeriodTypes,
+    periodsSettings: periodsSettings
   });
 };
 

package/build/es/components/PeriodDimension/PeriodTransfer.js

@@ -2,6 +2,7 @@ import _JSXStyle from "styled-jsx/style";
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+import { getNowInCalendar } from '@dhis2/multi-calendar-dates';
 import { TabBar, Tab, Transfer } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
@@ -22,11 +23,15 @@ const PeriodTransfer = ({
   dataTest,
   initialSelectedPeriods,
   rightFooter,
-  excludedPeriodTypes
+  excludedPeriodTypes,
+  periodsSettings
 }) => {
   const defaultRelativePeriodType = excludedPeriodTypes.includes(MONTHLY) ? getRelativePeriodsOptionsById(QUARTERLY) : getRelativePeriodsOptionsById(MONTHLY);
-  const defaultFixedPeriodType = excludedPeriodTypes.includes(MONTHLY) ? getFixedPeriodsOptionsById(QUARTERLY) : getFixedPeriodsOptionsById(MONTHLY);
-  const defaultFixedPeriodYear = new Date().getFullYear();
+  const defaultFixedPeriodType = excludedPeriodTypes.includes(MONTHLY) ? getFixedPeriodsOptionsById(QUARTERLY, periodsSettings) : getFixedPeriodsOptionsById(MONTHLY, periodsSettings);
+  const now = getNowInCalendar(periodsSettings.calendar); // use ".eraYear" rather than ".year" because in Ethiopian calendar, eraYear is what our users expect to see (for other calendars, it doesn't matter)
+  // there is still a pending decision in Temporal regarding which era to use by default: https://github.com/js-temporal/temporal-polyfill/blob/9350ee7dd0d29f329fc097debf923a517c32f813/lib/calendar.ts#L1964
+
+  const defaultFixedPeriodYear = now.eraYear || now.year;
 
   const fixedPeriodConfig = year => ({
     offset: year - defaultFixedPeriodYear,
@@ -48,7 +53,7 @@ const PeriodTransfer = ({
   const onIsRelativeClick = state => {
     if (state !== isRelative) {
       setIsRelative(state);
-      setAllPeriods(state ? getRelativePeriodsOptionsById(relativeFilter.periodType).getPeriods() : getFixedPeriodsOptionsById(fixedFilter.periodType).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
+      setAllPeriods(state ? getRelativePeriodsOptionsById(relativeFilter.periodType).getPeriods() : getFixedPeriodsOptionsById(fixedFilter.periodType, periodsSettings).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
     }
   };
 
@@ -101,7 +106,7 @@ const PeriodTransfer = ({
 
   const onSelectFixedPeriods = filter => {
     setFixedFilter(filter);
-    setAllPeriods(getFixedPeriodsOptionsById(filter.periodType).getPeriods(fixedPeriodConfig(Number(filter.year))));
+    setAllPeriods(getFixedPeriodsOptionsById(filter.periodType, periodsSettings).getPeriods(fixedPeriodConfig(Number(filter.year)), periodsSettings));
   };
 
   const renderEmptySelection = () => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
@@ -147,7 +152,11 @@ const PeriodTransfer = ({
 
 PeriodTransfer.defaultProps = {
   initialSelectedPeriods: [],
-  excludedPeriodTypes: []
+  excludedPeriodTypes: [],
+  periodsSettings: {
+    calendar: 'gregory',
+    locale: 'en'
+  }
 };
 PeriodTransfer.propTypes = {
   onSelect: PropTypes.func.isRequired,
@@ -157,6 +166,10 @@ PeriodTransfer.propTypes = {
     id: PropTypes.string,
     name: PropTypes.string
   })),
+  periodsSettings: PropTypes.shape({
+    calendar: PropTypes.string,
+    locale: PropTypes.string
+  }),
   rightFooter: PropTypes.node
 };
 export default PeriodTransfer;

package/build/es/components/PeriodDimension/__tests__/PeriodDimension.spec.js

@@ -1,6 +1,19 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import PeriodDimension from '../PeriodDimension.js';
+jest.mock('@dhis2/app-runtime', () => ({
+  useConfig: () => ({
+    systemInfo: {}
+  }),
+  useDataQuery: () => ({
+    data: {
+      userSettings: {
+        keyUiLocale: 'en'
+      }
+    }
+  })
+}));
+afterEach(jest.clearAllMocks);
 describe('The Period Dimension component', () => {
   let props;
   let shallowPeriodDimension;

package/build/es/components/PeriodDimension/__tests__/__snapshots__/PeriodDimension.spec.js.snap

@@ -6,6 +6,12 @@ exports[`The Period Dimension component matches the snapshot 1`] = `
   excludedPeriodTypes={Array []}
   initialSelectedPeriods={Array []}
   onSelect={[Function]}
+  periodsSettings={
+    Object {
+      "calendar": "gregory",
+      "locale": "en",
+    }
+  }
   rightFooter={<React.Fragment />}
 />
 `;