@sis-cc/dotstatsuite-components 9.2.2 → 9.3.3

package/lib/rules/src/date.js

@@ -3,7 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTimePeriodLabel = exports.getLocale = undefined;
+exports.getTimePeriodLabel = exports.getReportedTimePeriodLabel = exports.getLocale = undefined;
+
+var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
+
+var _slicedToArray3 = _interopRequireDefault(_slicedToArray2);
 
 var _ramda = require('ramda');
 
@@ -45,10 +49,10 @@ var _th = require('date-fns/locale/th');
 
 var _th2 = _interopRequireDefault(_th);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; } }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var isValidDate = function isValidDate(period) {
   return R.and(_dateFns2.default.isDate, function (date) {
     return R.not(R.equals(date.getTime(date), NaN));
@@ -63,6 +67,58 @@ var formaterPeriod = function formaterPeriod(locale, format) {
   };
 };
 
+var getReportedTimePeriodLabel = exports.getReportedTimePeriodLabel = function getReportedTimePeriodLabel(freq, _format, locale) {
+  return function (reportYearStart, _ref) {
+    var id = _ref.id,
+        start = _ref.start,
+        reportedStart = _ref.reportedStart;
+
+    var year = _dateFns2.default.getYear(start);
+    var reportStartDate = new Date(year, reportYearStart.month, reportYearStart.day);
+    var isReportFirstDate = _dateFns2.default.isEqual(reportStartDate, new Date(year, 1, 1));
+    if (isReportFirstDate || freq === 'D') {
+      return R.isNil(_format) ? id : _dateFns2.default.format(start, _format, { locale: getLocale(locale) });
+    }
+    var nextYear = year + 1;
+    if (freq === 'A') {
+      return year + '/' + nextYear;
+    }
+    if (freq === 'S') {
+      var _R$match = R.match(/S\d/, id),
+          _R$match2 = (0, _slicedToArray3.default)(_R$match, 1),
+          semester = _R$match2[0];
+
+      return year + '/' + nextYear + '-' + semester;
+    }
+    if (freq === 'Q') {
+      var _R$match3 = R.match(/Q\d/, id),
+          _R$match4 = (0, _slicedToArray3.default)(_R$match3, 1),
+          quarter = _R$match4[0];
+
+      return year + '/' + nextYear + '-' + quarter;
+    }
+    if (freq === 'M') {
+      var isFirstDayOfMonth = _dateFns2.default.isFirstDayOfMonth(reportedStart);
+      if (isFirstDayOfMonth) {
+        return R.isNil(_format) ? id : _dateFns2.default.format(reportedStart, _format, { locale: getLocale(locale) });
+      }
+
+      var _R$match5 = R.match(/M[\d]{2}/, id),
+          _R$match6 = (0, _slicedToArray3.default)(_R$match5, 1),
+          month = _R$match6[0];
+
+      return year + '/' + nextYear + '-' + month;
+    }
+    // freq === 'W'
+
+    var _R$match7 = R.match(/W[\d]{2}/, id),
+        _R$match8 = (0, _slicedToArray3.default)(_R$match7, 1),
+        week = _R$match8[0];
+
+    return year + '/' + nextYear + '-' + week;
+  };
+};
+
 var getTimePeriodLabel = exports.getTimePeriodLabel = function getTimePeriodLabel(locale) {
   var format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'YYYY MMM';
   return R.pipe(R.when(R.isNil, R.always('')), R.when(isValidDate, formaterPeriod(locale, format)));

package/lib/rules/src/preparators/getReportingYearStart.js

@@ -0,0 +1,44 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getReportingYearStart = undefined;
+
+var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
+
+var _slicedToArray3 = _interopRequireDefault(_slicedToArray2);
+
+var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
+
+var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+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; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var getReportingYearStart = exports.getReportingYearStart = function getReportingYearStart(sdmxJson) {
+  var attributes = R.pipe(R.pathOr({}, ['data', 'structure', 'attributes']), function (_ref) {
+    var _ref$dataSet = _ref.dataSet,
+        dataSet = _ref$dataSet === undefined ? [] : _ref$dataSet,
+        _ref$observation = _ref.observation,
+        observation = _ref$observation === undefined ? [] : _ref$observation,
+        _ref$series = _ref.series,
+        series = _ref$series === undefined ? [] : _ref$series;
+    return [].concat((0, _toConsumableArray3.default)(dataSet), (0, _toConsumableArray3.default)(observation), (0, _toConsumableArray3.default)(series));
+  })(sdmxJson);
+
+  var reportYearStartAttr = R.find(R.propEq('id', 'REPORTING_YEAR_START_DAY'), attributes) || {};
+  var reportYearStart = R.pathOr('--01-01', ['values', 0, 'name'], reportYearStartAttr);
+
+  var _R$match = R.match(/[\d]{2}/g, reportYearStart),
+      _R$match2 = (0, _slicedToArray3.default)(_R$match, 2),
+      month = _R$match2[0],
+      day = _R$match2[1];
+
+  return { month: month, day: day };
+};

package/lib/rules/src/table/factories/getLayoutData.js

@@ -9,6 +9,10 @@ var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
 
 var _slicedToArray3 = _interopRequireDefault(_slicedToArray2);
 
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -136,10 +140,10 @@ var getRowsData = function getRowsData(rowsIndexes, dimensions) {
   return R.unnest(res);
 };
 
-var getLayoutData = exports.getLayoutData = function getLayoutData(layoutIndexes, layout) {
+var getLayoutData = function getLayoutData(layoutIndexes, layout) {
   var header = layoutIndexes.header,
       sections = layoutIndexes.sections,
-      truncated = layoutIndexes.truncated;
+      rest = (0, _objectWithoutProperties3.default)(layoutIndexes, ['header', 'sections']);
 
   var headerData = R.map(function (i) {
     return indexesToLayoutData(layout.header, i);
@@ -157,5 +161,6 @@ var getLayoutData = exports.getLayoutData = function getLayoutData(layoutIndexes
     return [sectionData, rowsData];
   }, sections);
 
-  return { headerData: headerData, sectionsData: sectionsData, truncated: truncated };
-};
+  return (0, _extends3.default)({ headerData: headerData, sectionsData: sectionsData }, rest);
+};
+exports.getLayoutData = getLayoutData;

package/lib/rules/src/table/factories/refineLayoutSize.js

@@ -142,7 +142,7 @@ var refineLayoutSize = exports.refineLayoutSize = function refineLayoutSize(_ref
         sections = layoutIndexes.sections;
 
     if (R.isNil(limit) || limit === 0 || R.all(R.isEmpty, [header, sections])) {
-      return R.assoc('truncated', false, layoutIndexes);
+      return R.pipe(R.set(R.lensProp('truncated'), false), R.set(R.lensProp('totalCells'), null))(layoutIndexes);
     }
 
     //number of dimensions in header
@@ -178,7 +178,7 @@ var refineLayoutSize = exports.refineLayoutSize = function refineLayoutSize(_ref
 
     var excess = total - limit;
     if (excess <= 0) {
-      return R.assoc('truncated', false, layoutIndexes);
+      return R.pipe(R.set(R.lensProp('truncated'), false), R.set(R.lensProp('totalCells'), total))(layoutIndexes);
     }
 
     // total of cells in one column
@@ -205,6 +205,6 @@ var refineLayoutSize = exports.refineLayoutSize = function refineLayoutSize(_ref
 
     var result = getRefinedLayout(isVertical, truncated, refined);
 
-    return R.assoc('truncated', true, result);
+    return R.pipe(R.set(R.lensProp('truncated'), true), R.set(R.lensProp('totalCells'), total))(result);
   };
 };

package/lib/rules/src/v8-transformer.js

@@ -23,6 +23,8 @@ var _sdmxData = require('./sdmx-data');
 
 var _date = require('./date');
 
+var _getReportingYearStart = require('./preparators/getReportingYearStart');
+
 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; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -32,7 +34,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
 
   var getLanguage = R.pipe(R.pathOr('', ['meta', 'contentLanguages']), R.head());
   var locale = getLanguage(dataNew);
-
+  var reportYearStart = (0, _getReportingYearStart.getReportingYearStart)(dataNew);
   var getProp = function getProp(prop, locale) {
     return R.pathOr(null, [prop, locale]);
   };
@@ -47,7 +49,12 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       var valueAnnotations = R.pipe(R.propOr([], 'annotations'), R.flip(R.props)(annotations))(value);
       var name = getLocalisedProp('names')(value);
       var __indexPosition = NaN;
+      var start = null;
       if (isTimeDimension) {
+        start = new Date(R.prop('start', value));
+        start = Date.UTC(_dateFns2.default.getYear(start), _dateFns2.default.getMonth(start), _dateFns2.default.getDate(start), _dateFns2.default.getHours(start), _dateFns2.default.getMinutes(start), _dateFns2.default.getSeconds(start));
+        start = _dateFns2.default.addMonths(start, reportYearStart.month - 1);
+        start = _dateFns2.default.addDays(start, reportYearStart.day - 1);
         __indexPosition = _dateFns2.default.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
@@ -56,9 +63,8 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       var timeFormat = R.prop('timeFormat', options);
       return (0, _extends3.default)({}, value, {
         id: R.when(R.always(isTimeDimension), R.replace(/M/g, ''))(value.id),
-        name: R.when(R.always(isTimeDimension), function (name) {
-          return R.isNil(timeFormat) ? name : (0, _date.getTimePeriodLabel)(locale, timeFormat)(R.prop('start', value));
-        })(name),
+        name: R.when(R.always(isTimeDimension), R.always((0, _date.getReportedTimePeriodLabel)(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: value.start })))(name),
+        start: start ? start.toISOString() : null,
         __indexPosition: __indexPosition,
         __index: __index
       });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "9.2.2",
+  "version": "9.3.3",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -20,7 +20,7 @@
     "@react-hook/size": "^2.1.1",
     "@sis-cc/dotstatsuite-d3-charts": "^8.0.0",
     "@sis-cc/dotstatsuite-sdmxjs": "^4.5.2",
-    "@sis-cc/dotstatsuite-visions": "^6.4.2",
+    "@sis-cc/dotstatsuite-visions": "^6.6.1",
     "date-fns": "^1.30.1",
     "glamor": "^2.20.40",
     "glamorous": "^4.13.1",

package/src/rules/src/date.js

@@ -23,7 +23,40 @@ export const getLocale = R.cond([
   [R.T, R.always(en)]
 ]);
 
-const formaterPeriod = (locale, format) => date => dateFns.format(date, format, { locale: getLocale(locale) })
+const formaterPeriod = (locale, format) => date => dateFns.format(date, format, { locale: getLocale(locale) });
+
+export const getReportedTimePeriodLabel = (freq, _format, locale) => (reportYearStart, { id, start, reportedStart }) => {
+  const year = dateFns.getYear(start);
+  const reportStartDate = new Date(year, reportYearStart.month, reportYearStart.day);
+  const isReportFirstDate = dateFns.isEqual(reportStartDate, new Date(year, 1, 1));
+  if (isReportFirstDate || freq === 'D') {
+    return R.isNil(_format) ? id : dateFns.format(start, _format, { locale: getLocale(locale) });
+  }
+  const nextYear = year + 1;
+  if (freq === 'A') {
+    return `${year}/${nextYear}`;
+  }
+  if (freq === 'S') {
+    const [semester] = R.match(/S\d/, id);
+    return `${year}/${nextYear}-${semester}`;
+  }
+  if (freq === 'Q') {
+    const [quarter] = R.match(/Q\d/, id);
+    return `${year}/${nextYear}-${quarter}`;
+  }
+  if (freq === 'M') {
+    const isFirstDayOfMonth = dateFns.isFirstDayOfMonth(reportedStart);
+    if (isFirstDayOfMonth) {
+      return R.isNil(_format) ? id : dateFns.format(reportedStart, _format, { locale: getLocale(locale) });
+    }
+    const [month] = R.match(/M[\d]{2}/, id);
+    return `${year}/${nextYear}-${month}`;
+  }
+  // freq === 'W'
+  const [week] = R.match(/W[\d]{2}/, id)
+  return `${year}/${nextYear}-${week}`;
+}
+
 
 export const getTimePeriodLabel = (locale, format = 'YYYY MMM') => R.pipe(
   R.when(R.isNil, R.always('')),

package/src/rules/src/preparators/getReportingYearStart.js

@@ -0,0 +1,13 @@
+import * as R from 'ramda';
+
+export const getReportingYearStart = (sdmxJson) => {
+  const attributes = R.pipe(
+    R.pathOr({}, ['data', 'structure', 'attributes']),
+    ({ dataSet=[], observation=[], series=[] }) => [...dataSet, ...observation, ...series]
+  )(sdmxJson);
+
+  const reportYearStartAttr = R.find(R.propEq('id', 'REPORTING_YEAR_START_DAY'), attributes) || {};
+  const reportYearStart = R.pathOr('--01-01', ['values', 0, 'name'], reportYearStartAttr);
+  const [month, day] = R.match(/[\d]{2}/g, reportYearStart);
+  return ({ month, day });
+};

package/src/rules/src/table/factories/getLayoutData.js

@@ -150,7 +150,7 @@ const getRowsData = (rowsIndexes, dimensions) => {
 };
 
 export const getLayoutData = (layoutIndexes, layout) => {
-  const { header, sections, truncated } = layoutIndexes;
+  const { header, sections, ...rest } = layoutIndexes;
   const headerData = R.map(i => indexesToLayoutData(layout.header, i), header);
 
   const sectionsData = R.map(
@@ -165,5 +165,5 @@ export const getLayoutData = (layoutIndexes, layout) => {
     sections
   );
 
-  return ({ headerData, sectionsData, truncated });
+  return ({ headerData, sectionsData, ...rest });
 };

package/src/rules/src/table/factories/refineLayoutSize.js

@@ -140,7 +140,10 @@ const segregateLayout = (isVertical) => R.ifElse(
 export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndexes => {
   const { header, sections } = layoutIndexes;
   if (R.isNil(limit) || limit === 0 || R.all(R.isEmpty, [header, sections])) {
-    return R.assoc('truncated', false, layoutIndexes);
+    return R.pipe(
+      R.set(R.lensProp('truncated'), false), 
+      R.set(R.lensProp('totalCells'), null), 
+    )(layoutIndexes);
   }
 
   //number of dimensions in header
@@ -192,7 +195,10 @@ export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndex
 
   const excess = total - limit;
   if (excess <= 0) {
-    return R.assoc('truncated', false, layoutIndexes);
+    return R.pipe(
+      R.set(R.lensProp('truncated'), false), 
+      R.set(R.lensProp('totalCells'), total), 
+    )(layoutIndexes);
   }
 
   // total of cells in one column
@@ -202,7 +208,6 @@ export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndex
 
   const [toTruncate, toRefine] = segregateLayout(isVertical)(layoutIndexes);
 
-
   const cutLength = R.pipe(
     R.ifElse(R.identity, R.always(rowCellsCount), R.always(columnCellsCount)),
     R.divide(excess),
@@ -220,5 +225,8 @@ export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndex
 
   const result = getRefinedLayout(isVertical, truncated, refined);
 
-  return R.assoc('truncated', true, result);
+  return R.pipe(
+    R.set(R.lensProp('truncated'), true), 
+    R.set(R.lensProp('totalCells'), total), 
+  )(result);
 };

package/src/rules/src/v8-transformer.js

@@ -3,12 +3,13 @@ import dateFns from 'date-fns';
 import { getCodeOrder, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
   getRelationnalAnnotations, setAnnotationsLayout, getIsHidden, hiddenFormat } from './sdmx-data';
-import { getTimePeriodLabel } from './date';
+import { getReportedTimePeriodLabel } from './date';
+import { getReportingYearStart } from './preparators/getReportingYearStart';
 
 export const dataTransformer = (dataNew, options = {}) => {
   const getLanguage = R.pipe(R.pathOr('', ['meta', 'contentLanguages']), R.head());
   const locale = getLanguage(dataNew);
-
+  const reportYearStart = getReportingYearStart(dataNew);
   const getProp = (prop, locale) => R.pathOr(null,[prop, locale]);
   const getLocalisedProp = R.curry((prop, collection) => getProp(prop, locale)(collection));
   const getValues = R.map((value) => ({ ...value, name: getLocalisedProp('names', value) }));
@@ -21,7 +22,12 @@ export const dataTransformer = (dataNew, options = {}) => {
       )(value);
       const name = getLocalisedProp('names')(value);
       let __indexPosition = NaN;
+      let start = null;
       if (isTimeDimension) {
+        start = new Date(R.prop('start', value));
+        start = Date.UTC(dateFns.getYear(start), dateFns.getMonth(start), dateFns.getDate(start), dateFns.getHours(start), dateFns.getMinutes(start), dateFns.getSeconds(start));
+        start = dateFns.addMonths(start, reportYearStart.month - 1);
+        start = dateFns.addDays(start, reportYearStart.day - 1);
         __indexPosition = dateFns.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
@@ -36,8 +42,9 @@ export const dataTransformer = (dataNew, options = {}) => {
         )(value.id),
         name: R.when(
           R.always(isTimeDimension),
-          name => R.isNil(timeFormat) ? name : getTimePeriodLabel(locale, timeFormat)(R.prop('start', value))
+          R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start:value.start }))
         )(name),
+        start: start ? start.toISOString() : null,
         __indexPosition,
         __index,
       });

package/test/getTableData.test.js

@@ -1306,6 +1306,7 @@ describe('getTableData tests', () => {
       observationsType: null
     })).to.deep.equal({
       truncated: false,
+      totalCells: null,
       cells: {},
       headerData: [],
       sectionsData: [],

package/test/mocks/table-layout-multi-hierarchies--layoutData.json

@@ -32406,5 +32406,6 @@
             ]
         ]
     ],
-    "truncated": false
+    "truncated": false,
+    "totalCells": 2754
 }

package/test/mocks/table-layout-multi-hierarchies--sizedIndexes.json

@@ -2757,5 +2757,6 @@
             ]
         ]
     ],
