@dhis2/analytics 24.7.0 → 24.9.0-alpha.1

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

@@ -182,20 +182,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/__demo__/OrgUnitDimension.stories.js

@@ -91,6 +91,15 @@ storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple roots'
 
   });
 });
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Without user org units selection', () => {
+  const [selected, setSelected] = useState([]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    hideUserOrgUnits: true,
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
 storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level selector', () => {
   const [selected, setSelected] = useState([]);
   return /*#__PURE__*/React.createElement(OrgUnitDimension, {

package/build/es/components/OrgUnitDimension/OrgUnitDimension.js

@@ -19,6 +19,7 @@ const OrgUnitDimension = _ref => {
     onSelect,
     hideGroupSelect,
     hideLevelSelect,
+    hideUserOrgUnits,
     warning
   } = _ref;
   const [ouLevels, setOuLevels] = useState([]);
@@ -149,7 +150,7 @@ const OrgUnitDimension = _ref => {
 
   return /*#__PURE__*/React.createElement("div", {
     className: "jsx-".concat(styles.__hash) + " " + "container"
-  }, /*#__PURE__*/React.createElement("div", {
+  }, !hideUserOrgUnits && /*#__PURE__*/React.createElement("div", {
     className: "jsx-".concat(styles.__hash) + " " + "userOrgUnitsWrapper"
   }, /*#__PURE__*/React.createElement(Checkbox, {
     label: i18n.t('User organisation unit'),
@@ -266,11 +267,13 @@ const OrgUnitDimension = _ref => {
 
 OrgUnitDimension.defaultProps = {
   hideGroupSelect: false,
-  hideLevelSelect: false
+  hideLevelSelect: false,
+  hideUserOrgUnits: false
 };
 OrgUnitDimension.propTypes = {
   hideGroupSelect: PropTypes.bool,
   hideLevelSelect: PropTypes.bool,
+  hideUserOrgUnits: PropTypes.bool,
   roots: PropTypes.arrayOf(PropTypes.string),
   selected: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.string.isRequired,

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

@@ -2,6 +2,8 @@ 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';
 import React, { useState } from 'react';
@@ -16,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 {
@@ -25,9 +35,30 @@ const PeriodTransfer = _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 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(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,
@@ -49,7 +80,7 @@ const PeriodTransfer = _ref => {
   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))));
     }
   };
 
@@ -102,7 +133,7 @@ const PeriodTransfer = _ref => {
 
   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", {

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

@@ -1,6 +1,19 @@
 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;