@sis-cc/dotstatsuite-visions 7.22.5 → 7.22.7

package/es/HierarchicalFilter/HierarchicalFilter.js

@@ -13,8 +13,8 @@ import { useTheme } from '@material-ui/core';
 import { getIsRtl } from '../utils';
 
 var getCounter = function getCounter(items, displayAccessor, tagAccessor) {
-  var count = R.pipe(R.filter(R.prop('isSelected')), R.length)(items);
-  var total = R.pipe(R.when(R.always(R.is(Function, displayAccessor)), R.filter(displayAccessor)), R.map(R.ifElse(R.has('parentId'), R.map(R.prop('parentId')), R.prop('id'))), R.uniq, R.length)(items);
+  var count = R.pipe(R.filter(R.prop('isSelected')), R.map(R.prop('id')), R.uniq, R.length)(items);
+  var total = R.pipe(R.when(R.always(R.is(Function, displayAccessor)), R.filter(displayAccessor)), R.map(R.prop('id')), R.uniq, R.length)(items);
   if (R.is(Function, tagAccessor)) {
     return tagAccessor(count, total);
   }

package/es/PeriodPicker/PeriodPicker.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import * as R from 'ramda';
 import PropTypes from 'prop-types';
+import dateFns from 'date-fns';
 import Grid from '@material-ui/core/Grid';
 import { numeralFormat } from './lib';
 import { Select } from '../';
@@ -37,10 +38,6 @@ var Period = function Period(_ref) {
   var startDate = R.head(period);
   var endDate = R.last(period);
 
-  var startPeriodAvailableBoundaries = [R.head(availableBoundaries), R.defaultTo(R.last(availableBoundaries), endDate)];
-  var endPeriodAvailableBoundaries = [R.defaultTo(R.head(availableBoundaries), startDate), R.last(availableBoundaries)];
-  var availableRanges = [getRange(startPeriodAvailableBoundaries, startDate), getRange(endPeriodAvailableBoundaries, endDate)];
-
   var startPeriodBoundaries = [R.head(boundaries), R.defaultTo(R.last(boundaries), endDate)];
   var endPeriodBoundaries = [R.defaultTo(R.head(boundaries), startDate), R.last(boundaries)];
   var ranges = [getRange(startPeriodBoundaries, startDate), getRange(endPeriodBoundaries, endDate)];
@@ -50,6 +47,22 @@ var Period = function Period(_ref) {
   var onChangeFrequency = function onChangeFrequency(value) {
     if (R.is(Function, changeFrequency)) return changeFrequency(value);
   };
+  var _getIsDisabled = function _getIsDisabled(getter) {
+    return function (value, id) {
+      var _getDate;
+
+      var fn = R.prop(getter)({ start: R.head, end: R.last });
+      if (!isValidNumber(Number(value)) || R.length(availableBoundaries) !== 2) {
+        return false;
+      }
+      var dateValue = getPeriodValue(fn(destructuringDates));
+      var date = getDate(frequency, dateValue, (_getDate = {}, _getDate[id] = Number(value), _getDate), getter === 'end');
+      var availableStart = availableBoundaries[0],
+          availableEnd = availableBoundaries[1];
+
+      return dateFns.compareAsc(date, availableStart) === -1 || dateFns.compareDesc(date, availableEnd) === -1;
+    };
+  };
   var onChangePeriod = function onChangePeriod(getter, id) {
     return function (value) {
       var fn = R.prop(getter)({ start: R.head, end: R.last });
@@ -98,7 +111,8 @@ var Period = function Period(_ref) {
           layout = _ref3.layout,
           label = _ref3.label,
           value = _ref3.value,
-          testId = _ref3.testId;
+          testId = _ref3.testId,
+          getIsDisabled = _ref3.getIsDisabled;
       return React.createElement(
         Grid,
         { key: getter, item: true, xs: 12, 'data-testid': testId },
@@ -127,8 +141,7 @@ var Period = function Period(_ref) {
               R.map(function (row) {
                 return R.map(function (_ref4) {
                   var id = _ref4.id,
-                      values = _ref4.values,
-                      availableValues = _ref4.availableValues;
+                      values = _ref4.values;
 
                   var selectedValue = R.isNil(R.prop(id)(value)) ? R.head(values) : R.prop(id)(value);
                   return React.createElement(
@@ -149,7 +162,7 @@ var Period = function Period(_ref) {
                         return {
                           id: id,
                           value: option,
-                          disabled: !R.isEmpty(availableValues) ? !R.includes(option, availableValues) : false,
+                          disabled: getIsDisabled(option, id),
                           label: R.ifElse(R.is(String), R.identity, R.prop(id)(numeralFormat))(option)
                         };
                       })(values)
@@ -164,15 +177,17 @@ var Period = function Period(_ref) {
     })([{
       getter: 'start',
       testId: 'period-picker-start-period-test-id',
-      layout: getLayout(frequency, R.head(ranges), R.head(availableRanges)),
+      layout: getLayout(frequency, R.head(ranges)),
       label: R.prop('start')(labels),
-      value: getPeriodValue(R.head(destructuringDates))
+      value: getPeriodValue(R.head(destructuringDates)),
+      getIsDisabled: _getIsDisabled('start')
     }, {
       getter: 'end',
       testId: 'period-picker-end-period-test-id',
-      layout: getLayout(frequency, R.last(ranges), R.last(availableRanges)),
+      layout: getLayout(frequency, R.last(ranges), /*R.last(availableRanges)*/[]),
       label: R.prop('end')(labels),
-      value: getPeriodValue(R.last(destructuringDates))
+      value: getPeriodValue(R.last(destructuringDates)),
+      getIsDisabled: _getIsDisabled('end')
     }])
   );
 };

package/es/PeriodPicker/constants.js

@@ -22,15 +22,15 @@ export var HOUR = 'hour';
 export var MINUTE = 'minute';
 
 export var layoutFrequencies = {
-  S: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: SEMESTERS, availableValues: SEMESTERS, id: SEMESTER }]],
-  A: [[{ values: YEARS, availableValues: YEARS, id: YEAR }]],
-  Q: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: QUARTERS, availableValues: QUARTERS, id: QUARTER }]],
-  M: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: MONTHS, availableValues: YEARS, id: MONTH }]],
-  W: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: WEEKS, availableValues: WEEKS, id: WEEK }]],
-  B: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: WEEKS, availableValues: WEEKS, id: WEEK }]],
-  D: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: MONTHS, availableValues: MONTHS, id: MONTH }, { values: DAYS, availableValues: DAYS, id: DAY }]],
-  H: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: MONTHS, availableValues: MONTHS, id: MONTH }, { values: DAYS, availableValues: DAYS, id: DAY }], [{ values: FULL_HOURS, availableValues: FULL_HOURS, id: FULL_HOUR }]],
-  N: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: MONTHS, availableValues: WEEKS, id: MONTH }, { values: DAYS, availableValues: DAYS, id: DAY }], [{ values: HOURS, availableValues: HOURS, id: HOUR }, { values: MINUTES, availableValues: MINUTES, id: MINUTE }]]
+  S: [[{ values: YEARS, id: YEAR }, { values: SEMESTERS, id: SEMESTER }]],
+  A: [[{ values: YEARS, id: YEAR }]],
+  Q: [[{ values: YEARS, id: YEAR }, { values: QUARTERS, id: QUARTER }]],
+  M: [[{ values: YEARS, id: YEAR }, { values: MONTHS, id: MONTH }]],
+  W: [[{ values: YEARS, id: YEAR }, { values: WEEKS, id: WEEK }]],
+  B: [[{ values: YEARS, id: YEAR }, { values: WEEKS, id: WEEK }]],
+  D: [[{ values: YEARS, id: YEAR }, { values: MONTHS, id: MONTH }, { values: DAYS, id: DAY }]],
+  H: [[{ values: YEARS, id: YEAR }, { values: MONTHS, id: MONTH }, { values: DAYS, id: DAY }], [{ values: FULL_HOURS, id: FULL_HOUR }]],
+  N: [[{ values: YEARS, id: YEAR }, { values: MONTHS, id: MONTH }, { values: DAYS, id: DAY }], [{ values: HOURS, id: HOUR }, { values: MINUTES, id: MINUTE }]]
 };
 
 export var defaultOutputValues = (_defaultOutputValues = {}, _defaultOutputValues[YEARS] = '----', _defaultOutputValues[SEMESTERS] = '-', _defaultOutputValues[QUARTERS] = '-', _defaultOutputValues[MONTHS] = '--', _defaultOutputValues[WEEKS] = '--', _defaultOutputValues[DAYS] = '--', _defaultOutputValues[FULL_HOURS] = '--:00', _defaultOutputValues[HOURS] = '--', _defaultOutputValues[MINUTES] = '--', _defaultOutputValues);

