@sis-cc/dotstatsuite-components 20.3.0 → 20.4.0

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

@@ -135,6 +135,37 @@ var getCombinationLevelCompatibility = exports.getCombinationLevelCompatibility
   return 'blank';
 };
 
+var filterLayoutIds = function filterLayoutIds(indexedCombinations, layoutDimsIds, obsAttributes) {
+  return function (layoutIds) {
+    var layoutConcepts = R.map(R.reduce(function (acc, id) {
+      if (R.has(id, indexedCombinations)) {
+        return R.concat(acc, R.path([id, 'concepts'], indexedCombinations));
+      }
+      return R.append(id, acc);
+    }, []), layoutIds);
+
+    return R.mapObjIndexed(function (ids, level) {
+      return R.filter(function (id) {
+        if (id === 'OBS_ATTRIBUTES') {
+          return !R.isEmpty(obsAttributes);
+        }
+        if (R.has(id, indexedCombinations)) {
+          var comb = R.prop(id, indexedCombinations);
+          var dims = R.filter(function (i) {
+            return layoutDimsIds.has(i);
+          }, comb.concepts);
+          if (!R.isEmpty(dims)) {
+            return true;
+          }
+          var oppositeIds = level === 'header' ? R.concat(R.prop('sections', layoutConcepts), R.prop('rows', layoutConcepts)) : R.prop('header', layoutConcepts);
+          return R.isEmpty(R.intersection(comb.relationship, oppositeIds));
+        }
+        return layoutDimsIds.has(id);
+      }, ids);
+    }, layoutIds);
+  };
+};
+
 var injectCombinationsInLayout = exports.injectCombinationsInLayout = function injectCombinationsInLayout(combinations, layoutIds) {
   var defaultLayoutIds = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
@@ -277,6 +308,7 @@ var injectRemainingDimensionsInLayout = exports.injectRemainingDimensionsInLayou
 var getTableLayoutIds = exports.getTableLayoutIds = function getTableLayoutIds(defaultLayoutIds, currentLayoutIds, dimensions, attributes, combinations) {
   var layoutDimsIds = getLayoutDimsIds(dimensions);
   var layoutCombinations = getLayoutCombinations(combinations, layoutDimsIds, attributes);
+  var isBlank = R.pipe(R.values, R.all(R.isEmpty))(currentLayoutIds);
 
   var combinationsConcepts = R.pipe(R.pluck('_concepts'), R.unnest, function (ids) {
     return new _set2.default(ids);
@@ -285,12 +317,8 @@ var getTableLayoutIds = exports.getTableLayoutIds = function getTableLayoutIds(d
     return a.series && R.isEmpty(a.relationship || []) && a.display && !combinationsConcepts.has(a);
   }, attributes);
   var indexedCombinations = R.indexBy(R.prop('id'), layoutCombinations);
-  var filteredLayoutIds = R.map(R.filter(function (id) {
-    if (id === 'OBS_ATTRIBUTES') {
-      return !R.isEmpty(obsAttributes);
-    }
-    return R.has(id, indexedCombinations) || layoutDimsIds.has(id);
-  }), currentLayoutIds);
+  var filteredLayoutIds = filterLayoutIds(indexedCombinations, layoutDimsIds, obsAttributes)(isBlank ? defaultLayoutIds : currentLayoutIds);
+
   var layoutWithCombs = injectCombinationsInLayout(layoutCombinations, filteredLayoutIds, defaultLayoutIds);
   var layoutRelationshipsSets = R.map(R.pipe(function (ids) {
     return R.pick(ids, indexedCombinations);
@@ -316,10 +344,10 @@ var getTableLayoutIds = exports.getTableLayoutIds = function getTableLayoutIds(d
     if (layoutRelationshipsSets.header.has(dim.id) || defaultLayoutConceptsSets.header.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout', 'header']), R.append(dim.id))(acc);
     }
-    if (layoutRelationshipsSets.sections.has(dim.id) || defaultLayoutConceptsSets.header.has(dim.id)) {
+    if (layoutRelationshipsSets.sections.has(dim.id) || defaultLayoutConceptsSets.sections.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout', 'sections']), R.append(dim.id))(acc);
     }
-    if (layoutRelationshipsSets.rows.has(dim.id) || defaultLayoutConceptsSets.header.has(dim.id)) {
+    if (layoutRelationshipsSets.rows.has(dim.id) || defaultLayoutConceptsSets.rows.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout', 'rows']), R.append(dim.id))(acc);
     }
     if ((0, _dotstatsuiteSdmxjs.isTimePeriodDimension)(dim)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "main": "lib/index.js",
   "type": "module",
   "author": "OECD",

package/src/rules2/src/table/getTableLayoutIds.js

@@ -72,6 +72,39 @@ export const getCombinationLevelCompatibility = (layoutRelationships, combinatio
   return 'blank';
 }
 
+const filterLayoutIds = (indexedCombinations, layoutDimsIds, obsAttributes) => (layoutIds) => {
+  const layoutConcepts = R.map(
+    R.reduce((acc, id) => {
+      if (R.has(id, indexedCombinations)) {
+        return R.concat(acc, R.path([id, 'concepts'], indexedCombinations));
+      }
+      return R.append(id, acc);
+    }, []),
+    layoutIds
+  );
+
+  return R.mapObjIndexed(
+    (ids, level) => R.filter(id => {
+      if (id === 'OBS_ATTRIBUTES') {
+        return !R.isEmpty(obsAttributes);
+      }
+      if (R.has(id, indexedCombinations)) {
+        const comb = R.prop(id, indexedCombinations);
+        const dims = R.filter(i => layoutDimsIds.has(i), comb.concepts);
+        if (!R.isEmpty(dims)) {
+          return true;
+        }
+        const oppositeIds = level === 'header'
+          ? R.concat(R.prop('sections', layoutConcepts), R.prop('rows', layoutConcepts))
+          : R.prop('header', layoutConcepts);
+        return R.isEmpty(R.intersection(comb.relationship, oppositeIds));
+      }
+      return layoutDimsIds.has(id);
+    }, ids),
+    layoutIds
+  );
+};
+
 export const injectCombinationsInLayout = (combinations, layoutIds, defaultLayoutIds = {}) => {
   const notInLayoutCombs = getCombinationsNotInLayout(combinations, layoutIds);
   if (R.isEmpty(notInLayoutCombs)) {
@@ -219,21 +252,16 @@ export const getTableLayoutIds = (
     layoutDimsIds,
     attributes,
   );
+  const isBlank = R.pipe(R.values, R.all(R.isEmpty))(currentLayoutIds);
 
   const combinationsConcepts = R.pipe(R.pluck('_concepts'), R.unnest, ids => new Set(ids))(combinations);
   const obsAttributes = R.filter(a => 
     a.series && R.isEmpty(a.relationship || []) && a.display && !combinationsConcepts.has(a)
   , attributes);
   const indexedCombinations = R.indexBy(R.prop('id'), layoutCombinations);
-  const filteredLayoutIds = R.map(
-    R.filter(id => {
-      if (id === 'OBS_ATTRIBUTES') {
-        return !R.isEmpty(obsAttributes);
-      }
-      return R.has(id, indexedCombinations) || layoutDimsIds.has(id);
-    }),
-    currentLayoutIds
-  );
+  const filteredLayoutIds = filterLayoutIds(indexedCombinations, layoutDimsIds, obsAttributes)
+    (isBlank ? defaultLayoutIds : currentLayoutIds);
+
   const layoutWithCombs = injectCombinationsInLayout(layoutCombinations, filteredLayoutIds, defaultLayoutIds);
   const layoutRelationshipsSets = R.map(R.pipe(
     ids => R.pick(ids, indexedCombinations),
@@ -267,10 +295,10 @@ export const getTableLayoutIds = (
     if (layoutRelationshipsSets.header.has(dim.id) || defaultLayoutConceptsSets.header.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout', 'header']), R.append(dim.id))(acc);
     }
-    if (layoutRelationshipsSets.sections.has(dim.id) || defaultLayoutConceptsSets.header.has(dim.id)) {
+    if (layoutRelationshipsSets.sections.has(dim.id) || defaultLayoutConceptsSets.sections.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout', 'sections']), R.append(dim.id))(acc);
     }
-    if (layoutRelationshipsSets.rows.has(dim.id)  || defaultLayoutConceptsSets.header.has(dim.id)) {
+    if (layoutRelationshipsSets.rows.has(dim.id)  || defaultLayoutConceptsSets.rows.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout','rows']), R.append(dim.id))(acc);
     }
     if (isTimePeriodDimension(dim)) {

package/test/getTableLayoutIds.test.js

@@ -329,8 +329,14 @@ describe('getTableLayoutIds tests', () => {
       rows: []
     };
 
+    const layoutIds3 = {
+      header: [],
+      sections: ['MEASURE'],
+      rows: []
+    }
+
     expect(getTableLayoutIds(defaultLayoutIds, layoutIds1, dimensions, attributes, combinations)).to.deep.equal({
-      header: ['COMB1', 'COMB3', 'REF_AREA'],
+      header: ['COMB1', 'REF_AREA', 'COMB3',],
       sections: ['COMB2'],
       rows: ['TRANSACTION']
     });
@@ -340,5 +346,11 @@ describe('getTableLayoutIds tests', () => {
       sections: ['COMB2'],
       rows: ['REF_AREA']
     });
+
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds3, dimensions, attributes, combinations)).to.deep.equal({
+      header: ['REF_AREA'],
+      sections: ['COMB1', 'COMB2', 'COMB3'],
+      rows: ['TRANSACTION']
+    });
   });
 });