@sis-cc/dotstatsuite-components 13.4.0 → 13.5.0

package/lib/rules/src/date.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTimePeriodLabel = exports.getReportedTimePeriodLabel = exports.getLocale = undefined;
+exports.getTimePeriodLabel = exports.getReportedTimePeriodNote = exports.getReportedTimePeriod = exports.getReportedTimePeriodLabel = exports.getLocale = undefined;
 
 var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
 
@@ -119,6 +119,59 @@ var getReportedTimePeriodLabel = exports.getReportedTimePeriodLabel = function g
   };
 };
 
+var getReportedTimePeriod = exports.getReportedTimePeriod = function getReportedTimePeriod(reportYearStart, value, freq) {
+  if (reportYearStart.month === '01' && reportYearStart.day === '01') {
+    return value;
+  }
+  var start = new Date(R.prop('start', value));
+  start = _dateFns2.default.addMinutes(start, start.getTimezoneOffset());
+  start = _dateFns2.default.addMonths(start, reportYearStart.month - 1);
+  start = _dateFns2.default.addDays(start, reportYearStart.day - 1);
+  var end = void 0;
+  if (freq === 'A') {
+    end = _dateFns2.default.addYears(start, 1);
+  }
+  if (freq === 'S') {
+    end = _dateFns2.default.addMonths(start, 6);
+  }
+  if (freq === 'Q') {
+    end = _dateFns2.default.addMonths(start, 3);
+  }
+  if (freq === 'M') {
+    end = _dateFns2.default.addMonths(start, 6);
+  }
+  if (freq === 'W' || freq === 'B') {
+    end = _dateFns2.default.addDays(start, 7);
+  }
+  if (freq === 'D') {
+    end = _dateFns2.default.addDays(start, 1);
+  }
+  if (freq === 'H') {
+    end = _dateFns2.default.addHours(start, 1);
+  }
+  if (freq === 'N') {
+    end = _dateFns2.default.addMinutes(start, 1);
+  }
+  end = _dateFns2.default.subSeconds(end, 1);
+  return { start: start, end: end };
+};
+
+var getReportedTimePeriodNote = exports.getReportedTimePeriodNote = function getReportedTimePeriodNote(reportYearStart, start, end, freq) {
+  if (reportYearStart.month === '01' && reportYearStart.day === '01') {
+    return null;
+  }
+  if (R.includes(freq, ['D', 'H', 'N'])) {
+    return null;
+  }
+  var isFirstDayOfMonth = _dateFns2.default.isFirstDayOfMonth(start);
+  if (freq === 'M' && isFirstDayOfMonth) {
+    return null;
+  }
+  var formatedStart = _dateFns2.default.format(start, 'YYYY-MM-DD');
+  var formatedEnd = _dateFns2.default.format(end, 'YYYY-MM-DD');
+  return { label: formatedStart + ' - ' + formatedEnd };
+};
+
 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/header/getDefaultSubtitle.js

@@ -39,7 +39,7 @@ var getDefaultSubtitle = exports.getDefaultSubtitle = function getDefaultSubtitl
       return acc;
     }
 
-    var flags = _getFlags({ attributes: R.propOr({}, 'attributes', value) });
+    var flags = _getFlags({ attributes: R.propOr({}, 'attributes', value), notes: R.propOr([], 'notes', value) });
 
     return R.append({
       header: formatter(dim) + ':',

package/lib/rules/src/header/getSubtitleFlags.js

@@ -39,7 +39,7 @@ var getSubtitleFlags = exports.getSubtitleFlags = function getSubtitleFlags(_ref
       return acc;
     }
 
-    var flags = _getFlags({ attributes: R.propOr({}, 'attributes', value) });
+    var flags = _getFlags({ attributes: R.propOr({}, 'attributes', value), notes: R.propOr([], 'notes', value) });
     if (R.isEmpty(flags)) {
       return acc;
     }

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

@@ -32,7 +32,9 @@ var getFlags = exports.getFlags = function getFlags(customAttributesIds, display
     var _ref$attributes = _ref.attributes,
         attributes = _ref$attributes === undefined ? {} : _ref$attributes,
         _ref$units = _ref.units,
-        units = _ref$units === undefined ? {} : _ref$units;
+        units = _ref$units === undefined ? {} : _ref$units,
+        _ref$notes = _ref.notes,
+        notes = _ref$notes === undefined ? [] : _ref$notes;
 
     var refinedAttributes = R.omit(R.propOr([], 'rejected', customAttributesIds), attributes);
     var flags = R.pipe(R.pick(R.propOr([], 'flags', customAttributesIds)), R.values)(refinedAttributes);
@@ -70,7 +72,9 @@ var getFlags = exports.getFlags = function getFlags(customAttributesIds, display
       return { code: code, label: label };
     }, [R.path(['value', 'id']), getAttrLabel(display)])), R.pipe(R.flip(R.concat)(separatedUnitsFootnotes), R.map(R.pipe(getAttrLabel(display), function (label) {
       return { label: label };
-    })), R.when(R.always(unitsDisplay === 'cells' && !R.isEmpty(fullUnitsFootnote)), R.append(fullUnitsFootnote)))])(flags, footnotes);
+    })), R.when(R.always(unitsDisplay === 'cells' && !R.isEmpty(fullUnitsFootnote)), R.append(fullUnitsFootnote)), function (res) {
+      return R.concat(res, notes);
+    })])(flags, footnotes);
   };
 };
 

