@sis-cc/dotstatsuite-components 17.21.0 → 17.22.0

package/lib/rules/src/layout.js

@@ -20,7 +20,9 @@ var isTableLayoutCompatible = function isTableLayoutCompatible(data, layout) {
 
   var multiValuesDimensions = R.pipe(R.pathOr([], ['structure', 'dimensions', 'observation']), function (dimensions) {
     return (0, _src.refineDimensions)(dimensions, dataquery);
-  }, R.reject(R.prop('header')), R.pluck('id'))(data);
+  }, R.reject(function (d) {
+    return R.prop('header', d) || !R.length(d.values || []);
+  }), R.pluck('id'))(data);
   var dimensionsInLayout = R.pipe(R.values, R.unnest)(layout);
 
   var dimensionsLength = R.length(multiValuesDimensions);

package/lib/rules2/src/getManyValuesDimensions.js

@@ -22,7 +22,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var getManyValuesDimensions = exports.getManyValuesDimensions = function getManyValuesDimensions(dimensions, attributesSeries, customAttributes, combinations) {
   var combConceptsIds = R.pipe(R.pluck('concepts'), R.unnest)(combinations);
   return R.reduce(function (acc, dim) {
-    if (dim.header) {
+    if (dim.header || !R.length(dim.values)) {
       return acc;
     }
     var enhancedValues = R.map(function (val) {

package/lib/rules2/src/refineDimensions.js

@@ -31,6 +31,8 @@ var refineDimensions = exports.refineDimensions = function refineDimensions() {
       }
       return R.assoc('empty', true, val);
     }, dim.values || []);
-    return (0, _extends3.default)({}, dim, { values: values, header: R.length(values) <= 1 || R.length(selection) === 1 && !R.isEmpty(R.head(selection)) });
+
+    var size = R.length(values);
+    return (0, _extends3.default)({}, dim, { values: values, header: size === 1 || size > 1 && R.length(selection) === 1 && !R.isEmpty(R.head(selection)) });
   }, dimensions);
 };

package/package.json

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

package/src/rules/src/layout.js

@@ -12,7 +12,7 @@ const isTableLayoutCompatible = (data, layout, dataquery='') => {
   const multiValuesDimensions = R.pipe(
     R.pathOr([], ['structure', 'dimensions', 'observation']),
     dimensions => refineDimensions(dimensions, dataquery),
-    R.reject(R.prop('header')),
+    R.reject(d => R.prop('header', d) || !R.length(d.values || [])),
     R.pluck('id')
   )(data);
   const dimensionsInLayout = R.pipe(R.values, R.unnest)(layout);

package/src/rules2/src/getManyValuesDimensions.js

@@ -5,7 +5,7 @@ export const getManyValuesDimensions = (dimensions, attributesSeries, customAttr
   const combConceptsIds = R.pipe(R.pluck('concepts'), R.unnest)(combinations);
   return R.reduce(
     (acc, dim) => {
-      if (dim.header) {
+      if (dim.header || !R.length(dim.values)) {
         return acc;
       }
       const enhancedValues = R.map(val => {

package/src/rules2/src/refineDimensions.js

@@ -11,6 +11,8 @@ export const refineDimensions = (dimensions=[], dataquery='') => {
       }
       return R.assoc('empty', true, val);
     }, dim.values || []);
-    return { ...dim, values, header: R.length(values) <= 1 || (R.length(selection) === 1 && !R.isEmpty(R.head(selection))) };
+
+    const size = R.length(values);
+    return { ...dim, values, header: size === 1 || (size > 1 && R.length(selection) === 1 && !R.isEmpty(R.head(selection))) };
   }, dimensions);
 };

package/test/refinedDimensions.test.js

@@ -21,7 +21,7 @@ describe('refine dimensions tests', () => {
     const dataquery = '.v0+v1.v0.v0+v1...';
 
     expect(refineDimensions(dimensions, dataquery)).to.deep.equal([
-      { id: 'd0', values: [], header: true },
+      { id: 'd0', values: [], header: false },
       { id: 'd1', values: [{ id: 'v0', isSelected: true }], header: true },
       { id: 'd2', values: [{ id: 'v0', isSelected: true }, { id: 'v1', empty: true }, { id: 'v2', empty: true }], header: true },
       { id: 'd3', values: [{ id: 'v0', isSelected: true }, { id: 'v1', isSelected: true }, { id: 'v2', empty: true }], header: false },