@sis-cc/dotstatsuite-visions 12.48.0 → 12.50.0

package/es/CollapseButtons/CollapseButtons.js

@@ -64,6 +64,7 @@ var CollapseButtons = function CollapseButtons(props) {
       toggleId = _useState[0],
       setIsOpen = _useState[1];
 
+  var mapIndexed = R.addIndex(R.map);
   var collapseFactory = function collapseFactory(_ref) {
     var action = _ref.action,
         isSecondLevelClikable = _ref.isSecondLevelClikable,
@@ -77,6 +78,7 @@ var CollapseButtons = function CollapseButtons(props) {
       return React.createElement(
         Collapse,
         {
+          key: id,
           'in': toggleId === id,
           timeout: 'auto',
           unmountOnExit: true,
@@ -85,9 +87,9 @@ var CollapseButtons = function CollapseButtons(props) {
         React.createElement(
           Paper,
           { elevation: 10, isMobileView: isMobileView },
-          R.map(function (item) {
+          mapIndexed(function (item, index) {
             return React.createElement(Item, {
-              key: R.prop('id')(item),
+              key: index + '-' + R.prop('id')(item),
               testId: testId + '_' + id + '_value_' + R.prop('id')(item),
               parentId: id,
               item: item,
@@ -112,14 +114,21 @@ var CollapseButtons = function CollapseButtons(props) {
       className: cx((_cx = {}, _cx[classes.container] = accessibility, _cx)),
       tabIndex: 0
     },
-    R.map(function (_ref3) {
+    mapIndexed(function (_ref3, index) {
       var id = _ref3.id,
           label = _ref3.label,
           _ref3$values = _ref3.values,
           values = _ref3$values === undefined ? [] : _ref3$values;
       return React.createElement(
         Grid,
-        _extends({ item: true, xs: 12, sm: 12, md: R.nth(nbColumns)(COLUMNS) }, gridButtonsProps, { key: id }),
+        _extends({
+          item: true,
+          xs: 12,
+          sm: 12,
+          md: R.nth(nbColumns)(COLUMNS)
+        }, gridButtonsProps, {
+          key: index + '::' + id
+        }),
         React.createElement(
           Typography,
           { variant: 'h3' },

package/es/CollapseButtons/Item.js

@@ -58,7 +58,7 @@ var Item = function Item(_ref) {
       labelAccessor = _ref.labelAccessor;
 
   var classes = useStyles();
-
+  var mapIndexed = R.addIndex(R.map);
   return React.createElement(
     Grid,
     { className: classes.paperItem },
@@ -95,13 +95,13 @@ var Item = function Item(_ref) {
           React.createElement(
             'span',
             { className: classes.itemSubtitle },
-            R.map(function (subtopic) {
+            mapIndexed(function (subtopic, index) {
               if (R.not(R.is(Object)(subtopic))) return subtopic;
               if (R.not(isSecondLevelClikable)) return labelAccessor(subtopic, parentId);
               var id = R.prop('id')(subtopic);
               return React.createElement(
                 Typography,
-                { variant: 'h5', key: id },
+                { variant: 'h5', key: id + '::' + index },
                 React.createElement(
                   Link,
                   {

package/es/CollapseButtons/Paper.js

@@ -28,12 +28,16 @@ var CustomPaper = function CustomPaper(_ref) {
   var _cx, _cx2;
 
   var isMobileView = _ref.isMobileView,
-      children = _ref.children;
+      children = _ref.children,
+      onClose = _ref.onClose;
 
   var classes = useStyles();
   return React.createElement(
     Paper,
     {
+      onKeyDown: function onKeyDown(e) {
+        if (e.key === 'Escape') onClose();
+      },
       classes: {
         root: cx(classes.paper, (_cx = {}, _cx[classes.mobileView] = isMobileView, _cx))
       }

package/es/CollapsibleTree/CollapsibleTree.js

@@ -113,7 +113,8 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
           endIcon: isAllOpen ? React.createElement(KeyboardArrowUpIcon, { color: 'primary' }) : React.createElement(KeyboardArrowDownIcon, { color: 'primary' }),
           onClick: function onClick() {
             return handleCollapse(isAllOpen);
-          }
+          },
+          tabIndex: 0
         },
         buttonAllOpenLabel
       ),

package/es/PeriodPicker/PeriodPicker.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import * as R from 'ramda';
 import PropTypes from 'prop-types';
-import dateFns from 'date-fns';
+import { compareAsc, compareDesc, isSameYear } from 'date-fns';
 import Grid from '@mui/material/Grid';
 import Typography from '@mui/material/Typography';
 import { numeralFormat } from './lib';
@@ -65,13 +65,13 @@ var Period = function Period(_ref) {
           availableEnd = availableBoundaries[1];
 
       if (id === 'year') {
-        if (dateFns.isSameYear(date, availableStart)) {
+        if (isSameYear(date, availableStart)) {
           date = availableStart;
-        } else if (dateFns.isSameYear(date, availableEnd)) {
+        } else if (isSameYear(date, availableEnd)) {
           date = availableEnd;
         }
       }
-      return dateFns.compareAsc(date, availableStart) === -1 || dateFns.compareDesc(date, availableEnd) === -1;
+      return compareAsc(date, availableStart) === -1 || compareDesc(date, availableEnd) === -1;
     };
   };
   var onChangePeriod = function onChangePeriod(getter, id) {

package/es/PeriodPicker/lib.js

@@ -3,14 +3,14 @@ var _numeralFormat;
 var _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; };
 
 import * as R from 'ramda';
-import dateFns from 'date-fns';
+import { addDays, addMonths, addQuarters, addWeeks, closestTo, endOfISOWeek, endOfISOWeekYear, format, getDaysInMonth, getISOWeeksInYear, getMonth, getYear, isWithinInterval, parseISO, startOfISOWeek, startOfISOWeekYear, startOfYear } from 'date-fns';
 import numeral from 'numeral';
 import { YEAR, SEMESTER, QUARTER, MONTH, WEEK, DAY, HOUR, FULL_HOUR, MINUTE, YEARS, SEMESTERS, QUARTERS, MONTHS, WEEKS, DAYS, FULL_HOURS, HOURS, MINUTES, layoutFrequencies, frequencies, defaultOutputValues, formatOrder, defaultfreq } from './constants';
 
 var isWeekInPreviousYear = function isWeekInPreviousYear(date) {
-  var startIsoWeek = dateFns.startOfISOWeek(date);
+  var startIsoWeek = startOfISOWeek(date);
   return R.pipe(R.times(function (n) {
-    return dateFns.getYear(dateFns.addDays(startIsoWeek, n));
+    return getYear(addDays(startIsoWeek, n));
   }), R.uniq, R.length, R.equals(1))(4);
 };
 var supportedFrequenciesKey = R.keys(layoutFrequencies);
@@ -18,7 +18,7 @@ var dec = R.ifElse(R.gte(0), R.identity, R.dec);
 var addSemesters = function addSemesters() {
   var semester = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
   return function (date) {
-    return dateFns.addMonths(date, R.multiply(6)(dec(Number(semester))));
+    return addMonths(date, R.multiply(6)(dec(Number(semester))));
   };
 };
 var getSemesterValue = R.ifElse(R.pipe(Number, R.inc, R.gte(6)), R.always(1), R.always(2));
@@ -35,15 +35,23 @@ var setRange = function setRange(range) {
     return R.pipe(getRanges, R.prepend(R.prop(prop)(defaultOutputValues)))(R.prop(prop)(range));
   };
 };
-
+// export const getDestructuringDate = date =>
+//   R.pipe(
+//     date => format(date, 'yyyy M d H m HH Q I [S]'),
+//     R.replace(/S/, R.pipe(date => getMonth(date), getSemesterValue)(date)),
+//     R.split(' '),
+//     R.ifElse(v => R.equals(R.length(formatOrder), R.length(v)), R.map(Number), R.empty),
+//   )(date);
 export var getDestructuringDate = function getDestructuringDate(date) {
-  return R.pipe(function (date) {
-    return dateFns.format(date, 'YYYY M D H m H Q W [S]');
-  }, R.replace(/S/, R.pipe(function (date) {
-    return dateFns.getMonth(date);
-  }, getSemesterValue)(date)), R.split(' '), R.ifElse(function (v) {
+  if (!date || isNaN(new Date(date))) return [];
+  var validDate = typeof date === 'string' ? parseISO(date) : date;
+  return R.pipe(function (d) {
+    var semester = getSemesterValue(getMonth(d));
+    var formatted = format(d, 'yyyy M d H m HH Q I');
+    return formatted + ' ' + semester;
+  }, R.split(' '), R.ifElse(function (v) {
     return R.equals(R.length(formatOrder), R.length(v));
-  }, R.map(Number), R.empty))(date);
+  }, R.map(Number), R.empty))(validDate);
 };
 
 var updateLimit = function updateLimit(value, isSamePeriod, defaultValue) {
@@ -94,28 +102,28 @@ export var getRange = R.curry(function (boundaries, date) {
 
   var hoursRange = R.addIndex(R.map)(function (value, index) {
     var isSamePeriod = R.all(R.identity)([R.nth(index, equalsDays), R.nth(index, equalsMonths), R.nth(index, equalsYears)]);
-    return updateLimit(R.nth(index)(hours), isSamePeriod, value);
+    return updateLimit(R.nth(index, hours), isSamePeriod, value);
   })([0, 23]);
 
   return _ref4 = {}, _ref4[YEARS] = years, _ref4[HOURS] = hoursRange, _ref4[FULL_HOURS] = hoursRange, _ref4[MONTHS] = R.addIndex(R.map)(function (value, index) {
     return updateLimit(R.nth(index)(months), R.nth(index, equalsYears), value);
   })([1, 12]), _ref4[WEEKS] = R.addIndex(R.map)(function (value, index) {
     return updateLimit(R.nth(index)(weeks), R.nth(index, equalsYears), value);
-  })([1, dateFns.getISOWeeksInYear(date)]), _ref4[SEMESTERS] = R.addIndex(R.map)(function (value, index) {
+  })([1, getISOWeeksInYear(date)]), _ref4[SEMESTERS] = R.addIndex(R.map)(function (value, index) {
     return updateLimit(R.nth(index)(semesters), R.nth(index, equalsYears), value);
   })([1, 2]), _ref4[QUARTERS] = R.addIndex(R.map)(function (value, index) {
     return updateLimit(R.nth(index)(quarters), R.nth(index, equalsYears), value);
   })([1, 4]), _ref4[DAYS] = R.addIndex(R.map)(function (value, index) {
     var isSamePeriod = R.and(R.nth(index, equalsMonths), R.nth(index, equalsYears));
     return updateLimit(R.nth(index)(days), isSamePeriod, value);
-  })([1, dateFns.getDaysInMonth(date)]), _ref4[MINUTES] = R.addIndex(R.map)(function (value, index) {
+  })([1, getDaysInMonth(date)]), _ref4[MINUTES] = R.addIndex(R.map)(function (value, index) {
     var isSamePeriod = R.all(R.identity)([R.nth(index, R.prop('hours')(listEqualsValueFromDate)), R.nth(index, equalsDays), R.nth(index, equalsMonths), R.nth(index, equalsYears)]);
     return updateLimit(R.nth(index)(minutes), isSamePeriod, value);
   })([0, 59]), _ref4;
 });
 
 export var getAjustedDate = function getAjustedDate(frequency) {
-  return R.when(R.always(R.or(R.equals('W', frequency), R.equals('B', frequency))), R.ifElse(isWeekInPreviousYear, dateFns.startOfISOWeek, dateFns.endOfISOWeek));
+  return R.when(R.always(R.or(R.equals('W', frequency), R.equals('B', frequency))), R.ifElse(isWeekInPreviousYear, startOfISOWeek, endOfISOWeek));
 };
 
 export var isValidNumber = R.both(R.is(Number), R.complement(R.equals(NaN)));
@@ -161,25 +169,25 @@ export var getDate = function getDate(type, dateValue, value, isEnd) {
   var date = new Date(year, R.dec(month), day, hour, minute);
   if (R.equals(type, 'Q')) {
     if (R.isEmpty(dateValue) && isEnd) {
-      return R.pipe(dateFns.startOfYear, R.flip(dateFns.addQuarters)(3))(date);
+      return R.pipe(startOfYear, R.flip(addQuarters)(3))(date);
     }
-    return R.pipe(dateFns.startOfYear, function (date) {
-      return dateFns.addQuarters(date, dec(R.propOr(0, QUARTER)(dateValueUpdated)));
+    return R.pipe(startOfYear, function (date) {
+      return addQuarters(date, dec(R.propOr(0, QUARTER)(dateValueUpdated)));
     })(date);
   }
   if (R.equals(type, 'S')) {
-    if (R.isEmpty(dateValue) && isEnd) return R.pipe(dateFns.startOfYear, addSemesters(2))(date);
-    return R.pipe(dateFns.startOfYear, addSemesters(R.prop(SEMESTER)(dateValueUpdated)))(date);
+    if (R.isEmpty(dateValue) && isEnd) return R.pipe(startOfYear, addSemesters(2))(date);
+    return R.pipe(startOfYear, addSemesters(R.prop(SEMESTER)(dateValueUpdated)))(date);
   }
   if (R.or(R.equals(type, 'W'), R.equals(type, 'B'))) {
     var weekDate = new Date(year, 6, 1, 0, 0, 0, 0);
     if (R.isEmpty(dateValue)) {
-      return R.pipe(R.ifElse(R.always(isEnd), dateFns.endOfISOYear, dateFns.startOfISOYear), getAjustedDate(type))(weekDate);
+      return R.pipe(R.ifElse(R.always(isEnd), endOfISOWeekYear, startOfISOWeekYear), getAjustedDate(type))(weekDate);
     }
-    var weeksInYear = R.dec(dateFns.getISOWeeksInYear(weekDate));
+    var weeksInYear = R.dec(getISOWeeksInYear(weekDate));
     var nbWeeks = R.pipe(R.propOr(0, WEEK), R.dec, R.ifElse(R.lt(weeksInYear), R.always(weeksInYear), R.identity))(dateValueUpdated);
-    return R.pipe(dateFns.startOfISOYear, function (date) {
-      return dateFns.addWeeks(date, nbWeeks);
+    return R.pipe(startOfISOWeekYear, function (date) {
+      return addWeeks(date, nbWeeks);
     }, R.of, R.map(getAjustedDate(type)), R.head)(weekDate);
   }
   return date;
@@ -188,7 +196,10 @@ export var getDate = function getDate(type, dateValue, value, isEnd) {
 export var getDateInTheRange = function getDateInTheRange(boundaries) {
   return function (date) {
     if (R.isNil(date)) return date;
-    return dateFns.isWithinRange.apply(dateFns, [date].concat(boundaries)) ? date : dateFns.closestTo(date, boundaries);
+    var start = boundaries[0],
+        end = boundaries[1];
+
+    return isWithinInterval(date, { start: start, end: end }) ? date : closestTo(date, boundaries);
   };
 };
 

package/es/utils.js

@@ -2,7 +2,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 import React from 'react';
 import * as R from 'ramda';
-import dateFns from 'date-fns';
+import { addMinutes } from 'date-fns';
 import * as diacritics from 'diacritics';
 
 var spotlightHandler = function spotlightHandler(_ref) {
@@ -67,7 +67,7 @@ export var getIsRtl = function getIsRtl(theme) {
 };
 export var newDate = function newDate(stringDate) {
   var date = new Date(stringDate);
-  return dateFns.addMinutes(date, date.getTimezoneOffset());
+  return addMinutes(date, date.getTimezoneOffset());
 };
 
 export var prepareTerm = R.pipe(diacritics.remove, R.toLower);

package/lib/CollapseButtons/CollapseButtons.js

@@ -103,6 +103,7 @@ var CollapseButtons = function CollapseButtons(props) {
       toggleId = _useState[0],
       setIsOpen = _useState[1];
 
+  var mapIndexed = R.addIndex(R.map);
   var collapseFactory = function collapseFactory(_ref) {
     var action = _ref.action,
         isSecondLevelClikable = _ref.isSecondLevelClikable,
@@ -116,6 +117,7 @@ var CollapseButtons = function CollapseButtons(props) {
       return _react2.default.createElement(
         _Collapse2.default,
         {
+          key: id,
           'in': toggleId === id,
           timeout: 'auto',
           unmountOnExit: true,
@@ -124,9 +126,9 @@ var CollapseButtons = function CollapseButtons(props) {
         _react2.default.createElement(
           _Paper2.default,
           { elevation: 10, isMobileView: isMobileView },
-          R.map(function (item) {
+          mapIndexed(function (item, index) {
             return _react2.default.createElement(_Item2.default, {
-              key: R.prop('id')(item),
+              key: index + '-' + R.prop('id')(item),
               testId: testId + '_' + id + '_value_' + R.prop('id')(item),
               parentId: id,
               item: item,
@@ -151,14 +153,21 @@ var CollapseButtons = function CollapseButtons(props) {
       className: (0, _classnames2.default)((_cx = {}, _cx[classes.container] = accessibility, _cx)),
       tabIndex: 0
     },
-    R.map(function (_ref3) {
+    mapIndexed(function (_ref3, index) {
       var id = _ref3.id,
           label = _ref3.label,
           _ref3$values = _ref3.values,
           values = _ref3$values === undefined ? [] : _ref3$values;
       return _react2.default.createElement(
         _Grid2.default,
-        _extends({ item: true, xs: 12, sm: 12, md: R.nth(nbColumns)(COLUMNS) }, gridButtonsProps, { key: id }),
+        _extends({
+          item: true,
+          xs: 12,
+          sm: 12,
+          md: R.nth(nbColumns)(COLUMNS)
+        }, gridButtonsProps, {
+          key: index + '::' + id
+        }),
         _react2.default.createElement(
           _Typography2.default,
           { variant: 'h3' },

package/lib/CollapseButtons/Item.js

@@ -90,7 +90,7 @@ var Item = function Item(_ref) {
       labelAccessor = _ref.labelAccessor;
 
   var classes = useStyles();
-
+  var mapIndexed = R.addIndex(R.map);
   return _react2.default.createElement(
     _Grid2.default,
     { className: classes.paperItem },
@@ -127,13 +127,13 @@ var Item = function Item(_ref) {
           _react2.default.createElement(
             'span',
             { className: classes.itemSubtitle },
-            R.map(function (subtopic) {
+            mapIndexed(function (subtopic, index) {
               if (R.not(R.is(Object)(subtopic))) return subtopic;
               if (R.not(isSecondLevelClikable)) return labelAccessor(subtopic, parentId);
               var id = R.prop('id')(subtopic);
               return _react2.default.createElement(
                 _material.Typography,
-                { variant: 'h5', key: id },
+                { variant: 'h5', key: id + '::' + index },
                 _react2.default.createElement(
                   _Link2.default,
                   {

package/lib/CollapseButtons/Paper.js

@@ -51,12 +51,16 @@ var CustomPaper = function CustomPaper(_ref) {
   var _cx, _cx2;
 
   var isMobileView = _ref.isMobileView,
-      children = _ref.children;
+      children = _ref.children,
+      onClose = _ref.onClose;
 
   var classes = useStyles();
   return _react2.default.createElement(
     _Paper2.default,
     {
+      onKeyDown: function onKeyDown(e) {
+        if (e.key === 'Escape') onClose();
+      },
       classes: {
         root: (0, _classnames2.default)(classes.paper, (_cx = {}, _cx[classes.mobileView] = isMobileView, _cx))
       }

package/lib/CollapsibleTree/CollapsibleTree.js

@@ -171,7 +171,8 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
           endIcon: isAllOpen ? _react2.default.createElement(_KeyboardArrowUp2.default, { color: 'primary' }) : _react2.default.createElement(_KeyboardArrowDown2.default, { color: 'primary' }),
           onClick: function onClick() {
             return handleCollapse(isAllOpen);
-          }
+          },
+          tabIndex: 0
         },
         buttonAllOpenLabel
       ),

package/lib/PeriodPicker/PeriodPicker.js

@@ -16,8 +16,6 @@ var _propTypes2 = _interopRequireDefault(_propTypes);
 
 var _dateFns = require('date-fns');
 
-var _dateFns2 = _interopRequireDefault(_dateFns);
-
 var _Grid = require('@mui/material/Grid');
 
 var _Grid2 = _interopRequireDefault(_Grid);
@@ -96,13 +94,13 @@ var Period = function Period(_ref) {
           availableEnd = availableBoundaries[1];
 
       if (id === 'year') {
-        if (_dateFns2.default.isSameYear(date, availableStart)) {
+        if ((0, _dateFns.isSameYear)(date, availableStart)) {
           date = availableStart;
-        } else if (_dateFns2.default.isSameYear(date, availableEnd)) {
+        } else if ((0, _dateFns.isSameYear)(date, availableEnd)) {
           date = availableEnd;
         }
       }
-      return _dateFns2.default.compareAsc(date, availableStart) === -1 || _dateFns2.default.compareDesc(date, availableEnd) === -1;
+      return (0, _dateFns.compareAsc)(date, availableStart) === -1 || (0, _dateFns.compareDesc)(date, availableEnd) === -1;
     };
   };
   var onChangePeriod = function onChangePeriod(getter, id) {

package/lib/PeriodPicker/lib.js

@@ -13,8 +13,6 @@ var R = _interopRequireWildcard(_ramda);
 
 var _dateFns = require('date-fns');
 
-var _dateFns2 = _interopRequireDefault(_dateFns);
-
 var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
@@ -26,9 +24,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 var isWeekInPreviousYear = function isWeekInPreviousYear(date) {
-  var startIsoWeek = _dateFns2.default.startOfISOWeek(date);
+  var startIsoWeek = (0, _dateFns.startOfISOWeek)(date);
   return R.pipe(R.times(function (n) {
-    return _dateFns2.default.getYear(_dateFns2.default.addDays(startIsoWeek, n));
+    return (0, _dateFns.getYear)((0, _dateFns.addDays)(startIsoWeek, n));
   }), R.uniq, R.length, R.equals(1))(4);
 };
 var supportedFrequenciesKey = R.keys(_constants.layoutFrequencies);
@@ -36,7 +34,7 @@ var dec = R.ifElse(R.gte(0), R.identity, R.dec);
 var addSemesters = function addSemesters() {
   var semester = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
   return function (date) {
-    return _dateFns2.default.addMonths(date, R.multiply(6)(dec(Number(semester))));
+    return (0, _dateFns.addMonths)(date, R.multiply(6)(dec(Number(semester))));
   };
 };
 var getSemesterValue = R.ifElse(R.pipe(Number, R.inc, R.gte(6)), R.always(1), R.always(2));
@@ -53,15 +51,23 @@ var setRange = function setRange(range) {
     return R.pipe(getRanges, R.prepend(R.prop(prop)(_constants.defaultOutputValues)))(R.prop(prop)(range));
   };
 };
-
+// export const getDestructuringDate = date =>
+//   R.pipe(
+//     date => format(date, 'yyyy M d H m HH Q I [S]'),
+//     R.replace(/S/, R.pipe(date => getMonth(date), getSemesterValue)(date)),
+//     R.split(' '),
+//     R.ifElse(v => R.equals(R.length(formatOrder), R.length(v)), R.map(Number), R.empty),
+//   )(date);
 var getDestructuringDate = exports.getDestructuringDate = function getDestructuringDate(date) {
-  return R.pipe(function (date) {
-    return _dateFns2.default.format(date, 'YYYY M D H m H Q W [S]');
-  }, R.replace(/S/, R.pipe(function (date) {
-    return _dateFns2.default.getMonth(date);
-  }, getSemesterValue)(date)), R.split(' '), R.ifElse(function (v) {
+  if (!date || isNaN(new Date(date))) return [];
+  var validDate = typeof date === 'string' ? (0, _dateFns.parseISO)(date) : date;
+  return R.pipe(function (d) {
+    var semester = getSemesterValue((0, _dateFns.getMonth)(d));
+    var formatted = (0, _dateFns.format)(d, 'yyyy M d H m HH Q I');
+    return formatted + ' ' + semester;
+  }, R.split(' '), R.ifElse(function (v) {
     return R.equals(R.length(_constants.formatOrder), R.length(v));
-  }, R.map(Number), R.empty))(date);
+  }, R.map(Number), R.empty))(validDate);
 };
 
 var updateLimit = function updateLimit(value, isSamePeriod, defaultValue) {
@@ -112,28 +118,28 @@ var getRange = exports.getRange = R.curry(function (boundaries, date) {
 
   var hoursRange = R.addIndex(R.map)(function (value, index) {
     var isSamePeriod = R.all(R.identity)([R.nth(index, equalsDays), R.nth(index, equalsMonths), R.nth(index, equalsYears)]);
-    return updateLimit(R.nth(index)(hours), isSamePeriod, value);
+    return updateLimit(R.nth(index, hours), isSamePeriod, value);
   })([0, 23]);
 
   return _ref4 = {}, _ref4[_constants.YEARS] = years, _ref4[_constants.HOURS] = hoursRange, _ref4[_constants.FULL_HOURS] = hoursRange, _ref4[_constants.MONTHS] = R.addIndex(R.map)(function (value, index) {
     return updateLimit(R.nth(index)(months), R.nth(index, equalsYears), value);
   })([1, 12]), _ref4[_constants.WEEKS] = R.addIndex(R.map)(function (value, index) {
     return updateLimit(R.nth(index)(weeks), R.nth(index, equalsYears), value);
-  })([1, _dateFns2.default.getISOWeeksInYear(date)]), _ref4[_constants.SEMESTERS] = R.addIndex(R.map)(function (value, index) {
+  })([1, (0, _dateFns.getISOWeeksInYear)(date)]), _ref4[_constants.SEMESTERS] = R.addIndex(R.map)(function (value, index) {
     return updateLimit(R.nth(index)(semesters), R.nth(index, equalsYears), value);
   })([1, 2]), _ref4[_constants.QUARTERS] = R.addIndex(R.map)(function (value, index) {
     return updateLimit(R.nth(index)(quarters), R.nth(index, equalsYears), value);
   })([1, 4]), _ref4[_constants.DAYS] = R.addIndex(R.map)(function (value, index) {
     var isSamePeriod = R.and(R.nth(index, equalsMonths), R.nth(index, equalsYears));
     return updateLimit(R.nth(index)(days), isSamePeriod, value);
-  })([1, _dateFns2.default.getDaysInMonth(date)]), _ref4[_constants.MINUTES] = R.addIndex(R.map)(function (value, index) {
+  })([1, (0, _dateFns.getDaysInMonth)(date)]), _ref4[_constants.MINUTES] = R.addIndex(R.map)(function (value, index) {
     var isSamePeriod = R.all(R.identity)([R.nth(index, R.prop('hours')(listEqualsValueFromDate)), R.nth(index, equalsDays), R.nth(index, equalsMonths), R.nth(index, equalsYears)]);
     return updateLimit(R.nth(index)(minutes), isSamePeriod, value);
   })([0, 59]), _ref4;
 });
 
 var getAjustedDate = exports.getAjustedDate = function getAjustedDate(frequency) {
-  return R.when(R.always(R.or(R.equals('W', frequency), R.equals('B', frequency))), R.ifElse(isWeekInPreviousYear, _dateFns2.default.startOfISOWeek, _dateFns2.default.endOfISOWeek));
+  return R.when(R.always(R.or(R.equals('W', frequency), R.equals('B', frequency))), R.ifElse(isWeekInPreviousYear, _dateFns.startOfISOWeek, _dateFns.endOfISOWeek));
 };
 
 var isValidNumber = exports.isValidNumber = R.both(R.is(Number), R.complement(R.equals(NaN)));
@@ -179,25 +185,25 @@ var getDate = exports.getDate = function getDate(type, dateValue, value, isEnd)
   var date = new Date(year, R.dec(month), day, hour, minute);
   if (R.equals(type, 'Q')) {
     if (R.isEmpty(dateValue) && isEnd) {
-      return R.pipe(_dateFns2.default.startOfYear, R.flip(_dateFns2.default.addQuarters)(3))(date);
+      return R.pipe(_dateFns.startOfYear, R.flip(_dateFns.addQuarters)(3))(date);
     }
-    return R.pipe(_dateFns2.default.startOfYear, function (date) {
-      return _dateFns2.default.addQuarters(date, dec(R.propOr(0, _constants.QUARTER)(dateValueUpdated)));
+    return R.pipe(_dateFns.startOfYear, function (date) {
+      return (0, _dateFns.addQuarters)(date, dec(R.propOr(0, _constants.QUARTER)(dateValueUpdated)));
     })(date);
   }
   if (R.equals(type, 'S')) {
-    if (R.isEmpty(dateValue) && isEnd) return R.pipe(_dateFns2.default.startOfYear, addSemesters(2))(date);
-    return R.pipe(_dateFns2.default.startOfYear, addSemesters(R.prop(_constants.SEMESTER)(dateValueUpdated)))(date);
+    if (R.isEmpty(dateValue) && isEnd) return R.pipe(_dateFns.startOfYear, addSemesters(2))(date);
+    return R.pipe(_dateFns.startOfYear, addSemesters(R.prop(_constants.SEMESTER)(dateValueUpdated)))(date);
   }
   if (R.or(R.equals(type, 'W'), R.equals(type, 'B'))) {
     var weekDate = new Date(year, 6, 1, 0, 0, 0, 0);
     if (R.isEmpty(dateValue)) {
-      return R.pipe(R.ifElse(R.always(isEnd), _dateFns2.default.endOfISOYear, _dateFns2.default.startOfISOYear), getAjustedDate(type))(weekDate);
+      return R.pipe(R.ifElse(R.always(isEnd), _dateFns.endOfISOWeekYear, _dateFns.startOfISOWeekYear), getAjustedDate(type))(weekDate);
     }
-    var weeksInYear = R.dec(_dateFns2.default.getISOWeeksInYear(weekDate));
+    var weeksInYear = R.dec((0, _dateFns.getISOWeeksInYear)(weekDate));
     var nbWeeks = R.pipe(R.propOr(0, _constants.WEEK), R.dec, R.ifElse(R.lt(weeksInYear), R.always(weeksInYear), R.identity))(dateValueUpdated);
-    return R.pipe(_dateFns2.default.startOfISOYear, function (date) {
-      return _dateFns2.default.addWeeks(date, nbWeeks);
+    return R.pipe(_dateFns.startOfISOWeekYear, function (date) {
+      return (0, _dateFns.addWeeks)(date, nbWeeks);
     }, R.of, R.map(getAjustedDate(type)), R.head)(weekDate);
   }
   return date;
@@ -206,7 +212,10 @@ var getDate = exports.getDate = function getDate(type, dateValue, value, isEnd)
 var getDateInTheRange = exports.getDateInTheRange = function getDateInTheRange(boundaries) {
   return function (date) {
     if (R.isNil(date)) return date;
-    return _dateFns2.default.isWithinRange.apply(_dateFns2.default, [date].concat(boundaries)) ? date : _dateFns2.default.closestTo(date, boundaries);
+    var start = boundaries[0],
+        end = boundaries[1];
+
+    return (0, _dateFns.isWithinInterval)(date, { start: start, end: end }) ? date : (0, _dateFns.closestTo)(date, boundaries);
   };
 };
 

package/lib/utils.js

@@ -15,8 +15,6 @@ var R = _interopRequireWildcard(_ramda);
 
 var _dateFns = require('date-fns');
 
-var _dateFns2 = _interopRequireDefault(_dateFns);
-
 var _diacritics = require('diacritics');
 
 var diacritics = _interopRequireWildcard(_diacritics);
@@ -87,7 +85,7 @@ var getIsRtl = exports.getIsRtl = function getIsRtl(theme) {
 };
 var newDate = exports.newDate = function newDate(stringDate) {
   var date = new Date(stringDate);
-  return _dateFns2.default.addMinutes(date, date.getTimezoneOffset());
+  return (0, _dateFns.addMinutes)(date, date.getTimezoneOffset());
 };
 
 var prepareTerm = exports.prepareTerm = R.pipe(diacritics.remove, R.toLower);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "12.48.0",
+  "version": "12.50.0",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",
@@ -28,7 +28,8 @@
     "test:watch": "jest --watch --no-cache",
     "lint": "eslint src/ --color",
     "precommit": "lint-staged",
-    "transform": "npx jscodeshift -t scripts/transform-mui-imports.js demo/"
+    "transform": "npx jscodeshift -t scripts/transform-mui-imports.js demo/",
+    "upgrade-date-fns": "npx jscodeshift -t scripts/upgrade-date-fns.js src/"
   },
   "dependencies": {
     "@hello-pangea/dnd": "^16.6.0",
@@ -48,7 +49,7 @@
     "@mui/icons-material": "^5",
     "@mui/material": "^5",
     "@mui/styles": "^5",
-    "date-fns": "^1.30.1",
+    "date-fns": "^2.23.0",
     "numeral": "^2.0.6",
     "react": "^18",
     "react-dom": "^18"