package/lib/rules/src/table/preparators/getManyValuesDimensions.js

@@ -24,7 +24,7 @@ var getManyValuesDimensions = exports.getManyValuesDimensions = function getMany
     var dimensionIndex = R.prop(dimension.id, dimensionsIds);
     var values = R.map(function (value) {
       var valueAttributes = (0, _refineObservationsAttributesValues.refineObservationsAttributesValues)(attributes)(R.propOr({}, dimensionIndex + ':' + value.__index, attributeValues));
-      return (0, _extends3.default)({}, R.pick(['id', 'name', '__indexPosition', 'parent', '__index'], value), {
+      return (0, _extends3.default)({}, R.pick(['id', 'name', '__indexPosition', 'parent', '__index', 'notes'], value), {
         attributes: valueAttributes
       });
     }, dimension.values);

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

@@ -66,12 +66,23 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       var isHidden = R.has(parent + '.' + value.id, hiddenIds) || (0, _sdmxData.getIsHidden)(valueAnnotations);
       var name = (0, _dotstatsuiteSdmxjs.getRefinedName)(value);
       var __indexPosition = NaN;
+      var notes = [];
       var start = null;
+      var end = 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);
+        /*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);
+        end = new Date(R.prop('end', value));
+        end = Date.UTC(dateFns.getYear(end), dateFns.getMonth(end), dateFns.getDate(end), dateFns.getHours(end), dateFns.getMinutes(end), dateFns.getSeconds(end));
+        end = dateFns.addMonths(end, reportYearStart.month - 1);
+        end = dateFns.addDays(end, reportYearStart.day - 1);*/
+        var reported = (0, _date.getReportedTimePeriod)(reportYearStart, value, options.frequency);
+        start = reported.start;
+        end = reported.end;
+        var reportTimeNote = (0, _date.getReportedTimePeriodNote)(reportYearStart, start, end, options.frequency, options.isRtl);
+        notes = R.isNil(reportTimeNote) ? notes : R.append(reportTimeNote, notes);
         __indexPosition = _dateFns2.default.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
@@ -83,6 +94,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
         display: !isHidden,
         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,
+        notes: notes,
         __indexPosition: __indexPosition,
         __index: __index
       });

package/lib/rules2/src/getAdvancedAttributes.js

@@ -116,11 +116,9 @@ var getSeriesAdvancedAttributes = exports.getSeriesAdvancedAttributes = function
       var dim = R.nth(Number(dInd), dimensions);
       var valId = R.path(['values', Number(vInd), 'id'], dim);
       var coordinates = (0, _defineProperty3.default)({}, dim.id, valId);
-      var refinedKey = keyTemplate;
-      refinedKey[Number(dInd)] = vInd;
+      var refinedKey = R.set(R.lensIndex(Number(dInd)), vInd)(keyTemplate);
       return R.assoc(R.join(':', refinedKey), { attributes: advancedAttributes, coordinates: coordinates }, acc);
     }, {}, R.keys(series));
   })(seriesAttributes);
-
   return R.merge(seriesAdvancedAttributes, dimensionsAdvancedAttributes);
 };

package/lib/rules2/src/parseMetadataSeries.js

@@ -109,9 +109,7 @@ var parseMetadataSeries = exports.parseMetadataSeries = function parseMetadataSe
         });
 
         return makeTree(R.propOr([], '#ROOT', groupedAttrs));
-      }, R.reject(function (attr) {
-        return R.isNil(attr.value) && R.isEmpty(attr.children || []);
-      }))(metaIndexes);
+      })(metaIndexes);
 
       return R.assoc(evolvedKey, attributes, acc);
     }, {}, R.keys(series));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "13.4.0",
+  "version": "13.5.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",

package/src/rules/src/date.js

