@dhis2/analytics 21.8.2 → 21.9.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [21.9.1](https://github.com/dhis2/analytics/compare/v21.9.0...v21.9.1) (2023-10-05)
+
+
+### Bug Fixes
+
+* avoid undefined in totals DHIS2-14511 ([#1552](https://github.com/dhis2/analytics/issues/1552)) ([#1585](https://github.com/dhis2/analytics/issues/1585)) ([f2c1fd1](https://github.com/dhis2/analytics/commit/f2c1fd1807af875e0af0f49bc2027862863ade35))
+
+# [21.9.0](https://github.com/dhis2/analytics/compare/v21.8.2...v21.9.0) (2023-03-02)
+
+
+### Features
+
+* merge multi-calendar support from alpha to master ([#1434](https://github.com/dhis2/analytics/issues/1434)) ([9bacb7c](https://github.com/dhis2/analytics/commit/9bacb7c7d6592516bb64d735cfb1a7b2ef6a5e94))
+
 ## [21.8.2](https://github.com/dhis2/analytics/compare/v21.8.1...v21.8.2) (2022-09-29)
 
 

package/build/cjs/components/PeriodDimension/PeriodDimension.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _appRuntime = require("@dhis2/app-runtime");
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -15,12 +17,40 @@ var _PeriodTransfer = _interopRequireDefault(require("./PeriodTransfer.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const userSettingsQuery = {
+  userSettings: {
+    resource: 'userSettings',
+    params: {
+      key: ['keyUiLocale']
+    }
+  }
+};
+
 const PeriodDimension = ({
   onSelect,
   selectedPeriods,
   rightFooter,
   excludedPeriodTypes
 }) => {
+  const {
+    systemInfo
+  } = (0, _appRuntime.useConfig)();
+  const result = (0, _appRuntime.useDataQuery)(userSettingsQuery);
+  const {
+    calendar = 'gregory'
+  } = systemInfo;
+  const {
+    data: {
+      userSettings: {
+        keyUiLocale: locale
+      } = {}
+    } = {}
+  } = result;
+  const periodsSettings = {
+    calendar,
+    locale
+  };
+
   const selectPeriods = periods => {
     onSelect({
       dimensionId: _predefinedDimensions.DIMENSION_ID_PERIOD,
@@ -33,7 +63,8 @@ const PeriodDimension = ({
     initialSelectedPeriods: selectedPeriods,
     rightFooter: rightFooter,
     dataTest: 'period-dimension',
-    excludedPeriodTypes: excludedPeriodTypes
+    excludedPeriodTypes: excludedPeriodTypes,
+    periodsSettings: periodsSettings
   });
 };
 

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

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
+var _multiCalendarDates = require("@dhis2/multi-calendar-dates");
+
 var _ui = require("@dhis2/ui");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -46,11 +48,15 @@ const PeriodTransfer = ({
   dataTest,
   initialSelectedPeriods,
   rightFooter,
-  excludedPeriodTypes
+  excludedPeriodTypes,
+  periodsSettings
 }) => {
   const defaultRelativePeriodType = excludedPeriodTypes.includes(_index2.MONTHLY) ? (0, _relativePeriods.getRelativePeriodsOptionsById)(_index2.QUARTERLY) : (0, _relativePeriods.getRelativePeriodsOptionsById)(_index2.MONTHLY);
-  const defaultFixedPeriodType = excludedPeriodTypes.includes(_index2.MONTHLY) ? (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.QUARTERLY) : (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.MONTHLY);
-  const defaultFixedPeriodYear = new Date().getFullYear();
+  const defaultFixedPeriodType = excludedPeriodTypes.includes(_index2.MONTHLY) ? (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.QUARTERLY, periodsSettings) : (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.MONTHLY, periodsSettings);
+  const now = (0, _multiCalendarDates.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,
@@ -72,7 +78,7 @@ const PeriodTransfer = ({
   const onIsRelativeClick = state => {
     if (state !== isRelative) {
       setIsRelative(state);
-      setAllPeriods(state ? (0, _relativePeriods.getRelativePeriodsOptionsById)(relativeFilter.periodType).getPeriods() : (0, _fixedPeriods.getFixedPeriodsOptionsById)(fixedFilter.periodType).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
+      setAllPeriods(state ? (0, _relativePeriods.getRelativePeriodsOptionsById)(relativeFilter.periodType).getPeriods() : (0, _fixedPeriods.getFixedPeriodsOptionsById)(fixedFilter.periodType, periodsSettings).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
     }
   };
 
@@ -125,7 +131,7 @@ const PeriodTransfer = ({
 
   const onSelectFixedPeriods = filter => {
     setFixedFilter(filter);
-    setAllPeriods((0, _fixedPeriods.getFixedPeriodsOptionsById)(filter.periodType).getPeriods(fixedPeriodConfig(Number(filter.year))));
+    setAllPeriods((0, _fixedPeriods.getFixedPeriodsOptionsById)(filter.periodType, periodsSettings).getPeriods(fixedPeriodConfig(Number(filter.year)), periodsSettings));
   };
 
   const renderEmptySelection = () => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
@@ -171,7 +177,11 @@ const PeriodTransfer = ({
 
 PeriodTransfer.defaultProps = {
   initialSelectedPeriods: [],
-  excludedPeriodTypes: []
+  excludedPeriodTypes: [],
+  periodsSettings: {
+    calendar: 'gregory',
+    locale: 'en'
+  }
 };
 PeriodTransfer.propTypes = {
   onSelect: _propTypes.default.func.isRequired,
@@ -181,6 +191,10 @@ PeriodTransfer.propTypes = {
     id: _propTypes.default.string,
     name: _propTypes.default.string
   })),
+  periodsSettings: _propTypes.default.shape({
+    calendar: _propTypes.default.string,
+    locale: _propTypes.default.string
+  }),
   rightFooter: _propTypes.default.node
 };
 var _default = PeriodTransfer;

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

@@ -8,6 +8,19 @@ var _PeriodDimension = _interopRequireDefault(require("../PeriodDimension.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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/cjs/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 />}
 />
 `;