@sis-cc/dotstatsuite-components 17.12.2 → 17.12.4

package/lib/rules/src/dimension-utils.js

@@ -32,15 +32,16 @@ var dimensionValueDisplay = exports.dimensionValueDisplay = function dimensionVa
   return function (dimensionValue) {
     var id = (0, _get3.default)(dimensionValue, accessors.id || 'id', '');
     var name = (0, _get3.default)(dimensionValue, accessors.name || 'name', '');
+    // a non-coded component (dim | attr) has no name, names nor label
+    // the only valid thing to display is the id
+    if (dimensionValue.isNonCoded) return id;
     switch (display) {
       case 'label':
         return (0, _isEmpty3.default)(name) ? '[' + id + ']' : name;
       case 'code':
         return id;
       case 'both':
-        if ((0, _isNil3.default)(id) || (0, _isEmpty3.default)(id)) {
-          return name;
-        }
+        if ((0, _isNil3.default)(id) || (0, _isEmpty3.default)(id)) return name;
         return '(' + id + ') ' + name;
       default:
         return null;

package/lib/rules/src/get-values-enhanced.js

@@ -93,7 +93,8 @@ var getValuesEnhanced = exports.getValuesEnhanced = function getValuesEnhanced(_
       start: start ? start.toISOString() : null,
       notes: notes,
       __indexPosition: __indexPosition,
-      __index: __index
+      __index: __index,
+      isNonCoded: isNonCoded(value)
     });
     if (!isNonCoded(value)) {
       res = R.assoc('name', getName({ isTimeDimension: isTimeDimension, options: options, locale: locale, start: start, reportYearStart: reportYearStart })(value), res);

package/lib/rules/test/get-values-enhanced.test.js

@@ -86,13 +86,15 @@ var nonCodedValues = [{ value: 'A' }, { value: 'B' }, { value: 'C' }];
 
 var expectedValues = function expectedValues() {
   var skippedValueEntries = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var isNonCoded = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return R.addIndex(R.map)(function (value, index) {
     return (0, _extends3.default)({}, R.omit(R.prepend('names', skippedValueEntries), value), {
       __index: index,
       __indexPosition: index,
       display: true,
       notes: [],
-      start: R.propOr(null, 'start', value)
+      start: R.propOr(null, 'start', value),
+      isNonCoded: isNonCoded
     });
   });
 };
@@ -111,7 +113,7 @@ describe('get values enhanced method', function () {
       locale: 'en',
       parent: 'ID'
     })(nonCodedValues);
-    (0, _chai.expect)(enhancedValues).to.deep.equal(expectedValues(['name', 'order', 'value'])(values));
+    (0, _chai.expect)(enhancedValues).to.deep.equal(expectedValues(['name', 'order', 'value'], true)(values));
   });
 
   it('should pass with time values', function () {

package/lib/rules2/src/combinedValuesDisplay.js

@@ -60,8 +60,10 @@ var _combinedValuesDisplay = function _combinedValuesDisplay(_display) {
 var combinedValuesDisplay = exports.combinedValuesDisplay = function combinedValuesDisplay(display, values) {
   if (display === 'both') {
     return R.converge(function (_ids, labels) {
-      var ids = R.isEmpty(_ids) ? _ids : '(' + _ids + ')';
-      return R.isEmpty(ids) ? labels : ids + ' ' + labels;
+      return (0, _src.dimensionValueDisplay)('both')({
+        id: _ids,
+        name: labels
+      });
     }, [_combinedValuesDisplay('code'), _combinedValuesDisplay('label')])(values);
   }
   return _combinedValuesDisplay(display)(values);

package/package.json

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

package/src/rules/src/dimension-utils.js

@@ -1,38 +1,52 @@
 import { isEmpty, isNil, get, has, reduce } from 'lodash';
 
-export const dimensionValueDisplay = (display, accessors = {}) => (dimensionValue) => {
-  const id = get(dimensionValue, accessors.id || 'id', '');
-  const name = get(dimensionValue, accessors.name || 'name', '');
-  switch(display) {
-    case 'label':
-      return isEmpty(name) ? `[${id}]` : name;
-    case 'code':
-      return id;
-    case 'both':
-      if (isNil(id) || isEmpty(id)) {
-        return name;
-      }
-      return `(${id}) ${name}`
-    default:
-      return null;
-  }
-};
+export const dimensionValueDisplay =
+  (display, accessors = {}) =>
+  (dimensionValue) => {
+    const id = get(dimensionValue, accessors.id || 'id', '');
+    const name = get(dimensionValue, accessors.name || 'name', '');
+    // a non-coded component (dim | attr) has no name, names nor label
+    // the only valid thing to display is the id
+    if (dimensionValue.isNonCoded) return id;
+    switch (display) {
+      case 'label':
+        return isEmpty(name) ? `[${id}]` : name;
+      case 'code':
+        return id;
+      case 'both':
+        if (isNil(id) || isEmpty(id)) return name;
+        return `(${id}) ${name}`;
+      default:
+        return null;
+    }
+  };
 
 export const dimensionValueDisplayAt = (dimension, index, display) => {
   const dimensionValue = get(dimension, `values[${Number(index)}]`, {});
   return dimensionValueDisplay(display)(dimensionValue);
 };
 
-export const categoryDisplay = (splitObservationKey, dimensions, dimensionsWithValuesIndexedById, rejectedId, display) => {
+export const categoryDisplay = (
+  splitObservationKey,
+  dimensions,
+  dimensionsWithValuesIndexedById,
+  rejectedId,
+  display,
+) => {
   return reduce(
     splitObservationKey,
     (memo, dimensionValueIndex, dimensionIndex) => {
       const dimension = get(dimensions, `[${dimensionIndex}]`, {});
-      if (has(dimensionsWithValuesIndexedById, dimension.id) && dimension.id !== rejectedId) {
-        memo.push(dimensionValueDisplayAt(dimension, dimensionValueIndex, display));
+      if (
+        has(dimensionsWithValuesIndexedById, dimension.id) &&
+        dimension.id !== rejectedId
+      ) {
+        memo.push(
+          dimensionValueDisplayAt(dimension, dimensionValueIndex, display),
+        );
       }
       return memo;
     },
-    []
+    [],
   ).join(' - ');
-};
+};

package/src/rules/src/get-values-enhanced.js

@@ -77,6 +77,7 @@ export const getValuesEnhanced = ({
         notes,
         __indexPosition,
         __index,
+        isNonCoded: isNonCoded(value),
       };
       if (!isNonCoded(value)) {
         res = R.assoc(
@@ -104,9 +105,7 @@ export const getValuesEnhanced = ({
   );
 };
 
-const getDateForSort = (key) => (val) => {
-  return dateFns.getTime(new Date(R.prop(key, val)));
-};
+const getDateForSort = (key) => (val) => dateFns.getTime(new Date(R.prop(key, val)));
 const byStartDate = R.ascend(getDateForSort('start'));
 const byEndDate = R.descend(getDateForSort('end'));
 const timeDimensionSorts = [byStartDate, byEndDate];

package/src/rules/test/get-values-enhanced.test.js

@@ -82,7 +82,7 @@ const expectedTimeValues = [
 
 const nonCodedValues = [{ value: 'A' }, { value: 'B' }, { value: 'C' }];
 
-const expectedValues = (skippedValueEntries = []) => R.addIndex(R.map)((value, index) => {
+const expectedValues = (skippedValueEntries = [], isNonCoded = false) => R.addIndex(R.map)((value, index) => {
   return {
     ...R.omit(R.prepend('names', skippedValueEntries), value),
     __index: index,
@@ -90,6 +90,7 @@ const expectedValues = (skippedValueEntries = []) => R.addIndex(R.map)((value, i
     display: true,
     notes: [],
     start: R.propOr(null, 'start', value),
+    isNonCoded,
   };
 });
 
@@ -108,7 +109,7 @@ describe('get values enhanced method', () => {
       parent: 'ID',
     })(nonCodedValues);
     expect(enhancedValues).to.deep.equal(
-      expectedValues(['name', 'order', 'value'])(values),
+      expectedValues(['name', 'order', 'value'], true)(values),
     );
   });
 

package/src/rules2/src/combinedValuesDisplay.js

@@ -5,7 +5,10 @@ import { REJECTED_VALUE_IDS } from './constants';
 const getRefinedMissinParentsLabels = R.pipe(
   R.propOr([], 'missingParents'),
   R.reduce((acc, par) => {
-    if (!R.propOr(true, 'display', par) || R.includes(par.id, REJECTED_VALUE_IDS)) {
+    if (
+      !R.propOr(true, 'display', par) ||
+      R.includes(par.id, REJECTED_VALUE_IDS)
+    ) {
       return acc;
     }
     return R.append(dimensionValueDisplay('label')(par), acc);
@@ -13,54 +16,62 @@ const getRefinedMissinParentsLabels = R.pipe(
 );
 
 export const singleValueDisplay = (display, value) => {
-    if (display === 'label') {
-      return R.converge(
-        (missingParents, label) =>
-          R.isEmpty(missingParents) ? label : R.join(' > ', R.append(label, missingParents)),
-        [
-          getRefinedMissinParentsLabels,
-          dimensionValueDisplay(display),
-        ],
-      )(value);
-    } else if (display === 'both') {
-      return `(${singleValueDisplay('code', value)}) ${singleValueDisplay('label', value)}`;
-    }
-    return dimensionValueDisplay(display)(value);
-  };
+  if (display === 'label') {
+    return R.converge(
+      (missingParents, label) =>
+        R.isEmpty(missingParents)
+          ? label
+          : R.join(' > ', R.append(label, missingParents)),
+      [getRefinedMissinParentsLabels, dimensionValueDisplay(display)],
+    )(value);
+  } else if (display === 'both') {
+    return `(${singleValueDisplay('code', value)}) ${singleValueDisplay(
+      'label',
+      value,
+    )}`;
+  }
+  return dimensionValueDisplay(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;
-    }
-    return R.append(singleValueDisplay(_display, val), acc);
-  }, []),
-  labels => {
-    if (!R.isEmpty(labels) || _display !== 'label') {
-      return R.join(', ', labels);
-    }
-    const totalValue = R.find(R.propEq('id', '_T'), values);
-    if (!R.isNil(totalValue)) {
-      return dimensionValueDisplay('label')(totalValue);
-    }
-    if (R.isEmpty(values)) {
-      return '';
-    }
-    const firstValue = R.head(values);
-    return dimensionValueDisplay('label')(firstValue);
-  },
-)(values);
+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;
+      }
+      return R.append(singleValueDisplay(_display, val), acc);
+    }, []),
+    (labels) => {
+      if (!R.isEmpty(labels) || _display !== 'label') {
+        return R.join(', ', labels);
+      }
+      const totalValue = R.find(R.propEq('id', '_T'), values);
+      if (!R.isNil(totalValue)) {
+        return dimensionValueDisplay('label')(totalValue);
+      }
+      if (R.isEmpty(values)) {
+        return '';
+      }
+      const firstValue = R.head(values);
+      return dimensionValueDisplay('label')(firstValue);
+    },
+  )(values);
 
 export const combinedValuesDisplay = (display, values) => {
   if (display === 'both') {
-    return R.converge((_ids, labels) => {
-        const ids = R.isEmpty(_ids) ? _ids : `(${_ids})`;
-        return R.isEmpty(ids) ? labels : `${ids} ${labels}`;
-      }, [
-      _combinedValuesDisplay('code'),
-      _combinedValuesDisplay('label'),
-    ])(values);
+    return R.converge(
+      (_ids, labels) => {
+        return dimensionValueDisplay('both')({
+          id: _ids,
+          name: labels,
+        });
+      },
+      [_combinedValuesDisplay('code'), _combinedValuesDisplay('label')],
+    )(values);
   }
   return _combinedValuesDisplay(display)(values);
 };