@@ -55,7 +55,60 @@ export const getReportedTimePeriodLabel = (freq, _format, locale) => (reportYear
   // freq === 'W'
   const [week] = R.match(/W[\d]{2}/, id)
   return `${year}/${nextYear}-${week}`;
-}
+};
+
+export const getReportedTimePeriod = (reportYearStart, value, freq) => {
+  if(reportYearStart.month === '01' && reportYearStart.day === '01') {
+    return value;
+  }
+  let start = new Date(R.prop('start', value));
+  start = dateFns.addMinutes(start, start.getTimezoneOffset());
+  start = dateFns.addMonths(start, reportYearStart.month - 1);
+  start = dateFns.addDays(start, reportYearStart.day - 1);
+  let end;
+  if (freq === 'A') {
+    end = dateFns.addYears(start, 1);
+  }
+  if (freq === 'S') {
+    end = dateFns.addMonths(start, 6);
+  }
+  if (freq === 'Q') {
+    end = dateFns.addMonths(start, 3);
+  }
+  if (freq === 'M') {
+    end = dateFns.addMonths(start, 6);
+  }
+  if (freq === 'W' || freq === 'B') {
+    end = dateFns.addDays(start, 7);
+  }
+  if (freq === 'D') {
+    end = dateFns.addDays(start, 1);
+  }
+  if (freq === 'H') {
+    end = dateFns.addHours(start, 1);
+  }
+  if (freq === 'N') {
+    end = dateFns.addMinutes(start, 1);
+  }
+  end = dateFns.subSeconds(end, 1);
+  return ({ start, end });
+};
+
+export const getReportedTimePeriodNote = (reportYearStart, start, end, freq) => {
+  if(reportYearStart.month === '01' && reportYearStart.day === '01') {
+    return null;
+  } 
+  if (R.includes(freq, ['D', 'H', 'N'])) {
+    return null;
+  }
+  const isFirstDayOfMonth = dateFns.isFirstDayOfMonth(start);
+  if (freq === 'M' && isFirstDayOfMonth) {
+    return null;
+  }
+  const formatedStart = dateFns.format(start, 'YYYY-MM-DD');
+  const formatedEnd = dateFns.format(end, 'YYYY-MM-DD');
+  return ({ label: `${formatedStart} - ${formatedEnd}` });
+};
 
 
 export const getTimePeriodLabel = (locale, format = 'YYYY MMM') => R.pipe(

package/src/rules/src/header/getDefaultSubtitle.js

@@ -26,7 +26,7 @@ export const getDefaultSubtitle = ({ customAttributes, dimensions, display, unit
           return acc;
         }
 
-        const flags = _getFlags({ attributes: R.propOr({}, 'attributes', value) });
+        const flags = _getFlags({ attributes: R.propOr({}, 'attributes', value), notes: R.propOr([], 'notes', value) });
 
         return R.append({
           header: `${formatter(dim)}:`,

package/src/rules/src/header/getSubtitleFlags.js

@@ -26,7 +26,7 @@ export const getSubtitleFlags = ({ customAttributes, dimensions, display, units
           return acc;
         }
 
-        const flags = _getFlags({ attributes: R.propOr({}, 'attributes', value) });
+        const flags = _getFlags({ attributes: R.propOr({}, 'attributes', value), notes: R.propOr([], 'notes', value) });
         if (R.isEmpty(flags)) {
           return acc;
         }

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

@@ -4,7 +4,7 @@ import { hasCellMetadata } from '../../../../rules2/src/hasCellMetadata';
 
 const getAttrLabel = (display) => (attribute) => `${display(attribute)}: ${display(R.propOr({}, 'value', attribute))}`;
 
-export const getFlags = (customAttributesIds, display, unitsProps) => ({ attributes={}, units={} }) => {
+export const getFlags = (customAttributesIds, display, unitsProps) => ({ attributes={}, units={}, notes=[] }) => {
   const refinedAttributes = R.omit(R.propOr([], 'rejected', customAttributesIds), attributes);
   const flags = R.pipe(R.pick(R.propOr([], 'flags', customAttributesIds)), R.values)(refinedAttributes);
   const footnotes = R.pipe(R.pick(R.propOr([], 'notes', customAttributesIds)), R.values)(refinedAttributes);
@@ -68,7 +68,8 @@ export const getFlags = (customAttributesIds, display, unitsProps) => ({ attribu
         R.when(
           R.always(unitsDisplay === 'cells' && !R.isEmpty(fullUnitsFootnote)),
           R.append(fullUnitsFootnote)
-        )
+        ),
+        res => R.concat(res, notes)
       )
     ]
   )(flags, footnotes);

package/src/rules/src/table/preparators/getManyValuesDimensions.js

@@ -9,7 +9,7 @@ export const getManyValuesDimensions = (dimensionsByIds, dimensionsIds, attribut
         const valueAttributes = refineObservationsAttributesValues(attributes)
           (R.propOr({}, `${dimensionIndex}:${value.__index}`, attributeValues));
         return ({
-          ...R.pick(['id', 'name', '__indexPosition', 'parent', '__index'], value),
+          ...R.pick(['id', 'name', '__indexPosition', 'parent', '__index', 'notes'], value),
           attributes: valueAttributes,
         });
       }, dimension.values);

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

@@ -3,7 +3,7 @@ import dateFns from 'date-fns';
 import { getCodeOrder, getRefinedName, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
   getRelationnalAnnotations, setAnnotationsLayout, getIsHidden } from './sdmx-data';
-import { getReportedTimePeriodLabel } from './date';
+import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod } from './date';
 import { getReportingYearStart } from './preparators/getReportingYearStart';
 import { getNotDisplayedIds } from '../../rules2/src';
 
@@ -43,12 +43,23 @@ export const dataTransformer = (dataNew, options = {}) => {
       const isHidden = R.has(`${parent}.${value.id}`, hiddenIds) || getIsHidden(valueAnnotations);
       const name = getRefinedName(value);
       let __indexPosition = NaN;
+      let notes = [];
       let start = null;
+      let end = null;
       if (isTimeDimension) {
-        start = new Date(R.prop('start', value));
+        /*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);
+        end = new Date(R.prop('end', value));
+        end = Date.UTC(dateFns.getYear(end), dateFns.getMonth(end), dateFns.getDate(end), dateFns.getHours(end), dateFns.getMinutes(end), dateFns.getSeconds(end));
+        end = dateFns.addMonths(end, reportYearStart.month - 1);
+        end = dateFns.addDays(end, reportYearStart.day - 1);*/
+        const reported = getReportedTimePeriod(reportYearStart, value, options.frequency);
+        start = reported.start;
+        end = reported.end;
+        const reportTimeNote = getReportedTimePeriodNote(reportYearStart, start, end, options.frequency, options.isRtl);
+        notes = R.isNil(reportTimeNote) ? notes : R.append(reportTimeNote, notes);
         __indexPosition = dateFns.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
@@ -67,6 +78,7 @@ export const dataTransformer = (dataNew, options = {}) => {
           R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start:value.start }))
         )(name),
         start: start ? start.toISOString() : null,
+        notes,
         __indexPosition,
         __index,
       });

