@dhis2/analytics 24.5.0-alpha.2 → 24.5.0-alpha.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [24.5.0-alpha.3](https://github.com/dhis2/analytics/compare/v24.5.0-alpha.2...v24.5.0-alpha.3) (2023-02-23)
+
+
+### Features
+
+* localise fixed periods according to user settings ([c640c90](https://github.com/dhis2/analytics/commit/c640c90ce2d1944a14706507284af43c7480fa2a))
+
 # [24.5.0-alpha.2](https://github.com/dhis2/analytics/compare/v24.5.0-alpha.1...v24.5.0-alpha.2) (2023-02-14)
 
 

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

@@ -45,6 +45,15 @@ 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,
@@ -56,11 +65,23 @@ const PeriodTransfer = _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, calendar) : (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.MONTHLY, calendar);
+  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)
   // 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
 
@@ -86,7 +107,7 @@ const PeriodTransfer = _ref => {
   const onIsRelativeClick = state => {
     if (state !== isRelative) {
       setIsRelative(state);
-      setAllPeriods(state ? (0, _relativePeriods.getRelativePeriodsOptionsById)(relativeFilter.periodType).getPeriods() : (0, _fixedPeriods.getFixedPeriodsOptionsById)(fixedFilter.periodType, calendar).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
+      setAllPeriods(state ? (0, _relativePeriods.getRelativePeriodsOptionsById)(relativeFilter.periodType).getPeriods() : (0, _fixedPeriods.getFixedPeriodsOptionsById)(fixedFilter.periodType, periodsSettings).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
     }
   };
 
@@ -139,7 +160,7 @@ const PeriodTransfer = _ref => {
 
   const onSelectFixedPeriods = filter => {
     setFixedFilter(filter);
-    setAllPeriods((0, _fixedPeriods.getFixedPeriodsOptionsById)(filter.periodType, calendar).getPeriods(fixedPeriodConfig(Number(filter.year)), calendar));
+    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", {

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

@@ -11,8 +11,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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/utils/fixedPeriods.js

@@ -56,18 +56,22 @@ const getPeriods = _ref => {
     periodType,
     config,
     fnFilter,
-    calendar
+    periodSettings = {}
   } = _ref;
   const offset = parseInt(config.offset, 10);
   const isFilter = config.filterFuturePeriods;
   const isReverse = periodType.match(/^FY|YEARLY/) ? true : config.reversePeriods;
+  const {
+    calendar = 'gregory',
+    locale = 'en'
+  } = periodSettings;
   const now = (0, _multiCalendarDates.getNowInCalendar)(calendar);
   const year = (now.eraYear || now.year) + offset;
   const params = {
     periodType,
     year,
     calendar,
-    locale: 'en',
+    locale,
     startingDay: config.startDay
   };
   let periods = (0, _multiCalendarDates.generateFixedPeriods)(params);
@@ -76,18 +80,18 @@ const getPeriods = _ref => {
   return periods;
 };
 
-const getDailyPeriodType = (fnFilter, calendar) => {
+const getDailyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'DAILY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getWeeklyPeriodType = (weekObj, fnFilter, calendar) => {
+const getWeeklyPeriodType = (weekObj, fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'WEEKLY',
@@ -95,128 +99,128 @@ const getWeeklyPeriodType = (weekObj, fnFilter, calendar) => {
         startDay: weekObj.startDay
       },
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getBiWeeklyPeriodType = (fnFilter, calendar) => {
+const getBiWeeklyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'BIWEEKLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getMonthlyPeriodType = (fnFilter, calendar) => {
+const getMonthlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'MONTHLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getBiMonthlyPeriodType = (fnFilter, calendar) => {
+const getBiMonthlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'BIMONTHLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getQuarterlyPeriodType = (fnFilter, calendar) => {
+const getQuarterlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'QUARTERLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getSixMonthlyPeriodType = (fnFilter, calendar) => {
+const getSixMonthlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'SIXMONTHLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getSixMonthlyAprilPeriodType = (fnFilter, calendar) => {
+const getSixMonthlyAprilPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'SIXMONTHLYAPR',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getYearlyPeriodType = (fnFilter, calendar) => {
+const getYearlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'YEARLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getFinancialOctoberPeriodType = (fnFilter, calendar) => {
+const getFinancialOctoberPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'FYOCT',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getFinancialNovemberPeriodType = (fnFilter, calendar) => {
+const getFinancialNovemberPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'FYNOV',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getFinancialJulyPeriodType = (fnFilter, calendar) => {
+const getFinancialJulyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'FYJUL',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getFinancialAprilPeriodType = (fnFilter, calendar) => {
+const getFinancialAprilPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'FYAPR',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
@@ -234,92 +238,90 @@ const filterFuturePeriods = periods => {
   return array;
 };
 
-const getOptions = function () {
-  let calendar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'gregory';
+const getOptions = periodSettings => {
   return [{
     id: _index2.DAILY,
-    getPeriods: getDailyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getDailyPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Daily')
   }, {
     id: _index2.WEEKLY,
     getPeriods: getWeeklyPeriodType({
       startDay: 1
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: _index.default.t('Weekly')
   }, {
     id: _index2.WEEKLYWED,
     getPeriods: getWeeklyPeriodType({
       startDay: 3
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: _index.default.t('Weekly (Start Wednesday)')
   }, {
     id: _index2.WEEKLYTHU,
     getPeriods: getWeeklyPeriodType({
       startDay: 4
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: _index.default.t('Weekly (Start Thursday)')
   }, {
     id: _index2.WEEKLYSAT,
     getPeriods: getWeeklyPeriodType({
       startDay: 6
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: _index.default.t('Weekly (Start Saturday)')
   }, {
     id: _index2.WEEKLYSUN,
     getPeriods: getWeeklyPeriodType({
       startDay: 7
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: _index.default.t('Weekly (Start Sunday)')
   }, {
     id: _index2.BIWEEKLY,
-    getPeriods: getBiWeeklyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getBiWeeklyPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Bi-weekly')
   }, {
     id: _index2.MONTHLY,
-    getPeriods: getMonthlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getMonthlyPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Monthly')
   }, {
     id: _index2.BIMONTHLY,
-    getPeriods: getBiMonthlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getBiMonthlyPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Bi-monthly')
   }, {
     id: _index2.QUARTERLY,
-    getPeriods: getQuarterlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getQuarterlyPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Quarterly')
   }, {
     id: _index2.SIXMONTHLY,
-    getPeriods: getSixMonthlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getSixMonthlyPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Six-monthly')
   }, {
     id: _index2.SIXMONTHLYAPR,
-    getPeriods: getSixMonthlyAprilPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getSixMonthlyAprilPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Six-monthly April')
   }, {
     id: _index2.YEARLY,
-    getPeriods: getYearlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getYearlyPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Yearly')
   }, {
     id: _index2.FYNOV,
-    getPeriods: getFinancialNovemberPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getFinancialNovemberPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Financial year (Start November)')
   }, {
     id: _index2.FYOCT,
-    getPeriods: getFinancialOctoberPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getFinancialOctoberPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Financial year (Start October)')
   }, {
     id: _index2.FYJUL,
-    getPeriods: getFinancialJulyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getFinancialJulyPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Financial year (Start July)')
   }, {
     id: _index2.FYAPR,
-    getPeriods: getFinancialAprilPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getFinancialAprilPeriodType(filterFuturePeriods, periodSettings),
     name: _index.default.t('Financial year (Start April)')
   }];
 };
 
-const getFixedPeriodsOptionsById = function (id) {
-  let calendar = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'gregory';
-  return getOptions(calendar).find(option => option.id === id);
+const getFixedPeriodsOptionsById = (id, periodSettings) => {
+  return getOptions(periodSettings).find(option => option.id === id);
 };
 
 exports.getFixedPeriodsOptionsById = getFixedPeriodsOptionsById;

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

@@ -2,7 +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 { useConfig } from '@dhis2/app-runtime';
+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,6 +18,14 @@ 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 {
@@ -30,11 +38,23 @@ const PeriodTransfer = _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, calendar) : getFixedPeriodsOptionsById(MONTHLY, calendar);
+  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)
   // 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
 
@@ -60,7 +80,7 @@ const PeriodTransfer = _ref => {
   const onIsRelativeClick = state => {
     if (state !== isRelative) {
       setIsRelative(state);
-      setAllPeriods(state ? getRelativePeriodsOptionsById(relativeFilter.periodType).getPeriods() : getFixedPeriodsOptionsById(fixedFilter.periodType, calendar).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
+      setAllPeriods(state ? getRelativePeriodsOptionsById(relativeFilter.periodType).getPeriods() : getFixedPeriodsOptionsById(fixedFilter.periodType, periodsSettings).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
     }
   };
 
@@ -113,7 +133,7 @@ const PeriodTransfer = _ref => {
 
   const onSelectFixedPeriods = filter => {
     setFixedFilter(filter);
-    setAllPeriods(getFixedPeriodsOptionsById(filter.periodType, calendar).getPeriods(fixedPeriodConfig(Number(filter.year)), calendar));
+    setAllPeriods(getFixedPeriodsOptionsById(filter.periodType, periodsSettings).getPeriods(fixedPeriodConfig(Number(filter.year)), periodsSettings));
   };
 
   const renderEmptySelection = () => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {

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

@@ -4,8 +4,16 @@ 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/utils/fixedPeriods.js

@@ -44,18 +44,22 @@ const getPeriods = _ref => {
     periodType,
     config,
     fnFilter,
-    calendar
+    periodSettings = {}
   } = _ref;
   const offset = parseInt(config.offset, 10);
   const isFilter = config.filterFuturePeriods;
   const isReverse = periodType.match(/^FY|YEARLY/) ? true : config.reversePeriods;
+  const {
+    calendar = 'gregory',
+    locale = 'en'
+  } = periodSettings;
   const now = getNowInCalendar(calendar);
   const year = (now.eraYear || now.year) + offset;
   const params = {
     periodType,
     year,
     calendar,
-    locale: 'en',
+    locale,
     startingDay: config.startDay
   };
   let periods = generateFixedPeriods(params);
@@ -64,18 +68,18 @@ const getPeriods = _ref => {
   return periods;
 };
 
-const getDailyPeriodType = (fnFilter, calendar) => {
+const getDailyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'DAILY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getWeeklyPeriodType = (weekObj, fnFilter, calendar) => {
+const getWeeklyPeriodType = (weekObj, fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'WEEKLY',
@@ -83,128 +87,128 @@ const getWeeklyPeriodType = (weekObj, fnFilter, calendar) => {
         startDay: weekObj.startDay
       },
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getBiWeeklyPeriodType = (fnFilter, calendar) => {
+const getBiWeeklyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'BIWEEKLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getMonthlyPeriodType = (fnFilter, calendar) => {
+const getMonthlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'MONTHLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getBiMonthlyPeriodType = (fnFilter, calendar) => {
+const getBiMonthlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'BIMONTHLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getQuarterlyPeriodType = (fnFilter, calendar) => {
+const getQuarterlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'QUARTERLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getSixMonthlyPeriodType = (fnFilter, calendar) => {
+const getSixMonthlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'SIXMONTHLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getSixMonthlyAprilPeriodType = (fnFilter, calendar) => {
+const getSixMonthlyAprilPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'SIXMONTHLYAPR',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getYearlyPeriodType = (fnFilter, calendar) => {
+const getYearlyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'YEARLY',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getFinancialOctoberPeriodType = (fnFilter, calendar) => {
+const getFinancialOctoberPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'FYOCT',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getFinancialNovemberPeriodType = (fnFilter, calendar) => {
+const getFinancialNovemberPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'FYNOV',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getFinancialJulyPeriodType = (fnFilter, calendar) => {
+const getFinancialJulyPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'FYJUL',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
 
-const getFinancialAprilPeriodType = (fnFilter, calendar) => {
+const getFinancialAprilPeriodType = (fnFilter, periodSettings) => {
   return config => {
     return getPeriods({
       periodType: 'FYAPR',
       config,
       fnFilter,
-      calendar
+      periodSettings
     });
   };
 };
@@ -222,92 +226,90 @@ const filterFuturePeriods = periods => {
   return array;
 };
 
-const getOptions = function () {
-  let calendar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'gregory';
+const getOptions = periodSettings => {
   return [{
     id: DAILY,
-    getPeriods: getDailyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getDailyPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Daily')
   }, {
     id: WEEKLY,
     getPeriods: getWeeklyPeriodType({
       startDay: 1
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: i18n.t('Weekly')
   }, {
     id: WEEKLYWED,
     getPeriods: getWeeklyPeriodType({
       startDay: 3
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: i18n.t('Weekly (Start Wednesday)')
   }, {
     id: WEEKLYTHU,
     getPeriods: getWeeklyPeriodType({
       startDay: 4
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: i18n.t('Weekly (Start Thursday)')
   }, {
     id: WEEKLYSAT,
     getPeriods: getWeeklyPeriodType({
       startDay: 6
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: i18n.t('Weekly (Start Saturday)')
   }, {
     id: WEEKLYSUN,
     getPeriods: getWeeklyPeriodType({
       startDay: 7
-    }, filterFuturePeriods, calendar),
+    }, filterFuturePeriods, periodSettings),
     name: i18n.t('Weekly (Start Sunday)')
   }, {
     id: BIWEEKLY,
-    getPeriods: getBiWeeklyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getBiWeeklyPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Bi-weekly')
   }, {
     id: MONTHLY,
-    getPeriods: getMonthlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getMonthlyPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Monthly')
   }, {
     id: BIMONTHLY,
-    getPeriods: getBiMonthlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getBiMonthlyPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Bi-monthly')
   }, {
     id: QUARTERLY,
-    getPeriods: getQuarterlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getQuarterlyPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Quarterly')
   }, {
     id: SIXMONTHLY,
-    getPeriods: getSixMonthlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getSixMonthlyPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Six-monthly')
   }, {
     id: SIXMONTHLYAPR,
-    getPeriods: getSixMonthlyAprilPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getSixMonthlyAprilPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Six-monthly April')
   }, {
     id: YEARLY,
-    getPeriods: getYearlyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getYearlyPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Yearly')
   }, {
     id: FYNOV,
-    getPeriods: getFinancialNovemberPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getFinancialNovemberPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Financial year (Start November)')
   }, {
     id: FYOCT,
-    getPeriods: getFinancialOctoberPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getFinancialOctoberPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Financial year (Start October)')
   }, {
     id: FYJUL,
-    getPeriods: getFinancialJulyPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getFinancialJulyPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Financial year (Start July)')
   }, {
     id: FYAPR,
-    getPeriods: getFinancialAprilPeriodType(filterFuturePeriods, calendar),
+    getPeriods: getFinancialAprilPeriodType(filterFuturePeriods, periodSettings),
     name: i18n.t('Financial year (Start April)')
   }];
 };
 
-export const getFixedPeriodsOptionsById = function (id) {
-  let calendar = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'gregory';
-  return getOptions(calendar).find(option => option.id === id);
+export const getFixedPeriodsOptionsById = (id, periodSettings) => {
+  return getOptions(periodSettings).find(option => option.id === id);
 };
 export const getFixedPeriodsOptions = () => getOptions();
 export const getYearOffsetFromNow = yearStr => parseInt(yearStr) - new Date(Date.now()).getFullYear();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "24.5.0-alpha.2",
+    "version": "24.5.0-alpha.3",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -48,11 +48,6 @@
         "styled-jsx": "^4.0.1",
         "typeface-roboto": "^0.0.75"
     },
-    "jest": {
-        "transformIgnorePatterns": [
-            "/!node_modules\\/multi-calendar-dates/"
-        ]
-    },
     "peerDependencies": {
         "@dhis2/app-runtime": "^3",
         "@dhis2/d2-i18n": "^1.1",
@@ -64,7 +59,7 @@
     },
     "dependencies": {
         "@dhis2/d2-ui-rich-text": "^7.4.0",
-        "@dhis2/multi-calendar-dates": "1.0.0-alpha.18",
+        "@dhis2/multi-calendar-dates": "1.0.0",
         "classnames": "^2.3.1",
         "d2-utilizr": "^0.2.16",
         "d3-color": "^1.2.3",