@dhis2/analytics 29.3.1 → 29.3.3

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

@@ -82,9 +82,11 @@ const PeriodTransfer = ({
     } else {
       const allFixed = (0, _fixedPeriods.getFixedPeriodsOptions)(periodsSettings);
       const allRelative = (0, _relativePeriods.getRelativePeriodsOptions)();
+      const v43PeriodTypes = [_index2.WEEKLYFRI, _index2.FYFEB, _index2.FYAUG, _index2.FYSEP];
+      const allExcludedPeriodTypes = [...excludedPeriodTypes, ...v43PeriodTypes];
       return {
-        filteredFixedOptions: (0, _index2.filterPeriodTypesById)(allFixed, excludedPeriodTypes),
-        filteredRelativeOptions: (0, _index2.filterPeriodTypesById)(allRelative, excludedPeriodTypes)
+        filteredFixedOptions: (0, _index2.filterPeriodTypesById)(allFixed, allExcludedPeriodTypes),
+        filteredRelativeOptions: (0, _index2.filterPeriodTypesById)(allRelative, allExcludedPeriodTypes)
       };
     }
   }, [supportsEnabledPeriodTypes, enabledPeriodTypesData, excludedPeriodTypes, periodsSettings]);
@@ -103,11 +105,11 @@ const PeriodTransfer = ({
   // 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 => ({
+  const fixedPeriodConfig = (0, _react.useCallback)(year => ({
     offset: year - defaultFixedPeriodYear,
     filterFuturePeriods: false,
     reversePeriods: false
-  });
+  }), [defaultFixedPeriodYear]);
   const [userPeriods, setUserPeriods] = (0, _react.useState)(null);
   const [isRelative, setIsRelative] = (0, _react.useState)(true);
   const [relativeFilter, setRelativeFilter] = (0, _react.useState)({
@@ -149,10 +151,13 @@ const PeriodTransfer = ({
       const opt = filteredRelativeOptions.find(o => o.id === effectiveRelativeFilterType);
       return (opt === null || opt === void 0 ? void 0 : opt.getPeriods()) || [];
     } else {
+      if (!/\d{4}/.test(fixedFilter.year)) {
+        return [];
+      }
       const opt = filteredFixedOptions.find(o => o.id === effectiveFixedFilterType);
       return (opt === null || opt === void 0 ? void 0 : opt.getPeriods(fixedPeriodConfig(Number(fixedFilter.year)))) || [];
     }
-  }, [isRelative, effectiveRelativeFilterType, effectiveFixedFilterType, filteredRelativeOptions, filteredFixedOptions, fixedFilter.year]);
+  }, [isRelative, effectiveRelativeFilterType, effectiveFixedFilterType, filteredRelativeOptions, filteredFixedOptions, fixedFilter.year, fixedPeriodConfig]);
   const allPeriods = userPeriods !== null && userPeriods !== void 0 ? userPeriods : derivedPeriods;
   const isActive = value => {
     const item = selectedItems.find(item => item.id === value);

package/build/cjs/index.js

@@ -241,6 +241,7 @@ var _exportNames = {
   WEEKLY: true,
   WEEKLYWED: true,
   WEEKLYTHU: true,
+  WEEKLYFRI: true,
   WEEKLYSAT: true,
   WEEKLYSUN: true,
   WEEKS_THIS_YEAR: true,
@@ -252,10 +253,13 @@ var _exportNames = {
   SIXMONTHLYAPR: true,
   YEARLY: true,
   FINANCIAL: true,
-  FYNOV: true,
-  FYOCT: true,
-  FYJUL: true,
+  FYFEB: true,
   FYAPR: true,
+  FYJUL: true,
+  FYAUG: true,
+  FYSEP: true,
+  FYOCT: true,
+  FYNOV: true,
   getRelativePeriodsOptionsById: true,
   getRelativePeriodsName: true,
   getRelativePeriodsDetails: true,
@@ -707,6 +711,18 @@ Object.defineProperty(exports, "FYAPR", {
     return _index12.FYAPR;
   }
 });
+Object.defineProperty(exports, "FYAUG", {
+  enumerable: true,
+  get: function () {
+    return _index12.FYAUG;
+  }
+});
+Object.defineProperty(exports, "FYFEB", {
+  enumerable: true,
+  get: function () {
+    return _index12.FYFEB;
+  }
+});
 Object.defineProperty(exports, "FYJUL", {
   enumerable: true,
   get: function () {
@@ -725,6 +741,12 @@ Object.defineProperty(exports, "FYOCT", {
     return _index12.FYOCT;
   }
 });
+Object.defineProperty(exports, "FYSEP", {
+  enumerable: true,
+  get: function () {
+    return _index12.FYSEP;
+  }
+});
 Object.defineProperty(exports, "FileMenu", {
   enumerable: true,
   get: function () {
@@ -1313,6 +1335,12 @@ Object.defineProperty(exports, "WEEKLY", {
     return _index12.WEEKLY;
   }
 });
+Object.defineProperty(exports, "WEEKLYFRI", {
+  enumerable: true,
+  get: function () {
+    return _index12.WEEKLYFRI;
+  }
+});
 Object.defineProperty(exports, "WEEKLYSAT", {
   enumerable: true,
   get: function () {

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

@@ -3,7 +3,7 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 import { getNowInCalendar } from '@dhis2/multi-calendar-dates';
 import { IconInfo16, NoticeBox, TabBar, Tab, Transfer } from '@dhis2/ui';
 import PropTypes from 'prop-types';
-import React, { useRef, useState, useMemo } from 'react';
+import React, { useCallback, useRef, useState, useMemo } from 'react';
 import PeriodIcon from '../../assets/DimensionItemIcons/PeriodIcon.js'; //TODO: Reimplement the icon.js
 import i18n from '../../locales/index.js';
 import { TRANSFER_HEIGHT, TRANSFER_OPTIONS_WIDTH, TRANSFER_SELECTED_WIDTH } from '../../modules/dimensionSelectorHelper.js';
@@ -13,7 +13,7 @@ import FixedPeriodFilter from './FixedPeriodFilter.js';
 import RelativePeriodFilter from './RelativePeriodFilter.js';
 import { applyDisplayLabelOverrides, applyFixedPeriodTypeDisplayLabels, filterEnabledFixedPeriodTypes, filterEnabledRelativePeriodTypes } from './utils/enabledPeriodTypes.js';
 import { getFixedPeriodsOptions } from './utils/fixedPeriods.js';
-import { MONTHLY, QUARTERLY, filterPeriodTypesById } from './utils/index.js';
+import { FYFEB, FYAUG, FYSEP, MONTHLY, QUARTERLY, WEEKLYFRI, filterPeriodTypesById } from './utils/index.js';
 import { getRelativePeriodsOptions } from './utils/relativePeriods.js';
 const RightHeader = ({
   infoBoxMessage
@@ -74,9 +74,11 @@ const PeriodTransfer = ({
     } else {
       const allFixed = getFixedPeriodsOptions(periodsSettings);
       const allRelative = getRelativePeriodsOptions();
+      const v43PeriodTypes = [WEEKLYFRI, FYFEB, FYAUG, FYSEP];
+      const allExcludedPeriodTypes = [...excludedPeriodTypes, ...v43PeriodTypes];
       return {
-        filteredFixedOptions: filterPeriodTypesById(allFixed, excludedPeriodTypes),
-        filteredRelativeOptions: filterPeriodTypesById(allRelative, excludedPeriodTypes)
+        filteredFixedOptions: filterPeriodTypesById(allFixed, allExcludedPeriodTypes),
+        filteredRelativeOptions: filterPeriodTypesById(allRelative, allExcludedPeriodTypes)
       };
     }
   }, [supportsEnabledPeriodTypes, enabledPeriodTypesData, excludedPeriodTypes, periodsSettings]);
@@ -95,11 +97,11 @@ const PeriodTransfer = ({
   // 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 => ({
+  const fixedPeriodConfig = useCallback(year => ({
     offset: year - defaultFixedPeriodYear,
     filterFuturePeriods: false,
     reversePeriods: false
-  });
+  }), [defaultFixedPeriodYear]);
   const [userPeriods, setUserPeriods] = useState(null);
   const [isRelative, setIsRelative] = useState(true);
   const [relativeFilter, setRelativeFilter] = useState({
@@ -141,10 +143,13 @@ const PeriodTransfer = ({
       const opt = filteredRelativeOptions.find(o => o.id === effectiveRelativeFilterType);
       return (opt === null || opt === void 0 ? void 0 : opt.getPeriods()) || [];
     } else {
+      if (!/\d{4}/.test(fixedFilter.year)) {
+        return [];
+      }
       const opt = filteredFixedOptions.find(o => o.id === effectiveFixedFilterType);
       return (opt === null || opt === void 0 ? void 0 : opt.getPeriods(fixedPeriodConfig(Number(fixedFilter.year)))) || [];
     }
-  }, [isRelative, effectiveRelativeFilterType, effectiveFixedFilterType, filteredRelativeOptions, filteredFixedOptions, fixedFilter.year]);
+  }, [isRelative, effectiveRelativeFilterType, effectiveFixedFilterType, filteredRelativeOptions, filteredFixedOptions, fixedFilter.year, fixedPeriodConfig]);
   const allPeriods = userPeriods !== null && userPeriods !== void 0 ? userPeriods : derivedPeriods;
   const isActive = value => {
     const item = selectedItems.find(item => item.id === value);

package/build/es/index.js

@@ -145,7 +145,7 @@ export { transformResponse as transformEventAggregateResponse } from './modules/
 export { COLOR_SET_DEFAULT, COLOR_SET_BASIC, COLOR_SET_EXTENDED, COLOR_SET_BRIGHT, COLOR_SET_DARK, COLOR_SET_GRAY, COLOR_SET_COLOR_BLIND, COLOR_SET_PATTERNS, colorSets } from './visualizations/util/colors/colorSets.js';
 
 // Utils: periods
-export { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, WEEKS_THIS_YEAR, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FINANCIAL, FYNOV, FYOCT, FYJUL, FYAPR } from './components/PeriodDimension/utils/index.js';
+export { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYFRI, WEEKLYSAT, WEEKLYSUN, WEEKS_THIS_YEAR, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FINANCIAL, FYFEB, FYAPR, FYJUL, FYAUG, FYSEP, FYOCT, FYNOV } from './components/PeriodDimension/utils/index.js';
 export { getRelativePeriodsOptionsById, getRelativePeriodsName, getRelativePeriodsDetails } from './components/PeriodDimension/utils/relativePeriods.js';
 export { getFixedPeriodsOptionsById, PERIOD_TYPE_REGEX } from './components/PeriodDimension/utils/fixedPeriods.js';
 export { default as VisualizationOptions } from './components/Options/VisualizationOptions.js';

package/package.json

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