@dhis2/analytics 24.9.0-alpha.1 → 24.9.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [24.9.0](https://github.com/dhis2/analytics/compare/v24.8.0...v24.9.0) (2023-02-24)
+
+
+### Features
+
+* merge multi-calendar support from alpha to master ([#1434](https://github.com/dhis2/analytics/issues/1434)) ([3cdac8f](https://github.com/dhis2/analytics/commit/3cdac8fdefc7a15a3fef0940183ca92f03b0f57c))
+
 # [24.9.0-alpha.1](https://github.com/dhis2/analytics/compare/v24.8.0...v24.9.0-alpha.1) (2023-02-23)
 
 

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,6 +17,15 @@ 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 = _ref => {
   let {
     onSelect,
@@ -22,6 +33,24 @@ const PeriodDimension = _ref => {
     rightFooter,
     excludedPeriodTypes
   } = _ref;
+  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({
@@ -35,7 +64,8 @@ const PeriodDimension = _ref => {
     initialSelectedPeriods: selectedPeriods,
     rightFooter: rightFooter,
     dataTest: 'period-dimension',
-    excludedPeriodTypes: excludedPeriodTypes
+    excludedPeriodTypes: excludedPeriodTypes,
+    periodsSettings: periodsSettings
   });
 };
 

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

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
-var _appRuntime = require("@dhis2/app-runtime");
-
 var _multiCalendarDates = require("@dhis2/multi-calendar-dates");
 
 var _ui = require("@dhis2/ui");
@@ -45,44 +43,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const userSettingsQuery = {
-  userSettings: {
-    resource: 'userSettings',
-    params: {
-      key: ['keyUiLocale']
-    }
-  }
-};
-
 const PeriodTransfer = _ref => {
   let {
     onSelect,
     dataTest,
     initialSelectedPeriods,
     rightFooter,
-    excludedPeriodTypes
+    excludedPeriodTypes,
+    periodsSettings
   } = _ref;
-  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 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, periodsSettings) : (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.MONTHLY, periodsSettings);
-  const now = (0, _multiCalendarDates.getNowInCalendar)(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)
+  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;
@@ -210,7 +182,11 @@ const PeriodTransfer = _ref => {
 
 PeriodTransfer.defaultProps = {
   initialSelectedPeriods: [],
-  excludedPeriodTypes: []
+  excludedPeriodTypes: [],
+  periodsSettings: {
+    calendar: 'gregory',
+    locale: 'en'
+  }
 };
 PeriodTransfer.propTypes = {
   onSelect: _propTypes.default.func.isRequired,
@@ -220,6 +196,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__/PeriodSelector.spec.js

@@ -8,19 +8,6 @@ var _PeriodTransfer = _interopRequireDefault(require("../PeriodTransfer.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 Selector component', () => {
   let props;
   let shallowPeriodTransfer;

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 />}
 />
 `;

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 = _ref => {
   let {
@@ -10,6 +19,24 @@ const PeriodDimension = _ref => {
     rightFooter,
     excludedPeriodTypes
   } = _ref;
+  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({
@@ -23,7 +50,8 @@ const PeriodDimension = _ref => {
     initialSelectedPeriods: selectedPeriods,
     rightFooter: rightFooter,
     dataTest: 'period-dimension',
-    excludedPeriodTypes: excludedPeriodTypes
+    excludedPeriodTypes: excludedPeriodTypes,
+    periodsSettings: periodsSettings
   });
 };
 

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

@@ -2,7 +2,6 @@ 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 { useConfig, useDataQuery } from '@dhis2/app-runtime';
 import { getNowInCalendar } from '@dhis2/multi-calendar-dates';
 import { TabBar, Tab, Transfer } from '@dhis2/ui';
 import PropTypes from 'prop-types';
@@ -18,14 +17,6 @@ import RelativePeriodFilter from './RelativePeriodFilter.js';
 import { getFixedPeriodsOptionsById } from './utils/fixedPeriods.js';
 import { MONTHLY, QUARTERLY } from './utils/index.js';
 import { getRelativePeriodsOptionsById } from './utils/relativePeriods.js';
-const userSettingsQuery = {
-  userSettings: {
-    resource: 'userSettings',
-    params: {
-      key: ['keyUiLocale']
-    }
-  }
-};
 
 const PeriodTransfer = _ref => {
   let {
@@ -33,29 +24,12 @@ const PeriodTransfer = _ref => {
     dataTest,
     initialSelectedPeriods,
     rightFooter,
-    excludedPeriodTypes
+    excludedPeriodTypes,
+    periodsSettings
   } = _ref;
-  const {
-    systemInfo
-  } = useConfig();
-  const result = useDataQuery(userSettingsQuery);
-  const {
-    calendar = 'gregory'
-  } = systemInfo;
-  const {
-    data: {
-      userSettings: {
-        keyUiLocale: locale
-      } = {}
-    } = {}
-  } = result;
-  const periodsSettings = {
-    calendar,
-    locale
-  };
   const defaultRelativePeriodType = excludedPeriodTypes.includes(MONTHLY) ? getRelativePeriodsOptionsById(QUARTERLY) : getRelativePeriodsOptionsById(MONTHLY);
   const defaultFixedPeriodType = excludedPeriodTypes.includes(MONTHLY) ? getFixedPeriodsOptionsById(QUARTERLY, periodsSettings) : getFixedPeriodsOptionsById(MONTHLY, periodsSettings);
-  const now = getNowInCalendar(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)
+  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;
@@ -183,7 +157,11 @@ const PeriodTransfer = _ref => {
 
 PeriodTransfer.defaultProps = {
   initialSelectedPeriods: [],
-  excludedPeriodTypes: []
+  excludedPeriodTypes: [],
+  periodsSettings: {
+    calendar: 'gregory',
+    locale: 'en'
+  }
 };
 PeriodTransfer.propTypes = {
   onSelect: PropTypes.func.isRequired,
@@ -193,6 +171,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__/PeriodSelector.spec.js

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

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 />}
 />
 `;

package/package.json

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