-    "truncated": false
+    "truncated": false,
+    "totalCells": 2754
 }

package/test/mocks/table-layout-truncation1--layoutData.json

@@ -20353,5 +20353,6 @@
             ]
         ]
     ],
-    "truncated": true
+    "truncated": true,
+    "totalCells": 7503
 }

package/test/mocks/table-layout-truncation1--sizedIndexes.json

@@ -3006,5 +3006,6 @@
     "header": [
         []
     ],
-    "truncated": true
+    "truncated": true,
+    "totalCells": 7503
 }

package/test/refineLayoutSize.test.js

@@ -118,6 +118,7 @@ describe('refineLayoutSize tests', () => {
 
     const expected = {
       truncated: false,
+      totalCells: 57,
       header: [[0], [1], [2]],
       sections: [
         [[0], [[0], [1], [2]]],
@@ -179,6 +180,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 140,
       truncated: true,
       header: [[]],
       sections: [
@@ -260,6 +262,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 140,
       truncated: true,
       header: [
         [0, 0, 0],
@@ -310,6 +313,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 57,
       truncated: true,
       header: [[0],[2]],
       sections: [
@@ -349,6 +353,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 64,
       truncated:true,
       header: [
         [0, 0],
@@ -392,6 +397,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 64,
       truncated: true,
       header: [
         [0, 0],