@sis-cc/dotstatsuite-components 17.12.4 → 17.12.5

package/lib/rules2/src/combinedValuesDisplay.js

@@ -36,9 +36,10 @@ var singleValueDisplay = exports.singleValueDisplay = function singleValueDispla
 var _combinedValuesDisplay = function _combinedValuesDisplay(_display) {
   return function (values) {
     return R.pipe(R.reduce(function (acc, val) {
-      if ((!R.propOr(true, 'display', val) || R.includes(val.id, _constants.REJECTED_VALUE_IDS)) && _display === 'label') {
-        return acc;
-      }
+      if (R.isNil(val)) return acc;
+      var isDisplayed = R.propOr(true, 'display', val);
+      var isRejected = R.includes(val.id, _constants.REJECTED_VALUE_IDS);
+      if ((!isDisplayed || isRejected) && _display === 'label') return acc;
       return R.append(singleValueDisplay(_display, val), acc);
     }, []), function (labels) {
       if (!R.isEmpty(labels) || _display !== 'label') {

package/package.json

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

package/src/rules2/src/combinedValuesDisplay.js

@@ -36,13 +36,10 @@ export const singleValueDisplay = (display, value) => {
 const _combinedValuesDisplay = (_display) => (values) =>
   R.pipe(
     R.reduce((acc, val) => {
-      if (
-        (!R.propOr(true, 'display', val) ||
-          R.includes(val.id, REJECTED_VALUE_IDS)) &&
-        _display === 'label'
-      ) {
-        return acc;
-      }
+      if (R.isNil(val)) return acc;
+      const isDisplayed = R.propOr(true, 'display', val);
+      const isRejected = R.includes(val.id, REJECTED_VALUE_IDS);
+      if ((!isDisplayed || isRejected) && _display === 'label') return acc;
       return R.append(singleValueDisplay(_display, val), acc);
     }, []),
     (labels) => {

package/test/combinedValuesDisplay.test.js

@@ -0,0 +1,66 @@
+import { expect } from 'chai';
+import * as R from 'ramda';
+import { combinedValuesDisplay } from '../src/rules2/src/combinedValuesDisplay';
+
+describe('combinedValuesDisplay tests', () => {
+  const values = [
+    {
+      id: 'F3RES',
+      order: 424,
+      name: 'Debt securities issued by residents',
+      annotations: [21],
+      display: true,
+      start: null,
+      notes: [],
+      __indexPosition: 0,
+      __index: 0,
+      parents: [],
+    },
+    {
+      id: 'W',
+      order: 440,
+      name: 'World',
+      annotations: [11, 12],
+      display: false,
+      start: null,
+      notes: [],
+      __indexPosition: 0,
+      __index: 0,
+    },
+    {
+      id: 'S11',
+      order: 2,
+      name: 'Non financial corporations',
+      parent: 'S1',
+      parents: ['S1'],
+      annotations: [18, 19],
+      display: true,
+      start: null,
+      notes: [],
+      __indexPosition: 1,
+      __index: 0,
+    },
+    null,
+  ];
+
+  const testdata = [
+    {
+      display: 'label',
+      expected: 'Debt securities issued by residents, Non financial corporations',
+    },
+    {
+      display: 'code',
+      expected: 'F3RES, W, S11'
+    },
+    {
+      display: 'both',
+      expected: '(F3RES, W, S11) Debt securities issued by residents, Non financial corporations',
+    }
+  ];
+
+  R.forEach(({display, expected}) => {
+    it(`should pass with display ${display}`, () => {
+      expect(combinedValuesDisplay(display, values)).to.deep.equal(expected);
+    });
+  }, testdata);
+});