@dhis2/analytics 29.3.0 → 29.3.2

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)({
@@ -152,7 +154,7 @@ const PeriodTransfer = ({
       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);
@@ -213,7 +215,7 @@ const PeriodTransfer = ({
   }, _DimensionSelectorStyle.default));
   const onSelectFixedPeriods = filter => {
     setFixedFilter(filter);
-    if (filter.year.match(/[0-9]{4}/)) {
+    if (filter.year.match(/\d{4}/)) {
       const selectedOption = filteredFixedOptions.find(opt => opt.id === filter.periodType);
       setUserPeriods((selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.getPeriods(fixedPeriodConfig(Number(filter.year)))) || []);
     }

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

@@ -8,7 +8,7 @@ describe('fixedPeriods utils', () => {
   describe('getOptions', () => {
     it('should return a list of available period ranges', () => {
       const periodIds = (0, _fixedPeriods.getFixedPeriodsOptions)().map(option => option.id);
-      expect(periodIds).toEqual(['DAILY', 'WEEKLY', 'WEEKLYWED', 'WEEKLYTHU', 'WEEKLYSAT', 'WEEKLYSUN', 'BIWEEKLY', 'MONTHLY', 'BIMONTHLY', 'QUARTERLY', 'SIXMONTHLY', 'SIXMONTHLYAPR', 'YEARLY', 'FYFEB', 'FYAPR', 'FYJUL', 'FYAUG', 'FYSEP', 'FYOCT', 'FYNOV']);
+      expect(periodIds).toEqual(['DAILY', 'WEEKLY', 'WEEKLYWED', 'WEEKLYTHU', 'WEEKLYFRI', 'WEEKLYSAT', 'WEEKLYSUN', 'BIWEEKLY', 'MONTHLY', 'BIMONTHLY', 'QUARTERLY', 'SIXMONTHLY', 'SIXMONTHLYAPR', 'YEARLY', 'FYFEB', 'FYAPR', 'FYJUL', 'FYAUG', 'FYSEP', 'FYOCT', 'FYNOV']);
     });
   });
   describe('Daily period generator', () => {

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

@@ -8,7 +8,7 @@ describe('utils', () => {
     it('should filter fixed periods', () => {
       const excludedPeriodTypes = ['DAILY', 'WEEKLY', 'WEEKLYSAT', 'MONTHLY', 'FYOCT'];
       const periodIds = (0, _index.filterPeriodTypesById)((0, _fixedPeriods.getFixedPeriodsOptions)(), excludedPeriodTypes).map(option => option.id);
-      expect(periodIds).toEqual(['WEEKLYWED', 'WEEKLYTHU', 'WEEKLYSUN', 'BIWEEKLY', 'BIMONTHLY', 'QUARTERLY', 'SIXMONTHLY', 'SIXMONTHLYAPR', 'YEARLY', 'FYFEB', 'FYAPR', 'FYJUL', 'FYAUG', 'FYSEP', 'FYNOV']);
+      expect(periodIds).toEqual(['WEEKLYWED', 'WEEKLYTHU', 'WEEKLYFRI', 'WEEKLYSUN', 'BIWEEKLY', 'BIMONTHLY', 'QUARTERLY', 'SIXMONTHLY', 'SIXMONTHLYAPR', 'YEARLY', 'FYFEB', 'FYAPR', 'FYJUL', 'FYAUG', 'FYSEP', 'FYNOV']);
     });
     it('should filter relative periods', () => {
       const excludedPeriodTypes = ['MONTHLY', 'BIMONTHLY'];

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

@@ -25,8 +25,10 @@ const v43Query = {
 
 // v43-only: analyticsFinancialYearStart is removed in v44
 const FY_SETTING_TO_SERVER_PT = {
+  FINANCIAL_YEAR_FEBRUARY: 'FinancialFeb',
   FINANCIAL_YEAR_APRIL: 'FinancialApril',
   FINANCIAL_YEAR_JULY: 'FinancialJuly',
+  FINANCIAL_YEAR_AUGUST: 'FinancialAug',
   FINANCIAL_YEAR_SEPTEMBER: 'FinancialSep',
   FINANCIAL_YEAR_OCTOBER: 'FinancialOct',
   FINANCIAL_YEAR_NOVEMBER: 'FinancialNov'

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

@@ -9,40 +9,48 @@ var _index = _interopRequireDefault(require("../../../locales/index.js"));
 var _index2 = require("./index.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const PERIOD_TYPE_REGEX = exports.PERIOD_TYPE_REGEX = {
-  [_index2.DAILY]: /^([0-9]{4})([0-9]{2})([0-9]{2})$/,
+  [_index2.DAILY]: /^(\d{4})(\d{2})(\d{2})$/,
   // YYYYMMDD
-  [_index2.WEEKLY]: /^([0-9]{4})()W([0-9]{1,2})$/,
+  [_index2.WEEKLY]: /^(\d{4})W(\d{1,2})$/,
   // YYYY"W"[1-53]
-  [_index2.BIWEEKLY]: /^([0-9]{4})BiW([0-9]{1,2})$/,
+  [_index2.BIWEEKLY]: /^(\d{4})BiW(\d{1,2})$/,
   // YYYY"BiW"[1-27]
-  [_index2.WEEKLYWED]: /^([0-9]{4})(Wed)W([0-9]{1,2})$/,
+  [_index2.WEEKLYWED]: /^(\d{4})(Wed)W(\d{1,2})$/,
   // YYYY"WedW"[1-53]
-  [_index2.WEEKLYTHU]: /^([0-9]{4})(Thu)W([0-9]{1,2})$/,
+  [_index2.WEEKLYTHU]: /^(\d{4})(Thu)W(\d{1,2})$/,
   // YYYY"ThuW"[1-53]
-  [_index2.WEEKLYSAT]: /^([0-9]{4})(Sat)W([0-9]{1,2})$/,
+  [_index2.WEEKLYFRI]: /^(\d{4})(Fri)W(\d{1,2})$/,
+  // YYYY"FriW"[1-53]
+  [_index2.WEEKLYSAT]: /^(\d{4})(Sat)W(\d{1,2})$/,
   // YYYY"SatW"[1-53]
-  [_index2.WEEKLYSUN]: /^([0-9]{4})(Sun)W([0-9]{1,2})$/,
+  [_index2.WEEKLYSUN]: /^(\d{4})(Sun)W(\d{1,2})$/,
   // YYYY"SunW"[1-53]
-  [_index2.MONTHLY]: /^([0-9]{4})([0-9]{2})$/,
+  [_index2.MONTHLY]: /^(\d{4})(\d{2})$/,
   // YYYYMM
-  [_index2.BIMONTHLY]: /^([0-9]{4})([0-9]{2})B$/,
+  [_index2.BIMONTHLY]: /^(\d{4})(\d{2})B$/,
   // YYYY0[1-6]"B"
-  [_index2.QUARTERLY]: /^([0-9]{4})Q([1234])$/,
+  [_index2.QUARTERLY]: /^(\d{4})Q([1234])$/,
   // YYYY"Q"[1-4]
-  [_index2.SIXMONTHLY]: /^([0-9]{4})S([12])$/,
+  [_index2.SIXMONTHLY]: /^(\d{4})S([12])$/,
   // YYYY"S"[1/2]
-  [_index2.SIXMONTHLYAPR]: /^([0-9]{4})AprilS([12])$/,
+  [_index2.SIXMONTHLYAPR]: /^(\d{4})AprilS([12])$/,
   // YYYY"AprilS"[1/2]
-  // [SIXMONTHLYNOV]: /^([0-9]{4})NovS([12])$/, // YYYY"NovS"[1/2] Not supported?
-  [_index2.YEARLY]: /^([0-9]{4})$/,
+  // [SIXMONTHLYNOV]: /^(\d{4})NovS([12])$/, // YYYY"NovS"[1/2] Not supported?
+  [_index2.YEARLY]: /^(\d{4})$/,
   // YYYY
-  [_index2.FYNOV]: /^([0-9]{4})Nov$/,
-  // YYYY"Nov"
-  [_index2.FYOCT]: /^([0-9]{4})Oct$/,
-  // YYYY"Oct"
-  [_index2.FYJUL]: /^([0-9]{4})July$/,
+  [_index2.FYFEB]: /^(\d{4})Feb$/,
+  // YYYY"Feb"
+  [_index2.FYAPR]: /^(\d{4})April$/,
+  // YYYY"April"
+  [_index2.FYJUL]: /^(\d{4})July$/,
   // YYYY"July"
-  [_index2.FYAPR]: /^([0-9]{4})April$/ // YYYY"April"
+  [_index2.FYAUG]: /^(\d{4})Aug$/,
+  // YYYY"Aug"
+  [_index2.FYSEP]: /^(\d{4})Sep$/,
+  // YYYY"Sep"
+  [_index2.FYOCT]: /^(\d{4})Oct$/,
+  // YYYY"Oct"
+  [_index2.FYNOV]: /^(\d{4})Nov$/ // YYYY"Nov"
 };
 const getPeriods = ({
   periodType,
@@ -207,6 +215,12 @@ const getOptions = periodSettings => {
       startDay: 4
     }, filterFuturePeriods, periodSettings),
     name: _index.default.t('Weekly (Start Thursday)')
+  }, {
+    id: _index2.WEEKLYFRI,
+    getPeriods: getWeeklyPeriodType({
+      startDay: 5
+    }, filterFuturePeriods, periodSettings),
+    name: _index.default.t('Weekly (Start Friday)')
   }, {
     id: _index2.WEEKLYSAT,
     getPeriods: getWeeklyPeriodType({

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

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.filterPeriodTypesById = exports.YEARLY = exports.WEEKS_THIS_YEAR = exports.WEEKLYWED = exports.WEEKLYTHU = exports.WEEKLYSUN = exports.WEEKLYSAT = exports.WEEKLY = exports.SIXMONTHLYAPR = exports.SIXMONTHLY = exports.QUARTERLY = exports.MONTHLY = exports.FYSEP = exports.FYOCT = exports.FYNOV = exports.FYJUL = exports.FYFEB = exports.FYAUG = exports.FYAPR = exports.FINANCIAL = exports.DAILY = exports.BIWEEKLY = exports.BIMONTHLY = void 0;
+exports.filterPeriodTypesById = exports.YEARLY = exports.WEEKS_THIS_YEAR = exports.WEEKLYWED = exports.WEEKLYTHU = exports.WEEKLYSUN = exports.WEEKLYSAT = exports.WEEKLYFRI = exports.WEEKLY = exports.SIXMONTHLYAPR = exports.SIXMONTHLY = exports.QUARTERLY = exports.MONTHLY = exports.FYSEP = exports.FYOCT = exports.FYNOV = exports.FYJUL = exports.FYFEB = exports.FYAUG = exports.FYAPR = exports.FINANCIAL = exports.DAILY = exports.BIWEEKLY = exports.BIMONTHLY = void 0;
 const DAILY = exports.DAILY = 'DAILY';
 const WEEKLY = exports.WEEKLY = 'WEEKLY';
 const WEEKLYWED = exports.WEEKLYWED = 'WEEKLYWED';
 const WEEKLYTHU = exports.WEEKLYTHU = 'WEEKLYTHU';
+const WEEKLYFRI = exports.WEEKLYFRI = 'WEEKLYFRI';
 const WEEKLYSAT = exports.WEEKLYSAT = 'WEEKLYSAT';
 const WEEKLYSUN = exports.WEEKLYSUN = 'WEEKLYSUN';
 const WEEKS_THIS_YEAR = exports.WEEKS_THIS_YEAR = 'WEEKS_THIS_YEAR';

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/cjs/locales/en/translations.json

@@ -265,6 +265,7 @@
     "Weekly": "Weekly",
     "Weekly (Start Wednesday)": "Weekly (Start Wednesday)",
     "Weekly (Start Thursday)": "Weekly (Start Thursday)",
+    "Weekly (Start Friday)": "Weekly (Start Friday)",
     "Weekly (Start Saturday)": "Weekly (Start Saturday)",
     "Weekly (Start Sunday)": "Weekly (Start Sunday)",
     "Bi-weekly": "Bi-weekly",

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({
@@ -144,7 +146,7 @@ const PeriodTransfer = ({
       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);
@@ -205,7 +207,7 @@ const PeriodTransfer = ({
   }, styles));
   const onSelectFixedPeriods = filter => {
     setFixedFilter(filter);
-    if (filter.year.match(/[0-9]{4}/)) {
+    if (filter.year.match(/\d{4}/)) {
       const selectedOption = filteredFixedOptions.find(opt => opt.id === filter.periodType);
       setUserPeriods((selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.getPeriods(fixedPeriodConfig(Number(filter.year)))) || []);
     }

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

@@ -6,7 +6,7 @@ describe('fixedPeriods utils', () => {
   describe('getOptions', () => {
     it('should return a list of available period ranges', () => {
       const periodIds = getFixedPeriodsOptions().map(option => option.id);
-      expect(periodIds).toEqual(['DAILY', 'WEEKLY', 'WEEKLYWED', 'WEEKLYTHU', 'WEEKLYSAT', 'WEEKLYSUN', 'BIWEEKLY', 'MONTHLY', 'BIMONTHLY', 'QUARTERLY', 'SIXMONTHLY', 'SIXMONTHLYAPR', 'YEARLY', 'FYFEB', 'FYAPR', 'FYJUL', 'FYAUG', 'FYSEP', 'FYOCT', 'FYNOV']);
+      expect(periodIds).toEqual(['DAILY', 'WEEKLY', 'WEEKLYWED', 'WEEKLYTHU', 'WEEKLYFRI', 'WEEKLYSAT', 'WEEKLYSUN', 'BIWEEKLY', 'MONTHLY', 'BIMONTHLY', 'QUARTERLY', 'SIXMONTHLY', 'SIXMONTHLYAPR', 'YEARLY', 'FYFEB', 'FYAPR', 'FYJUL', 'FYAUG', 'FYSEP', 'FYOCT', 'FYNOV']);
     });
   });
   describe('Daily period generator', () => {

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

@@ -6,7 +6,7 @@ describe('utils', () => {
     it('should filter fixed periods', () => {
       const excludedPeriodTypes = ['DAILY', 'WEEKLY', 'WEEKLYSAT', 'MONTHLY', 'FYOCT'];
       const periodIds = filterPeriodTypesById(getFixedPeriodsOptions(), excludedPeriodTypes).map(option => option.id);
-      expect(periodIds).toEqual(['WEEKLYWED', 'WEEKLYTHU', 'WEEKLYSUN', 'BIWEEKLY', 'BIMONTHLY', 'QUARTERLY', 'SIXMONTHLY', 'SIXMONTHLYAPR', 'YEARLY', 'FYFEB', 'FYAPR', 'FYJUL', 'FYAUG', 'FYSEP', 'FYNOV']);
+      expect(periodIds).toEqual(['WEEKLYWED', 'WEEKLYTHU', 'WEEKLYFRI', 'WEEKLYSUN', 'BIWEEKLY', 'BIMONTHLY', 'QUARTERLY', 'SIXMONTHLY', 'SIXMONTHLYAPR', 'YEARLY', 'FYFEB', 'FYAPR', 'FYJUL', 'FYAUG', 'FYSEP', 'FYNOV']);
     });
     it('should filter relative periods', () => {
       const excludedPeriodTypes = ['MONTHLY', 'BIMONTHLY'];

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

@@ -19,8 +19,10 @@ const v43Query = {
 
 // v43-only: analyticsFinancialYearStart is removed in v44
 const FY_SETTING_TO_SERVER_PT = {
+  FINANCIAL_YEAR_FEBRUARY: 'FinancialFeb',
   FINANCIAL_YEAR_APRIL: 'FinancialApril',
   FINANCIAL_YEAR_JULY: 'FinancialJuly',
+  FINANCIAL_YEAR_AUGUST: 'FinancialAug',
   FINANCIAL_YEAR_SEPTEMBER: 'FinancialSep',
   FINANCIAL_YEAR_OCTOBER: 'FinancialOct',
   FINANCIAL_YEAR_NOVEMBER: 'FinancialNov'

package/build/es/components/PeriodDimension/utils/fixedPeriods.js

@@ -1,41 +1,49 @@
 import { generateFixedPeriods, getNowInCalendar } from '@dhis2/multi-calendar-dates';
 import i18n from '../../../locales/index.js';
-import { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FYFEB, FYAPR, FYJUL, FYAUG, FYSEP, FYOCT, FYNOV } from './index.js';
+import { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYFRI, WEEKLYSAT, WEEKLYSUN, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FYFEB, FYAPR, FYJUL, FYAUG, FYSEP, FYOCT, FYNOV } from './index.js';
 export const PERIOD_TYPE_REGEX = {
-  [DAILY]: /^([0-9]{4})([0-9]{2})([0-9]{2})$/,
+  [DAILY]: /^(\d{4})(\d{2})(\d{2})$/,
   // YYYYMMDD
-  [WEEKLY]: /^([0-9]{4})()W([0-9]{1,2})$/,
+  [WEEKLY]: /^(\d{4})W(\d{1,2})$/,
   // YYYY"W"[1-53]
-  [BIWEEKLY]: /^([0-9]{4})BiW([0-9]{1,2})$/,
+  [BIWEEKLY]: /^(\d{4})BiW(\d{1,2})$/,
   // YYYY"BiW"[1-27]
-  [WEEKLYWED]: /^([0-9]{4})(Wed)W([0-9]{1,2})$/,
+  [WEEKLYWED]: /^(\d{4})(Wed)W(\d{1,2})$/,
   // YYYY"WedW"[1-53]
-  [WEEKLYTHU]: /^([0-9]{4})(Thu)W([0-9]{1,2})$/,
+  [WEEKLYTHU]: /^(\d{4})(Thu)W(\d{1,2})$/,
   // YYYY"ThuW"[1-53]
-  [WEEKLYSAT]: /^([0-9]{4})(Sat)W([0-9]{1,2})$/,
+  [WEEKLYFRI]: /^(\d{4})(Fri)W(\d{1,2})$/,
+  // YYYY"FriW"[1-53]
+  [WEEKLYSAT]: /^(\d{4})(Sat)W(\d{1,2})$/,
   // YYYY"SatW"[1-53]
-  [WEEKLYSUN]: /^([0-9]{4})(Sun)W([0-9]{1,2})$/,
+  [WEEKLYSUN]: /^(\d{4})(Sun)W(\d{1,2})$/,
   // YYYY"SunW"[1-53]
-  [MONTHLY]: /^([0-9]{4})([0-9]{2})$/,
+  [MONTHLY]: /^(\d{4})(\d{2})$/,
   // YYYYMM
-  [BIMONTHLY]: /^([0-9]{4})([0-9]{2})B$/,
+  [BIMONTHLY]: /^(\d{4})(\d{2})B$/,
   // YYYY0[1-6]"B"
-  [QUARTERLY]: /^([0-9]{4})Q([1234])$/,
+  [QUARTERLY]: /^(\d{4})Q([1234])$/,
   // YYYY"Q"[1-4]
-  [SIXMONTHLY]: /^([0-9]{4})S([12])$/,
+  [SIXMONTHLY]: /^(\d{4})S([12])$/,
   // YYYY"S"[1/2]
-  [SIXMONTHLYAPR]: /^([0-9]{4})AprilS([12])$/,
+  [SIXMONTHLYAPR]: /^(\d{4})AprilS([12])$/,
   // YYYY"AprilS"[1/2]
-  // [SIXMONTHLYNOV]: /^([0-9]{4})NovS([12])$/, // YYYY"NovS"[1/2] Not supported?
-  [YEARLY]: /^([0-9]{4})$/,
+  // [SIXMONTHLYNOV]: /^(\d{4})NovS([12])$/, // YYYY"NovS"[1/2] Not supported?
+  [YEARLY]: /^(\d{4})$/,
   // YYYY
-  [FYNOV]: /^([0-9]{4})Nov$/,
-  // YYYY"Nov"
-  [FYOCT]: /^([0-9]{4})Oct$/,
-  // YYYY"Oct"
-  [FYJUL]: /^([0-9]{4})July$/,
+  [FYFEB]: /^(\d{4})Feb$/,
+  // YYYY"Feb"
+  [FYAPR]: /^(\d{4})April$/,
+  // YYYY"April"
+  [FYJUL]: /^(\d{4})July$/,
   // YYYY"July"
-  [FYAPR]: /^([0-9]{4})April$/ // YYYY"April"
+  [FYAUG]: /^(\d{4})Aug$/,
+  // YYYY"Aug"
+  [FYSEP]: /^(\d{4})Sep$/,
+  // YYYY"Sep"
+  [FYOCT]: /^(\d{4})Oct$/,
+  // YYYY"Oct"
+  [FYNOV]: /^(\d{4})Nov$/ // YYYY"Nov"
 };
 const getPeriods = ({
   periodType,
@@ -200,6 +208,12 @@ const getOptions = periodSettings => {
       startDay: 4
     }, filterFuturePeriods, periodSettings),
     name: i18n.t('Weekly (Start Thursday)')
+  }, {
+    id: WEEKLYFRI,
+    getPeriods: getWeeklyPeriodType({
+      startDay: 5
+    }, filterFuturePeriods, periodSettings),
+    name: i18n.t('Weekly (Start Friday)')
   }, {
     id: WEEKLYSAT,
     getPeriods: getWeeklyPeriodType({

package/build/es/components/PeriodDimension/utils/index.js

@@ -2,6 +2,7 @@ export const DAILY = 'DAILY';
 export const WEEKLY = 'WEEKLY';
 export const WEEKLYWED = 'WEEKLYWED';
 export const WEEKLYTHU = 'WEEKLYTHU';
+export const WEEKLYFRI = 'WEEKLYFRI';
 export const WEEKLYSAT = 'WEEKLYSAT';
 export const WEEKLYSUN = 'WEEKLYSUN';
 export const WEEKS_THIS_YEAR = 'WEEKS_THIS_YEAR';

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/build/es/locales/en/translations.json

@@ -265,6 +265,7 @@
     "Weekly": "Weekly",
     "Weekly (Start Wednesday)": "Weekly (Start Wednesday)",
     "Weekly (Start Thursday)": "Weekly (Start Thursday)",
+    "Weekly (Start Friday)": "Weekly (Start Friday)",
     "Weekly (Start Saturday)": "Weekly (Start Saturday)",
     "Weekly (Start Sunday)": "Weekly (Start Sunday)",
     "Bi-weekly": "Bi-weekly",

package/package.json

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