@sis-cc/dotstatsuite-components 15.0.12 → 15.0.14

package/lib/rules/src/date.js

@@ -129,7 +129,6 @@ var getReportedTimePeriod = exports.getReportedTimePeriod = function getReported
   if (reportYearStart.month === '01' && reportYearStart.day === '01') {
     return { start: start, end: end };
   }
-  start = _dateFns2.default.addMinutes(start, start.getTimezoneOffset());
   start = _dateFns2.default.addMonths(start, reportYearStart.month - 1);
   start = _dateFns2.default.addDays(start, reportYearStart.day - 1);
   if (freq === 'A') {

package/lib/rules2/src/getSidebarData.js

@@ -63,8 +63,9 @@ var getSidebarData = exports.getSidebarData = function getSidebarData(attributes
         return (0, _extends3.default)({}, acc, { split: R.append('', acc.split) });
       }
       var dim = R.nth(dimIndex, dimensions);
-      var value = R.nth(Number(valIndex), dim.values);
-      if (!R.propOr(true, 'display', dim) || !R.propOr(true, 'display', value)) {
+      var values = R.propOr([], 'values', dim || {});
+      var value = R.nth(Number(valIndex), values);
+      if (!value || !R.propOr(true, 'display', dim) || !R.propOr(true, 'display', value)) {
         return (0, _extends3.default)({}, acc, { split: R.append('', acc.split) });
       }
       var dimLabel = dimensionValueDisplay(options.display)(dim);

package/package.json

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

package/src/rules/src/date.js

@@ -65,7 +65,6 @@ export const getReportedTimePeriod = (reportYearStart, value, freq) => {
   if(reportYearStart.month === '01' && reportYearStart.day === '01') {
     return ({ start, end });
   }
-  start = dateFns.addMinutes(start, start.getTimezoneOffset());
   start = dateFns.addMonths(start, reportYearStart.month - 1);
   start = dateFns.addDays(start, reportYearStart.day - 1);
   if (freq === 'A') {

package/src/rules2/src/getSidebarData.js

@@ -48,8 +48,9 @@ export const getSidebarData = (attributesSeries, metadataSeries, dataflow, dimen
             return ({ ...acc, split: R.append('', acc.split) });
           }
           const dim = R.nth(dimIndex, dimensions);
-          const value = R.nth(Number(valIndex), dim.values);
-          if (!R.propOr(true, 'display', dim) || !R.propOr(true, 'display', value)) {
+          const values = R.propOr([], 'values', dim || {});
+          const value = R.nth(Number(valIndex), values);
+          if (!value || !R.propOr(true, 'display', dim) || !R.propOr(true, 'display', value)) {
             return ({ ...acc, split: R.append('', acc.split) });
           }
           const dimLabel = dimensionValueDisplay(options.display)(dim);

package/test/getSidebarData.test.js

@@ -113,6 +113,108 @@ describe('getSidebarData tests', () => {
       }
     ]);
   });
+  it('discordadnce between dimensions and metadata case', () => {
+    const attributes = {
+      '::': [
+        { id: 'aa0', label: 'advanced attribute 0', value: 'value' },
+        { id: 'aa1', label: 'advanced attribute 1', value: 'value' },
+      ],
+      '0::': [
+        { id: 'aa2', label: 'advanced attribute 2', value: 'value' },
+        { id: 'aa3', label: 'advanced attribute 3', value: 'value' },
+      ]
+    };
+    const metadata = {
+      '0::': [
+        { id: 'ma0', label: 'metadata attribute 0', value: 'value' },
+        { id: 'ma1', label: 'metadata attribute 1', value: 'value' },
+      ],
+      '0::0': [
+        { id: 'ma2', label: 'metadata attribute 2', value: 'value' },
+        { id: 'ma3', label: 'metadata attribute 3', value: 'value' },
+      ]
+    };
+    const options = {
+      display: 'code',
+      attributesLabel: 'Advanced Attributes'
+    };
+    const dataflow = {
+      id: 'DF',
+      name: 'Dataflow'
+    };
+    const dimensions = [
+      { id: 'd0', name: 'dimension 0', values: [{ id: 'd0v0', name: 'value 0' }] },
+      { id: 'd1', name: 'dimension 1', values: [{ id: 'd1v0', name: 'value 0' }] },
+    ];
+    expect(getSidebarData(attributes, metadata, dataflow, dimensions, options)).to.deep.equal([
+      {
+        id: '0::',
+        label: 'd0: d0v0',
+        splitCoord: ['0', '', ''],
+        children: [
+          {
+            id: '0::-attr',
+            label: 'Advanced Attributes',
+            children: [
+              {
+                id: 'aa2',
+                label: 'advanced attribute 2',
+                value: 'value'
+              },
+              {
+                id: 'aa3',
+                label: 'advanced attribute 3',
+                value: 'value'
+              }
+            ]
+          },
+          {
+            id: 'ma0',
+            label: 'metadata attribute 0',
+            value: 'value'
+          },
+          {
+            id: 'ma1',
+            label: 'metadata attribute 1',
+            value: 'value'
+          },
+          {
+            id: 'ma2',
+            label: 'metadata attribute 2',
+            value: 'value'
+          },
+          {
+            id: 'ma3',
+            label: 'metadata attribute 3',
+            value: 'value'
+          }
+        ]
+      },
+      {
+        id: '::',
+        label: 'DF',
+        splitCoord: ['', '', ''],
+        children: [
+          {
+            id: '::-attr',
+            label: 'Advanced Attributes',
+            children: [
+              {
+                id: 'aa0',
+                label: 'advanced attribute 0',
+                value: 'value'
+              },
+              {
+                id: 'aa1',
+                label: 'advanced attribute 1',
+                value: 'value'
+              }
+            ]
+          }
+        ]
+      }
+    ]);
+  });
   it('non displayed dimensions handling', () => {
     const attributes = {
       '::': [