package/es/PeriodPicker/lib.js

@@ -133,15 +133,12 @@ export var getFrequencyOptions = function getFrequencyOptions(frequencyoptions,
   return options;
 };
 
-export var getLayout = function getLayout(type, range, availableRange) {
+export var getLayout = function getLayout(type, range) {
   var layoutPeriods = R.propOr([], type)(layoutFrequencies);
   var hasYear = R.complement(R.isEmpty)(getRanges(range.years));
   return R.map(R.reduce(function (acc, period) {
-    if (hasYear) return R.append(R.evolve({ values: setRange(range), availableValues: setRange(availableRange) }, period), acc);
-    return R.append(R.evolve({
-      values: R.pipe(R.flip(R.prop)(defaultOutputValues), R.flip(R.append)([])),
-      availableValues: R.pipe(R.flip(R.prop)(defaultOutputValues), R.flip(R.append)([]))
-    }, period), acc);
+    if (hasYear) return R.append(R.evolve({ values: setRange(range) }, period), acc);
+    return R.append(R.evolve({ values: R.pipe(R.flip(R.prop)(defaultOutputValues), R.flip(R.append)([])) }, period), acc);
   }, []))(layoutPeriods);
 };
 

package/lib/HierarchicalFilter/HierarchicalFilter.js

@@ -41,8 +41,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var getCounter = function getCounter(items, displayAccessor, tagAccessor) {
-  var count = R.pipe(R.filter(R.prop('isSelected')), R.length)(items);
-  var total = R.pipe(R.when(R.always(R.is(Function, displayAccessor)), R.filter(displayAccessor)), R.map(R.ifElse(R.has('parentId'), R.map(R.prop('parentId')), R.prop('id'))), R.uniq, R.length)(items);
+  var count = R.pipe(R.filter(R.prop('isSelected')), R.map(R.prop('id')), R.uniq, R.length)(items);
+  var total = R.pipe(R.when(R.always(R.is(Function, displayAccessor)), R.filter(displayAccessor)), R.map(R.prop('id')), R.uniq, R.length)(items);
   if (R.is(Function, tagAccessor)) {
     return tagAccessor(count, total);
   }

package/lib/PeriodPicker/PeriodPicker.js

@@ -14,6 +14,10 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
+var _dateFns = require('date-fns');
+
+var _dateFns2 = _interopRequireDefault(_dateFns);
+
 var _Grid = require('@material-ui/core/Grid');
 
 var _Grid2 = _interopRequireDefault(_Grid);
@@ -62,10 +66,6 @@ var Period = function Period(_ref) {
   var startDate = R.head(period);
   var endDate = R.last(period);
 
-  var startPeriodAvailableBoundaries = [R.head(availableBoundaries), R.defaultTo(R.last(availableBoundaries), endDate)];
-  var endPeriodAvailableBoundaries = [R.defaultTo(R.head(availableBoundaries), startDate), R.last(availableBoundaries)];
-  var availableRanges = [(0, _lib.getRange)(startPeriodAvailableBoundaries, startDate), (0, _lib.getRange)(endPeriodAvailableBoundaries, endDate)];
-
   var startPeriodBoundaries = [R.head(boundaries), R.defaultTo(R.last(boundaries), endDate)];
   var endPeriodBoundaries = [R.defaultTo(R.head(boundaries), startDate), R.last(boundaries)];
   var ranges = [(0, _lib.getRange)(startPeriodBoundaries, startDate), (0, _lib.getRange)(endPeriodBoundaries, endDate)];
@@ -75,6 +75,22 @@ var Period = function Period(_ref) {
   var onChangeFrequency = function onChangeFrequency(value) {
     if (R.is(Function, changeFrequency)) return changeFrequency(value);
   };
+  var _getIsDisabled = function _getIsDisabled(getter) {
+    return function (value, id) {
+      var _getDate;
+
+      var fn = R.prop(getter)({ start: R.head, end: R.last });
+      if (!(0, _lib.isValidNumber)(Number(value)) || R.length(availableBoundaries) !== 2) {
+        return false;
+      }
+      var dateValue = (0, _lib.getPeriodValue)(fn(destructuringDates));
+      var date = (0, _lib.getDate)(frequency, dateValue, (_getDate = {}, _getDate[id] = Number(value), _getDate), getter === 'end');
+      var availableStart = availableBoundaries[0],
+          availableEnd = availableBoundaries[1];
+
+      return _dateFns2.default.compareAsc(date, availableStart) === -1 || _dateFns2.default.compareDesc(date, availableEnd) === -1;
+    };
+  };
   var onChangePeriod = function onChangePeriod(getter, id) {
     return function (value) {
       var fn = R.prop(getter)({ start: R.head, end: R.last });
@@ -123,7 +139,8 @@ var Period = function Period(_ref) {
           layout = _ref3.layout,
           label = _ref3.label,
           value = _ref3.value,
-          testId = _ref3.testId;
+          testId = _ref3.testId,
+          getIsDisabled = _ref3.getIsDisabled;
       return _react2.default.createElement(
         _Grid2.default,
         { key: getter, item: true, xs: 12, 'data-testid': testId },
@@ -152,8 +169,7 @@ var Period = function Period(_ref) {
               R.map(function (row) {
                 return R.map(function (_ref4) {
                   var id = _ref4.id,
-                      values = _ref4.values,
-                      availableValues = _ref4.availableValues;
+                      values = _ref4.values;
 
                   var selectedValue = R.isNil(R.prop(id)(value)) ? R.head(values) : R.prop(id)(value);
                   return _react2.default.createElement(
@@ -174,7 +190,7 @@ var Period = function Period(_ref) {
                         return {
                           id: id,
                           value: option,
-                          disabled: !R.isEmpty(availableValues) ? !R.includes(option, availableValues) : false,
+                          disabled: getIsDisabled(option, id),
                           label: R.ifElse(R.is(String), R.identity, R.prop(id)(_lib.numeralFormat))(option)
                         };
                       })(values)
@@ -189,15 +205,17 @@ var Period = function Period(_ref) {
     })([{
       getter: 'start',
       testId: 'period-picker-start-period-test-id',
-      layout: (0, _lib.getLayout)(frequency, R.head(ranges), R.head(availableRanges)),
+      layout: (0, _lib.getLayout)(frequency, R.head(ranges)),
       label: R.prop('start')(labels),
-      value: (0, _lib.getPeriodValue)(R.head(destructuringDates))
+      value: (0, _lib.getPeriodValue)(R.head(destructuringDates)),
+      getIsDisabled: _getIsDisabled('start')
     }, {
       getter: 'end',
       testId: 'period-picker-end-period-test-id',
-      layout: (0, _lib.getLayout)(frequency, R.last(ranges), R.last(availableRanges)),
+      layout: (0, _lib.getLayout)(frequency, R.last(ranges), /*R.last(availableRanges)*/[]),
       label: R.prop('end')(labels),
-      value: (0, _lib.getPeriodValue)(R.last(destructuringDates))
+      value: (0, _lib.getPeriodValue)(R.last(destructuringDates)),
+      getIsDisabled: _getIsDisabled('end')
     }])
   );
 };

package/lib/PeriodPicker/constants.js

@@ -26,15 +26,15 @@ var HOUR = exports.HOUR = 'hour';
 var MINUTE = exports.MINUTE = 'minute';
 
 var layoutFrequencies = exports.layoutFrequencies = {
-  S: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: SEMESTERS, availableValues: SEMESTERS, id: SEMESTER }]],
-  A: [[{ values: YEARS, availableValues: YEARS, id: YEAR }]],
-  Q: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: QUARTERS, availableValues: QUARTERS, id: QUARTER }]],
-  M: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: MONTHS, availableValues: YEARS, id: MONTH }]],
-  W: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: WEEKS, availableValues: WEEKS, id: WEEK }]],
-  B: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: WEEKS, availableValues: WEEKS, id: WEEK }]],
-  D: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: MONTHS, availableValues: MONTHS, id: MONTH }, { values: DAYS, availableValues: DAYS, id: DAY }]],
-  H: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: MONTHS, availableValues: MONTHS, id: MONTH }, { values: DAYS, availableValues: DAYS, id: DAY }], [{ values: FULL_HOURS, availableValues: FULL_HOURS, id: FULL_HOUR }]],
-  N: [[{ values: YEARS, availableValues: YEARS, id: YEAR }, { values: MONTHS, availableValues: WEEKS, id: MONTH }, { values: DAYS, availableValues: DAYS, id: DAY }], [{ values: HOURS, availableValues: HOURS, id: HOUR }, { values: MINUTES, availableValues: MINUTES, id: MINUTE }]]
+  S: [[{ values: YEARS, id: YEAR }, { values: SEMESTERS, id: SEMESTER }]],
+  A: [[{ values: YEARS, id: YEAR }]],
+  Q: [[{ values: YEARS, id: YEAR }, { values: QUARTERS, id: QUARTER }]],
+  M: [[{ values: YEARS, id: YEAR }, { values: MONTHS, id: MONTH }]],
+  W: [[{ values: YEARS, id: YEAR }, { values: WEEKS, id: WEEK }]],
+  B: [[{ values: YEARS, id: YEAR }, { values: WEEKS, id: WEEK }]],
+  D: [[{ values: YEARS, id: YEAR }, { values: MONTHS, id: MONTH }, { values: DAYS, id: DAY }]],
+  H: [[{ values: YEARS, id: YEAR }, { values: MONTHS, id: MONTH }, { values: DAYS, id: DAY }], [{ values: FULL_HOURS, id: FULL_HOUR }]],
+  N: [[{ values: YEARS, id: YEAR }, { values: MONTHS, id: MONTH }, { values: DAYS, id: DAY }], [{ values: HOURS, id: HOUR }, { values: MINUTES, id: MINUTE }]]
 };
 
 var defaultOutputValues = exports.defaultOutputValues = (_defaultOutputValues = {}, _defaultOutputValues[YEARS] = '----', _defaultOutputValues[SEMESTERS] = '-', _defaultOutputValues[QUARTERS] = '-', _defaultOutputValues[MONTHS] = '--', _defaultOutputValues[WEEKS] = '--', _defaultOutputValues[DAYS] = '--', _defaultOutputValues[FULL_HOURS] = '--:00', _defaultOutputValues[HOURS] = '--', _defaultOutputValues[MINUTES] = '--', _defaultOutputValues);

