@sis-cc/dotstatsuite-components 15.0.17 → 15.0.19

package/lib/rules/src/date.js

@@ -124,7 +124,7 @@ var getReportedTimePeriodLabel = exports.getReportedTimePeriodLabel = function g
 };
 
 var getReportedTimePeriod = exports.getReportedTimePeriod = function getReportedTimePeriod(reportYearStart, value, freq) {
-  var start = dateWithoutTZ(new Date(R.prop('start', value)));
+  var start = new Date(R.prop('start', value));
   var end = dateWithoutTZ(new Date(R.prop('end', value)));
   if (reportYearStart.month === '01' && reportYearStart.day === '01') {
     return { start: start, end: end };

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

@@ -53,9 +53,7 @@ var getTableProps = exports.getTableProps = function getTableProps(_ref) {
 
   var confirmedSeriesAttributesIds = (0, _getConfirmedSeriesAttributesIds.getConfirmedSeriesAttributesIds)(seriesAttributes, layoutIds);
 
-  var headerDimensionsIds = R.pluck('id', R.concat(R.pathOr([], ['units', 'headerUnits'], data), R.values(R.pathOr({}, ['dimensions', 'one'], data))));
-
-  var refinedMetadataCoordinates = (0, _refineMetadataCoordinates.refineMetadataCoordinates)(data.metadataCoordinates, layoutIds, headerDimensionsIds);
+  var refinedMetadataCoordinates = (0, _refineMetadataCoordinates.refineMetadataCoordinates)(data.metadataCoordinates, layoutIds);
 
   var _R$propOr = R.propOr({}, 'units', data),
       rejectedValueIds = _R$propOr.rejectedValueIds,

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

@@ -86,7 +86,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       return (0, _extends3.default)({}, value, {
         id: R.pipe(R.when(R.isNil, R.always(parent + '-' + __index)), R.when(R.always(isTimeDimension), R.replace(/M/g, '')))(value.id),
         display: !isHidden,
-        name: R.when(R.always(isTimeDimension), R.always((0, _date.getReportedTimePeriodLabel)(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: (0, _date.dateWithoutTZ)(new Date(value.start)) })))(name),
+        name: R.when(R.always(isTimeDimension), R.always((0, _date.getReportedTimePeriodLabel)(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: new Date(value.start) })))(name),
         start: start ? start.toISOString() : null,
         notes: notes,
         __indexPosition: __indexPosition,

package/lib/rules2/src/refineMetadataCoordinates.js

@@ -11,9 +11,10 @@ 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; } }
 
-var refineMetadataCoordinates = exports.refineMetadataCoordinates = function refineMetadataCoordinates(metadataCoordinates, layoutIds, headerDimensionsIds) {
+var refineMetadataCoordinates = exports.refineMetadataCoordinates = function refineMetadataCoordinates(metadataCoordinates, layoutIds) {
+  var relevantIds = R.pipe(R.values, R.unnest)(layoutIds);
   return R.reduce(function (acc, coordinates) {
-    var refinedCoord = R.omit(headerDimensionsIds, coordinates);
+    var refinedCoord = R.pick(relevantIds, coordinates);
     if (R.isEmpty(refinedCoord)) {
       return acc;
     }

package/package.json

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

package/src/rules/src/date.js

@@ -60,7 +60,7 @@ export const getReportedTimePeriodLabel = (freq, _format, locale) => (reportYear
 };
 
 export const getReportedTimePeriod = (reportYearStart, value, freq) => {
-  let start = dateWithoutTZ(new Date(R.prop('start', value)));
+  let start = new Date(R.prop('start', value));
   let end = dateWithoutTZ(new Date(R.prop('end', value)));
   if(reportYearStart.month === '01' && reportYearStart.day === '01') {
     return ({ start, end });

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

@@ -23,11 +23,7 @@ export const getTableProps = ({ data, layoutIds, display, customAttributes, limi
     layoutIds
   );
 
-  const headerDimensionsIds = R.pluck('id',
-      R.concat(R.pathOr([], ['units', 'headerUnits'], data), R.values(R.pathOr({}, ['dimensions', 'one'], data)))
-  );
-
-  const refinedMetadataCoordinates = refineMetadataCoordinates(data.metadataCoordinates, layoutIds, headerDimensionsIds);
+  const refinedMetadataCoordinates = refineMetadataCoordinates(data.metadataCoordinates, layoutIds);
 
   const {
     rejectedValueIds,

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, getReportedTimePeriodNote, getReportedTimePeriod, dateWithoutTZ } from './date';
+import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod } from './date';
 import { getReportingYearStart } from './preparators/getReportingYearStart';
 import { getNotDisplayedIds } from '../../rules2/src';
 
@@ -75,7 +75,7 @@ export const dataTransformer = (dataNew, options = {}) => {
         display: !isHidden,
         name: R.when(
           R.always(isTimeDimension),
-          R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: dateWithoutTZ(new Date(value.start)) }))
+          R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: new Date(value.start) }))
         )(name),
         start: start ? start.toISOString() : null,
         notes,

package/src/rules2/src/refineMetadataCoordinates.js

@@ -1,9 +1,10 @@
 import * as R from 'ramda';
 
-export const refineMetadataCoordinates = (metadataCoordinates, layoutIds, headerDimensionsIds) => {
+export const refineMetadataCoordinates = (metadataCoordinates, layoutIds) => {
+  const relevantIds = R.pipe(R.values, R.unnest)(layoutIds);
   return R.reduce(
     (acc, coordinates) => {
-      const refinedCoord = R.omit(headerDimensionsIds, coordinates);
+      const refinedCoord = R.pick(relevantIds, coordinates);
       if (R.isEmpty(refinedCoord)) {
         return acc;
       }

package/test/refineMetadataCoordinates.test.js

@@ -0,0 +1,86 @@
+import { expect } from 'chai';
+import { refineMetadataCoordinates } from "../src/rules2/src/refineMetadataCoordinates";
+
+describe('refineMetadataCoordinates', () => {
+  it('test', () => {
+    const coordinates = [
+      {},
+      {
+          "MEASURE": "EMP",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+      },
+      {
+          "MEASURE": "POP",
+          "ACTIVITY": "_Z",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+      },
+      {
+          "MEASURE": "SAL",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+      },
+      {
+          "MEASURE": "SELF",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+      }
+    ];
+    const layoutIds = {
+      header: ['TIME_PERIOD'],
+      sections: ['ACTIVITY', 'ADJUSTMENT'],
+      rows: ['MEASURE', 'UNIT_MEASURE', 'PRICE_BASE', 'TRANSFORMATION']
+    };
+    expect(refineMetadataCoordinates(coordinates, layoutIds, [])).to.deep.equal({
+      cells: [],
+      header: [],
+      sections: [],
+      rows: [
+        {
+          "MEASURE": "EMP",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+        },
+        {
+          "MEASURE": "POP",
+          "ACTIVITY": "_Z",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+        },
+        {
+          "MEASURE": "SAL",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+        },
+        {
+          "MEASURE": "SELF",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+        }
+      ]
+    });
+  });
+});