package/src/rules2/src/getAdvancedAttributes.js

@@ -100,14 +100,12 @@ export const getSeriesAdvancedAttributes = (seriesAttributes, dimensions, advanc
         const dim = R.nth(Number(dInd), dimensions);
         const valId = R.path(['values', Number(vInd), 'id'], dim);
         const coordinates = { [dim.id]: valId };
-        let refinedKey = keyTemplate;
-        refinedKey[Number(dInd)] = vInd;
+        const refinedKey = R.set(R.lensIndex(Number(dInd)), vInd)(keyTemplate);
         return R.assoc(R.join(':', refinedKey), { attributes: advancedAttributes, coordinates }, acc);
       },
       {},
       R.keys(series)
     )
   )(seriesAttributes);
-
   return R.merge(seriesAdvancedAttributes, dimensionsAdvancedAttributes);
 };

package/src/rules2/src/parseMetadataSeries.js

@@ -105,7 +105,6 @@ export const parseMetadataSeries = (metadataJson, options) => {
 
           return makeTree(R.propOr([], '#ROOT', groupedAttrs));
         },
-        R.reject(attr => R.isNil(attr.value) && R.isEmpty(attr.children || []))
       )(metaIndexes);
 
       return R.assoc(evolvedKey, attributes, acc);

package/test/getSeriesAdvancedAttributes.test.js

@@ -9,6 +9,7 @@ describe('getSeriesAdvancedAttributes tests', () => {
         '0:1:0:x:x': { attributes: { a0: { id: 'a0' }, a1: { id: 'a1' } } },
       },
       dimensions: {
+        '2:0': { attributes: { a1: { id: 'a1' } } },
         '3:0': { attributes: { a0: { id: 'a0' } } },
         '4:1': { attributes: { a0: { id: 'a0' }, a1: { id: 'a1' } } },
       }
@@ -24,6 +25,7 @@ describe('getSeriesAdvancedAttributes tests', () => {
 
     expect(getSeriesAdvancedAttributes(seriesAttributes, dimensions, advancedAttributesIds)).to.deep.equal({
       '0:1:0::': { attributes: { a1: { id: 'a1' } }, coordinates: { d0: 'v0', d1: 'v1', d2: 'v0' } },
+      '::0::': { attributes: { a1: { id: 'a1' } }, coordinates: { d2: 'v0' } },
       '::::1': { attributes: { a1: { id: 'a1' } }, coordinates: { d4: 'v1' } }
     });
   });