package/lib/PeriodPicker/lib.js

@@ -151,15 +151,12 @@ var getFrequencyOptions = exports.getFrequencyOptions = function getFrequencyOpt
   return options;
 };
 
-var getLayout = exports.getLayout = function getLayout(type, range, availableRange) {
+var getLayout = exports.getLayout = function getLayout(type, range) {
   var layoutPeriods = R.propOr([], type)(_constants.layoutFrequencies);
   var hasYear = R.complement(R.isEmpty)(getRanges(range.years));
   return R.map(R.reduce(function (acc, period) {
-    if (hasYear) return R.append(R.evolve({ values: setRange(range), availableValues: setRange(availableRange) }, period), acc);
-    return R.append(R.evolve({
-      values: R.pipe(R.flip(R.prop)(_constants.defaultOutputValues), R.flip(R.append)([])),
-      availableValues: R.pipe(R.flip(R.prop)(_constants.defaultOutputValues), R.flip(R.append)([]))
-    }, period), acc);
+    if (hasYear) return R.append(R.evolve({ values: setRange(range) }, period), acc);
+    return R.append(R.evolve({ values: R.pipe(R.flip(R.prop)(_constants.defaultOutputValues), R.flip(R.append)([])) }, period), acc);
   }, []))(layoutPeriods);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "7.22.5",
+  "version": "7.22.7",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",
@@ -56,11 +56,11 @@
     "react": "16.x"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.5.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@sis-cc/dotstatsuite-sdmxjs": "*",
     "@testing-library/jest-dom": "^5.1.1",
     "@testing-library/react": "^9.4.1",
-    "babel-eslint": "^10.0.3",
     "babel-jest": "^24.8.0",
     "babel-preset-react-app": "^9.0.0",
     "dox": "^0.9.0",
@@ -151,8 +151,14 @@
       "plugin:react/recommended",
       "plugin:jsx-a11y/recommended"
     ],
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "parserOptions": {
+      "babelOptions": {
+        "presets": [
+          ["babel-preset-react-app", false],
+            "babel-preset-react-app/test"
+        ]
+      },
       "ecmaFeatures": {
         "experimentalObjectRestSpread": true,
         "jsx": true
@@ -200,6 +206,7 @@
     ]
   },
   "prettier": {
+    "endOfLine": "lf",
     "useTabs": false,
     "printWidth": 100,
     "tabWidth": 2,
@@ -207,7 +214,7 @@
     "trailingComma": "all",
     "jsxBracketSameLine": false,
     "bracketSpacing": true,
-    "parser": "babylon",
+    "parser": "babel",
     "semi": true
   }
 }