@sis-cc/dotstatsuite-components 16.1.6 → 16.2.0

package/lib/rules2/src/enhanceObservations.js

@@ -36,13 +36,10 @@ var parseAttributesValues = function parseAttributesValues(obs, attributes, inde
 
   return R.addIndex(R.reduce)(function (acc, valueIndex, attrIndex) {
     var attribute = R.nth(attrIndex, attributes);
-    if (R.isNil(attribute) || !R.propOr(true, 'display', attribute) || !R.prop('series', attribute)) {
+    if (R.isNil(attribute) || !R.prop('series', attribute)) {
       return acc;
     }
     var value = R.nth(valueIndex, attribute.values || []);
-    if (!R.propOr(true, 'display', value) || R.includes(R.prop('id', value), _constants.REJECTED_VALUE_IDS)) {
-      value = null;
-    }
     var relationship = R.propOr([], 'relationship', attribute);
     var coordinates = {};
     var serieKey = R.pipe(function (dims) {

package/lib/rules2/src/getOneValueDimensions.js

@@ -39,7 +39,7 @@ var getOneValueDimensions = exports.getOneValueDimensions = function getOneValue
     })(acc);
   }, {}, attributes);
   return R.reduce(function (acc, dim) {
-    if (R.length(dim.values || []) !== 1 || !R.propOr(true, 'display', dim) || !R.pathOr(true, ['values', 0, 'display'], dim) || R.includes(R.path(['values', 0, 'id'], dim), _constants.REJECTED_VALUE_IDS)) {
+    if (R.length(dim.values || []) !== 1) {
       return acc;
     }
     var attrValues = R.propOr({}, dim.id, indexedRelevantAttributes);

package/lib/rules2/src/index.js

@@ -362,4 +362,13 @@ Object.defineProperty(exports, 'getTableProps', {
   get: function get() {
     return _getTableProps.getTableProps;
   }
+});
+
+var _getTableLabelAccessor = require('./table/getTableLabelAccessor');
+
+Object.defineProperty(exports, 'getTableLabelAccessor', {
+  enumerable: true,
+  get: function get() {
+    return _getTableLabelAccessor.getTableLabelAccessor;
+  }
 });

package/lib/rules2/src/table/getFlagsAndNotes.js

@@ -9,6 +9,8 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
+var _constants = require('../constants');
+
 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 getFlagsAndNotes = exports.getFlagsAndNotes = function getFlagsAndNotes(attributesValues, customAttributes) {
@@ -20,7 +22,7 @@ var getFlagsAndNotes = exports.getFlagsAndNotes = function getFlagsAndNotes(attr
       return acc;
     }
     var attr = R.prop(id, attributesValues);
-    if (R.isNil(attr.value)) {
+    if (R.isNil(attr.value) || !R.pathOr(true, ['value', 'display'], attr) || !R.propOr(true, 'display', attr) || R.includes(R.path(['value', 'id'], attr), _constants.REJECTED_VALUE_IDS)) {
       return acc;
     }
     return R.append(index < flagsIds.length ? R.assoc('code', R.path(['value', 'id'], attr), attr) : attr, acc);

package/lib/rules2/src/table/getLayout.js

@@ -31,7 +31,7 @@ var getLayout = exports.getLayout = function getLayout(layoutIds, dimensions, co
   }))(dimensions);
   var indexedFixedDimsValues = R.reduce(function (acc, dim) {
     var value = R.head(dim.values);
-    return !dim.display || !value.display ? acc : R.assoc(dim.id, R.head(dim.values), acc);
+    return !dim.display ? acc : R.assoc(dim.id, R.head(dim.values), acc);
   }, {}, fixedDimensions);
   var indexedHeaderIds = R.indexBy(R.identity, layoutIds.header);
   var indexedSectionsIds = R.indexBy(R.identity, layoutIds.sections);

package/lib/rules2/src/table/getLayoutData.js

@@ -145,10 +145,7 @@ var getSubLayoutData = function getSubLayoutData(series, _definition, _ref) {
       var values = R.reduce(function (_acc, id) {
         if (R.has(id, dimValues)) {
           var _value = R.prop(id, dimValues);
-          if (!R.propOr(true, 'display', _value) || R.includes(R.prop('id', _value), _constants.REJECTED_VALUE_IDS)) {
-            return _acc;
-          }
-          return R.append(R.dissoc('display', _value), _acc);
+          return R.append(_value, _acc);
         }
         if (R.has(id, fixedDimValues)) {
           return R.append(R.prop(id, fixedDimValues), _acc);

package/lib/rules2/src/table/getTableLabelAccessor.js

@@ -0,0 +1,57 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTableLabelAccessor = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+var _src = require('../../../rules/src');
+
+var _constants = require('../constants');
+
+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 getRefinedMissinParentsLabels = R.pipe(R.propOr([], 'missingParents'), R.reduce(function (acc, par) {
+  if (!R.propOr(true, 'display', par) || R.includes(par.id, _constants.REJECTED_VALUE_IDS)) {
+    return acc;
+  }
+  return R.append((0, _src.dimensionValueDisplay)('label')(par), acc);
+}, []));
+
+var granularDisplay = function granularDisplay(display, value) {
+  if (display === 'label') {
+    return R.converge(function (missingParents, label) {
+      return R.isEmpty(missingParents) ? label : R.join(' > ', R.append(label, missingParents));
+    }, [getRefinedMissinParentsLabels, (0, _src.dimensionValueDisplay)(display)])(value);
+  } else if (display === 'both') {
+    return '(' + granularDisplay('code', value) + ') ' + granularDisplay('label', value);
+  }
+  return (0, _src.dimensionValueDisplay)(display)(value);
+};
+
+var combinedDisplay = function combinedDisplay(_display) {
+  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;
+    }
+    return R.append(granularDisplay(_display, val), acc);
+  }, []), R.join(', '));
+};
+
+var getTableLabelAccessor = exports.getTableLabelAccessor = function getTableLabelAccessor(display) {
+  return function (item) {
+    if (!R.is(Array, item)) {
+      return granularDisplay(display, item);
+    }
+    if (display === 'both') {
+      return R.converge(function (ids, labels) {
+        return '(' + ids + ') ' + labels;
+      }, [combinedDisplay('code'), combinedDisplay('label')])(item);
+    }
+    return combinedDisplay(display)(item);
+  };
+};

package/package.json

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

package/src/rules2/src/enhanceObservations.js

@@ -16,13 +16,10 @@ const parseAttributesValues = (obs, attributes, indexedDimensions) => {
   return R.addIndex(R.reduce)(
     (acc, valueIndex, attrIndex) => {
       const attribute = R.nth(attrIndex, attributes);
-      if (R.isNil(attribute) || !R.propOr(true, 'display', attribute) || !R.prop('series', attribute)) {
+      if (R.isNil(attribute) || !R.prop('series', attribute)) {
         return acc;
       }
       let value = R.nth(valueIndex, attribute.values || []);
-      if (!R.propOr(true, 'display', value) || R.includes(R.prop('id', value), REJECTED_VALUE_IDS)) {
-        value = null;
-      }
       const relationship = R.propOr([], 'relationship', attribute);
       let coordinates = {};
       const serieKey = R.pipe(

package/src/rules2/src/getOneValueDimensions.js

@@ -22,8 +22,7 @@ export const getOneValueDimensions = (dimensions, attributes) => {
   );
   return R.reduce(
     (acc, dim) => {
-      if (R.length(dim.values || []) !== 1 || !R.propOr(true, 'display', dim) || !R.pathOr(true, ['values', 0, 'display'], dim)
-        || R.includes(R.path(['values', 0, 'id'], dim), REJECTED_VALUE_IDS)) {
+      if (R.length(dim.values || []) !== 1) {
         return acc;
       }
       const attrValues = R.propOr({}, dim.id, indexedRelevantAttributes);

package/src/rules2/src/index.js

@@ -41,3 +41,4 @@ export { getCells } from './table/getCells';
 export { getCuratedCells } from './table/getCuratedCells';
 export { prepareData } from './prepareData';
 export { getTableProps } from './table/getTableProps';
+export { getTableLabelAccessor } from './table/getTableLabelAccessor';

package/src/rules2/src/table/getFlagsAndNotes.js

@@ -1,4 +1,5 @@
 import * as R from 'ramda';
+import { REJECTED_VALUE_IDS } from '../constants';
 
 export const getFlagsAndNotes = (attributesValues, customAttributes) => {
   const flagsIds = R.propOr([], 'flags', customAttributes);
@@ -10,7 +11,8 @@ export const getFlagsAndNotes = (attributesValues, customAttributes) => {
         return acc;
       }
       const attr = R.prop(id, attributesValues);
-      if (R.isNil(attr.value)) {
+      if (R.isNil(attr.value) || !R.pathOr(true, ['value', 'display'], attr) || !R.propOr(true, 'display', attr)
+        || R.includes(R.path(['value', 'id'], attr), REJECTED_VALUE_IDS)) {
         return acc;
       }
       return R.append(index < flagsIds.length ? R.assoc('code', R.path(['value', 'id'], attr), attr) : attr, acc);

package/src/rules2/src/table/getLayout.js

@@ -10,7 +10,7 @@ export const getLayout = (layoutIds, dimensions, combinations, isTimeInverted, f
     const indexedFixedDimsValues = R.reduce(
       (acc, dim) => {
         const value = R.head(dim.values);
-        return !dim.display || !value.display ? acc : R.assoc(dim.id, R.head(dim.values), acc);
+        return !dim.display ? acc : R.assoc(dim.id, R.head(dim.values), acc);
       },
       {},
       fixedDimensions,

package/src/rules2/src/table/getLayoutData.js

@@ -122,10 +122,7 @@ const getSubLayoutData = (series, _definition, { metadataCoordinates, attributes
             (_acc, id) => {
               if (R.has(id, dimValues)) {
                 const value = R.prop(id, dimValues);
-                if (!R.propOr(true, 'display', value) || R.includes(R.prop('id', value), REJECTED_VALUE_IDS)) {
-                  return _acc;
-                }
-                return R.append(R.dissoc('display', value), _acc);
+                return R.append(value, _acc);
               }
               if (R.has(id, fixedDimValues)) {
                 return R.append(R.prop(id, fixedDimValues), _acc);

package/src/rules2/src/table/getTableLabelAccessor.js

@@ -0,0 +1,53 @@
+import * as R from 'ramda';
+import { dimensionValueDisplay } from '../../../rules/src';
+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)) {
+      return acc;
+    }
+    return R.append(dimensionValueDisplay('label')(par), acc);
+  }, []),
+);
+
+const granularDisplay = (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 `(${granularDisplay('code', value)}) ${granularDisplay('label', value)}`;
+    }
+    return dimensionValueDisplay(display)(value);
+  };
+
+const combinedDisplay = _display => 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(granularDisplay(_display, val), acc);
+  }, []),
+  R.join(', '),
+);
+
+export const getTableLabelAccessor = display => item => {
+  if (!R.is(Array, item)) {
+    return granularDisplay(display, item);
+  }
+  if (display === 'both') {
+    return R.converge((ids, labels) => `(${ids}) ${labels}`, [
+      combinedDisplay('code'),
+      combinedDisplay('label'),
+    ])(item);
+  }
+  return combinedDisplay(display)(item);
+}; 

package/test/getLayoutData.test.js

@@ -62,28 +62,28 @@ describe('getLayoutData tests', () => {
           { data: [{ dimension: { id: 'S' }, value: { id: 'S_V1' } }], key: 'S=S_V1', flags: [], sideProps: null, coordinates: { S: 'S_V1' } },
           [
             {
-              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V1' }, { id: 'R2_V1' }, { id: 'ATTR_V1' }] }],
+              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V1', display: true }, { id: 'R2_V1', display: true }, { id: 'ATTR_V1' }] }],
               key: 'R1=R1_V1:R2=R2_V1',
               coordinates: { R1: 'R1_V1', R2: 'R2_V1', S: 'S_V1' },
               flags: [],
               sideProps: null
             },
             {
-              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V1' }, { id: 'ATTR_V2' }] }],
+              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V1', display: true }, { id: 'R2_V2', display: false }, { id: 'ATTR_V2' }] }],
               key: 'R1=R1_V1:R2=R2_V2',
               coordinates: { R1: 'R1_V1', R2: 'R2_V2', S: 'S_V1' },
               flags: [],
               sideProps: null
             },
             {
-              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V2' }, { id: 'R2_V1' }, { id: 'ATTR_V3' }] }],
+              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V2', display: true }, { id: 'R2_V1', display: true }, { id: 'ATTR_V3' }] }],
               key: 'R1=R1_V2:R2=R2_V1',
               coordinates: { R1: 'R1_V2', R2: 'R2_V1', S: 'S_V1' },
               flags: [],
               sideProps: null
             },
             {
-              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V2' }, { id: 'ATTR_V4' }] }],
+              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V2', display: true }, { id: 'R2_V2', display: false }, { id: 'ATTR_V4' }] }],
               key: 'R1=R1_V2:R2=R2_V2',
               coordinates: { R1: 'R1_V2', R2: 'R2_V2', S: 'S_V1' },
               flags: [],
@@ -95,28 +95,28 @@ describe('getLayoutData tests', () => {
           { data: [{ dimension: { id: 'S' }, value: { id: 'S_V2' } }], key: 'S=S_V2', flags: [], sideProps: null, coordinates: { S: 'S_V2' } },
           [
             {
-              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V1' }, { id: 'R2_V1' }, { id: 'ATTR_V1' }] }],
+              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V1', display: true }, { id: 'R2_V1', display: true }, { id: 'ATTR_V1' }] }],
               key: 'R1=R1_V1:R2=R2_V1',
               coordinates: { R1: 'R1_V1', R2: 'R2_V1', S: 'S_V2' },
               flags: [],
               sideProps: null
             },
             {
-              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V1' }, { id: 'ATTR_V2' }] }],
+              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V1', display: true }, { id: 'R2_V2', display: false }, { id: 'ATTR_V2' }] }],
               key: 'R1=R1_V1:R2=R2_V2',
               coordinates: { R1: 'R1_V1', R2: 'R2_V2', S: 'S_V2' },
               flags: [],
               sideProps: null
             },
             {
-              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V2' }, { id: 'R2_V1' }, { id: 'ATTR_V3' }] }],
+              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V2', display: true }, { id: 'R2_V1', display: true }, { id: 'ATTR_V3' }] }],
               key: 'R1=R1_V2:R2=R2_V1',
               coordinates: { R1: 'R1_V2', R2: 'R2_V1', S: 'S_V2' },
               flags: [],
               sideProps: null
             },
             {
-              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V2' }, { id: 'ATTR_V4' }] }],
+              data: [{ dimension: { id: 'COMB' }, values: [{ id: 'R1_V2', display: true }, { id: 'R2_V2', display: false }, { id: 'ATTR_V4' }] }],
               key: 'R1=R1_V2:R2=R2_V2',
               coordinates: { R1: 'R1_V2', R2: 'R2_V2', S: 'S_V2' },
               flags: [],

package/test/getOneValueDimensions.test.js

@@ -24,6 +24,9 @@ describe('getOneValueDimensions tests', () => {
     expect(getOneValueDimensions(dimensions, attributes)).to.deep.equal([
       { id: 'd0', values: [{ id: 'v' }], attrValues: { a1: { id: 'a1', header: true, values: [{ id: 'v' }], relationship: ['d0'], value: { id: 'v' } } } },
       { id: 'd1', values: [{ id: 'v' }], attrValues: {} },
+      { id: 'd2', values: [{ id: 'v' }], display: false, attrValues: {} },
+      { id: 'd3', values: [{ id: 'v', display: false }], attrValues: {} },
+      { id: 'd4', values: [{ id: '_T' }], attrValues: {} },
     ])
   });
 });

package/test/getTableLabelAccessor.test.js

@@ -0,0 +1,25 @@
+import { expect } from 'chai';
+import { getTableLabelAccessor } from '../src/rules2/src/table/getTableLabelAccessor';
+
+describe('getTableLabelAccessor tests', () => {
+  const values = [
+    { id: 'V0', name: 'Value 0', display: false },
+    { id: 'V1', name: 'Value 1', missingParents: [{ id: 'P0', name: 'Parent 0' }, { id: 'P1', name: 'Parent 1', display: false }] },
+    { id: '_T', name: 'Value 2' },
+  ];
+  it('combination label display', () => {
+    expect(getTableLabelAccessor('label')(values)).to.deep.equal('Parent 0 > Value 1');
+  });
+  it('combination code display', () => {
+    expect(getTableLabelAccessor('code')(values)).to.deep.equal('V0, V1, _T');
+  });
+  it('combination both display', () => {
+    expect(getTableLabelAccessor('both')(values)).to.deep.equal('(V0, V1, _T) Parent 0 > Value 1');
+  });
+  it('single value witrh missingParents', () => {
+    expect(getTableLabelAccessor('label')(values[1])).to.deep.equal('Parent 0 > Value 1');
+  });
+  it('not displayed single value', () => {
+    expect(getTableLabelAccessor('both')(values[0])).to.deep.equal('(V0) Value 0');
+  });
+});