@sis-cc/dotstatsuite-components 20.1.0 → 20.3.0

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

@@ -80,11 +80,11 @@ var getCoordinates = function getCoordinates(indexes, topCoordinates, definition
 		if (R.has('dimensions', entry)) {
 			return R.addIndex(R.reduce)(function (_acc, dim, _index) {
 				var valInd = R.path([index, _index], indexes);
-				return R.assoc(dim.id, R.path(['values', valInd, 'id'], dim), _acc);
+				return R.assoc(dim.id, R.path(['values', Math.abs(valInd), 'id'], dim), _acc);
 			}, acc, entry.dimensions);
 		}
 		var valInd = R.nth(index, indexes);
-		return R.assoc(entry.id, R.path(['values', valInd, 'id'], entry), acc);
+		return R.assoc(entry.id, R.path(['values', Math.abs(valInd), 'id'], entry), acc);
 	}, topCoordinates, definition);
 };
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTableLayoutIds = exports.injectRemainingDimensionsInLayout = exports.getLayoutCombinations = exports.getLayoutDimsIds = exports.injectCombinationsInLayout = exports.injectCombination = exports.getLayoutRelationships = exports.getLayoutLevelRelationship = exports.indexCombsRelationships = exports.getCombinationsNotInLayout = undefined;
+exports.getTableLayoutIds = exports.injectRemainingDimensionsInLayout = exports.getLayoutCombinations = exports.getLayoutDimsIds = exports.injectCombinationsInLayout = exports.getCombinationLevelCompatibility = exports.injectCombination = exports.getLayoutRelationships = exports.getLayoutLevelRelationship = exports.indexCombsRelationships = exports.getCombinationsNotInLayout = undefined;
 
 var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
 
@@ -96,53 +96,71 @@ var injectCombination = exports.injectCombination = function injectCombination(c
   };
 };
 
+var getCombinationLevelCompatibility = exports.getCombinationLevelCompatibility = function getCombinationLevelCompatibility(layoutRelationships, combination) {
+  var _combination$relation = combination.relationship,
+      relationship = _combination$relation === undefined ? [] : _combination$relation;
+
+  var idsInHeaderSet = new _set2.default(layoutRelationships.header);
+  var idsInSectionsSet = new _set2.default(layoutRelationships.sections);
+  var idsInRowsSet = new _set2.default(layoutRelationships.rows);
+
+  var _R$partition = R.partition(function (i) {
+    return idsInHeaderSet.has(i);
+  }, relationship),
+      _R$partition2 = (0, _slicedToArray3.default)(_R$partition, 2),
+      idsInHeader = _R$partition2[0],
+      rest = _R$partition2[1];
+
+  var _R$reduce = R.reduce(function (_acc, id) {
+    if (idsInSectionsSet.has(id)) return R.over(R.lensIndex(0), R.append(id), _acc);
+    if (idsInRowsSet.has(id)) return R.over(R.lensIndex(1), R.append(id), _acc);
+    return R.over(R.lensIndex(2), R.append(id), _acc);
+  }, [[], [], []], rest),
+      _R$reduce2 = (0, _slicedToArray3.default)(_R$reduce, 2),
+      idsInSections = _R$reduce2[0],
+      idsInRows = _R$reduce2[1];
+
+  if (!R.isEmpty(idsInHeader) && R.isEmpty(idsInSections) && R.isEmpty(idsInRows)) {
+    return 'header';
+  }
+  if (!R.isEmpty(idsInHeader)) {
+    return null;
+  }
+  if (!R.isEmpty(idsInSections) && R.isEmpty(idsInRows)) {
+    return 'sections';
+  }
+  if (!R.isEmpty(idsInRows)) {
+    return 'rows';
+  }
+  return 'blank';
+};
+
 var injectCombinationsInLayout = exports.injectCombinationsInLayout = function injectCombinationsInLayout(combinations, layoutIds) {
+  var defaultLayoutIds = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
   var notInLayoutCombs = getCombinationsNotInLayout(combinations, layoutIds);
   if (R.isEmpty(notInLayoutCombs)) {
     return layoutIds;
   }
   var indexedCombsRelationships = indexCombsRelationships(combinations);
   var layoutRelationships = getLayoutRelationships(indexedCombsRelationships, layoutIds);
+  var defaultLayoutRelationships = getLayoutRelationships(indexedCombsRelationships, defaultLayoutIds);
   return R.reduce(function (acc, comb) {
-    var _comb$relationship2 = comb.relationship,
-        relationship = _comb$relationship2 === undefined ? [] : _comb$relationship2;
-
-    var idsInHeaderSet = new _set2.default(layoutRelationships.header);
-    var idsInSectionsSet = new _set2.default(layoutRelationships.sections);
-    var idsInRowsSet = new _set2.default(layoutRelationships.rows);
-
-    var _R$partition = R.partition(function (i) {
-      return idsInHeaderSet.has(i);
-    }, relationship),
-        _R$partition2 = (0, _slicedToArray3.default)(_R$partition, 2),
-        idsInHeader = _R$partition2[0],
-        rest = _R$partition2[1];
-
-    var _R$reduce = R.reduce(function (_acc, id) {
-      if (idsInSectionsSet.has(id)) return R.over(R.lensIndex(0), R.append(id), _acc);
-      if (idsInRowsSet.has(id)) return R.over(R.lensIndex(1), R.append(id), _acc);
-      return R.over(R.lensIndex(2), R.append(id), _acc);
-    }, [[], [], []], rest),
-        _R$reduce2 = (0, _slicedToArray3.default)(_R$reduce, 2),
-        idsInSections = _R$reduce2[0],
-        idsInRows = _R$reduce2[1];
-
-    if (!R.isEmpty(idsInHeader) && R.isEmpty(idsInSections) && R.isEmpty(idsInRows)) {
-      layoutRelationships.header = R.concat(layoutRelationships.header, relationship);
-      var _ids = injectCombination(comb)(acc.header);
-      return R.assoc('header', _ids)(acc);
-    }
-    if (!R.isEmpty(idsInHeader)) {
+    var levelCompatibility = getCombinationLevelCompatibility(layoutRelationships, comb);
+    if (R.isNil(levelCompatibility)) {
       return acc;
     }
-    if (!R.isEmpty(idsInSections) && R.isEmpty(idsInRows)) {
-      layoutRelationships.sections = R.concat(layoutRelationships.sections, relationship);
-      var _ids2 = injectCombination(comb)(acc.sections);
-      return R.assoc('sections', _ids2)(acc);
+    if (R.equals('blank', levelCompatibility)) {
+      levelCompatibility = getCombinationLevelCompatibility(defaultLayoutRelationships, comb);
+      if (R.isNil(levelCompatibility)) {
+        return acc;
+      }
+      levelCompatibility = R.equals('blank', levelCompatibility) ? 'rows' : levelCompatibility;
     }
-    layoutRelationships.rows = R.concat(layoutRelationships.rows, relationship);
-    var ids = injectCombination(comb)(acc.rows);
-    return R.assoc('rows', ids)(acc);
+
+    layoutRelationships[levelCompatibility] = R.concat(layoutRelationships[levelCompatibility], comb.relationship);
+    var ids = injectCombination(comb)(acc[levelCompatibility]);
+    return R.assoc(levelCompatibility, ids)(acc);
   }, layoutIds, notInLayoutCombs);
 };
 
@@ -256,7 +274,7 @@ var injectRemainingDimensionsInLayout = exports.injectRemainingDimensionsInLayou
   return _layout;
 };
 
-var getTableLayoutIds = exports.getTableLayoutIds = function getTableLayoutIds(defaultLayoutIds, dimensions, attributes, combinations) {
+var getTableLayoutIds = exports.getTableLayoutIds = function getTableLayoutIds(defaultLayoutIds, currentLayoutIds, dimensions, attributes, combinations) {
   var layoutDimsIds = getLayoutDimsIds(dimensions);
   var layoutCombinations = getLayoutCombinations(combinations, layoutDimsIds, attributes);
 
@@ -272,8 +290,8 @@ var getTableLayoutIds = exports.getTableLayoutIds = function getTableLayoutIds(d
       return !R.isEmpty(obsAttributes);
     }
     return R.has(id, indexedCombinations) || layoutDimsIds.has(id);
-  }), defaultLayoutIds);
-  var layoutWithCombs = injectCombinationsInLayout(layoutCombinations, filteredLayoutIds);
+  }), currentLayoutIds);
+  var layoutWithCombs = injectCombinationsInLayout(layoutCombinations, filteredLayoutIds, defaultLayoutIds);
   var layoutRelationshipsSets = R.map(R.pipe(function (ids) {
     return R.pick(ids, indexedCombinations);
   }, R.values, R.pluck('relationship'), R.unnest, function (i) {
@@ -287,18 +305,21 @@ var getTableLayoutIds = exports.getTableLayoutIds = function getTableLayoutIds(d
   }, [])), R.values, R.unnest, function (ids) {
     return new _set2.default(ids);
   })(layoutWithCombs);
+  var defaultLayoutConceptsSets = R.map(function (ids) {
+    return new _set2.default(ids);
+  }, defaultLayoutIds);
 
   var _R$reduce4 = R.reduce(function (acc, dim) {
     if (layoutConceptsSets.has(dim.id) || dim.header) {
       return acc;
     }
-    if (layoutRelationshipsSets.header.has(dim.id)) {
+    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)) {
+    if (layoutRelationshipsSets.sections.has(dim.id) || defaultLayoutConceptsSets.header.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout', 'sections']), R.append(dim.id))(acc);
     }
-    if (layoutRelationshipsSets.rows.has(dim.id)) {
+    if (layoutRelationshipsSets.rows.has(dim.id) || defaultLayoutConceptsSets.header.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.1.0",
+  "version": "20.3.0",
   "main": "lib/index.js",
   "type": "module",
   "author": "OECD",

package/src/rules2/src/table/getLayoutData2.js

@@ -43,11 +43,11 @@ const getCoordinates = (indexes, topCoordinates, definition) => R.addIndex(R.red
 	if (R.has('dimensions', entry)) {
 		return R.addIndex(R.reduce)((_acc, dim, _index) => {
 			const valInd = R.path([index, _index], indexes);
-			return R.assoc(dim.id, R.path(['values', valInd, 'id'], dim), _acc)
+			return R.assoc(dim.id, R.path(['values', Math.abs(valInd), 'id'], dim), _acc)
 		}, acc, entry.dimensions);
 	}
 	const valInd = R.nth(index, indexes);
-	return R.assoc(entry.id, R.path(['values', valInd, 'id'], entry), acc);
+	return R.assoc(entry.id, R.path(['values', Math.abs(valInd), 'id'], entry), acc);
 }, topCoordinates, definition);
 
 const getAttributesSeries = (validator, attributesSeries) => R.reduce((acc, attrs) => {

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

@@ -41,45 +41,61 @@ export const injectCombination = combination => ids => {
   return inject ? R.append(id, refined) : refined;
 };
 
-export const injectCombinationsInLayout = (combinations, layoutIds) => {
+export const getCombinationLevelCompatibility = (layoutRelationships, combination) => {
+  const { relationship=[] } = combination;
+  const idsInHeaderSet = new Set(layoutRelationships.header);
+  const idsInSectionsSet = new Set(layoutRelationships.sections);
+  const idsInRowsSet = new Set(layoutRelationships.rows);
+  const [idsInHeader, rest] = R.partition(
+    i => idsInHeaderSet.has(i),
+    relationship
+  );
+  const [idsInSections, idsInRows] = R.reduce((_acc, id) => {
+    if (idsInSectionsSet.has(id))
+      return R.over(R.lensIndex(0), R.append(id), _acc);
+    if (idsInRowsSet.has(id))
+      return R.over(R.lensIndex(1), R.append(id), _acc);
+    return R.over(R.lensIndex(2), R.append(id), _acc);
+  }, [[], [], []], rest);
+  if (!R.isEmpty(idsInHeader) && R.isEmpty(idsInSections) && R.isEmpty(idsInRows)) {
+    return 'header';
+  }
+  if (!R.isEmpty(idsInHeader)) {
+    return null;
+  }
+  if (!R.isEmpty(idsInSections) && R.isEmpty(idsInRows)) {
+    return 'sections';
+  }
+  if (!R.isEmpty(idsInRows)) {
+    return 'rows';
+  }
+  return 'blank';
+}
+
+export const injectCombinationsInLayout = (combinations, layoutIds, defaultLayoutIds = {}) => {
   const notInLayoutCombs = getCombinationsNotInLayout(combinations, layoutIds);
   if (R.isEmpty(notInLayoutCombs)) {
     return layoutIds;
   }
   const indexedCombsRelationships = indexCombsRelationships(combinations);
   let layoutRelationships = getLayoutRelationships(indexedCombsRelationships, layoutIds);
+  const defaultLayoutRelationships = getLayoutRelationships(indexedCombsRelationships, defaultLayoutIds);
   return R.reduce((acc, comb) => {
-    const { relationship=[] } = comb;
-    const idsInHeaderSet = new Set(layoutRelationships.header);
-    const idsInSectionsSet = new Set(layoutRelationships.sections);
-    const idsInRowsSet = new Set(layoutRelationships.rows);
-    const [idsInHeader, rest] = R.partition(
-      i => idsInHeaderSet.has(i),
-      relationship
-    );
-    const [idsInSections, idsInRows] = R.reduce((_acc, id) => {
-      if (idsInSectionsSet.has(id))
-        return R.over(R.lensIndex(0), R.append(id), _acc);
-      if (idsInRowsSet.has(id))
-        return R.over(R.lensIndex(1), R.append(id), _acc);
-      return R.over(R.lensIndex(2), R.append(id), _acc);
-    }, [[], [], []], rest);
-    if (!R.isEmpty(idsInHeader) && R.isEmpty(idsInSections) && R.isEmpty(idsInRows)) {
-      layoutRelationships.header = R.concat(layoutRelationships.header, relationship);
-      const ids = injectCombination(comb)(acc.header);
-      return R.assoc('header', ids)(acc);
-    }
-    if (!R.isEmpty(idsInHeader)) {
+    let levelCompatibility = getCombinationLevelCompatibility(layoutRelationships, comb);
+    if (R.isNil(levelCompatibility)) {
       return acc;
     }
-    if (!R.isEmpty(idsInSections) && R.isEmpty(idsInRows)) {
-      layoutRelationships.sections = R.concat(layoutRelationships.sections, relationship);
-      const ids = injectCombination(comb)(acc.sections);
-      return R.assoc('sections', ids)(acc);
+    if (R.equals('blank', levelCompatibility)) {
+      levelCompatibility = getCombinationLevelCompatibility(defaultLayoutRelationships, comb);
+      if (R.isNil(levelCompatibility)) {
+        return acc;
+      }
+      levelCompatibility = R.equals('blank', levelCompatibility) ? 'rows' : levelCompatibility;
     }
-    layoutRelationships.rows = R.concat(layoutRelationships.rows, relationship);
-    const ids = injectCombination(comb)(acc.rows);
-    return R.assoc('rows', ids)(acc);
+
+    layoutRelationships[levelCompatibility] = R.concat(layoutRelationships[levelCompatibility], comb.relationship);
+    const ids = injectCombination(comb)(acc[levelCompatibility]);
+    return R.assoc(levelCompatibility, ids)(acc);
   }, layoutIds, notInLayoutCombs);
 };
 
@@ -192,6 +208,7 @@ export const injectRemainingDimensionsInLayout = (layoutIds, remainingDims, inde
 
 export const getTableLayoutIds = (
   defaultLayoutIds,
+  currentLayoutIds,
   dimensions,
   attributes,
   combinations
@@ -215,9 +232,9 @@ export const getTableLayoutIds = (
       }
       return R.has(id, indexedCombinations) || layoutDimsIds.has(id);
     }),
-    defaultLayoutIds,
+    currentLayoutIds
   );
-  const layoutWithCombs = injectCombinationsInLayout(layoutCombinations, filteredLayoutIds);
+  const layoutWithCombs = injectCombinationsInLayout(layoutCombinations, filteredLayoutIds, defaultLayoutIds);
   const layoutRelationshipsSets = R.map(R.pipe(
     ids => R.pick(ids, indexedCombinations),
     R.values,
@@ -238,18 +255,22 @@ export const getTableLayoutIds = (
     R.unnest,
     ids => new Set(ids)
   )(layoutWithCombs);
+  const defaultLayoutConceptsSets = R.map(
+    ids => new Set(ids),
+    defaultLayoutIds
+  );
 
   const { nextLayout, remaining } = R.reduce((acc, dim) => {
     if (layoutConceptsSets.has(dim.id) || dim.header) {
       return acc;
     }
-    if (layoutRelationshipsSets.header.has(dim.id)) {
+    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)) {
+    if (layoutRelationshipsSets.sections.has(dim.id) || defaultLayoutConceptsSets.header.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout', 'sections']), R.append(dim.id))(acc);
     }
-    if (layoutRelationshipsSets.rows.has(dim.id)) {
+    if (layoutRelationshipsSets.rows.has(dim.id)  || defaultLayoutConceptsSets.header.has(dim.id)) {
       return R.over(R.lensPath(['nextLayout','rows']), R.append(dim.id))(acc);
     }
     if (isTimePeriodDimension(dim)) {

package/test/getLayoutData2.test.js

@@ -439,7 +439,7 @@ describe('getLayoutData 2 tests', () => {
 			}
 		});
 	});
-	it('getSerieDataWithMissingLines, advanced attributes as dim level plus enpty series', () => {
+	it('getSerieDataWithMissingLines, advanced attributes as dim level plus empty series', () => {
 		const dimensions = [
 			{ 
 				id: 'D0',
@@ -487,4 +487,49 @@ describe('getLayoutData 2 tests', () => {
 			}
 		}]);
 	});
+	it('getSerieDataWithMissingLines, advanced attributes and inverted dim', () => {
+		const dimensions = [
+			{ 
+				id: 'D0',
+				values: [
+					{ id: 'D0V0' },
+					{ id: 'D0V1', hasAdvancedAttributes: true }
+				]
+			}
+		];
+
+		const attributesSeries = {};
+
+		const topCoordinates = {};
+
+		const serie = {
+  		indexes: [-1],
+  		parentsIndexes: [[]],
+  		missingIndexes: [[]],
+  	};
+
+		const customAttributes = {
+			flags: [],
+			notes: []
+		}
+
+		expect(getSerieDataWithMissingLines(serie, dimensions, topCoordinates, attributesSeries, customAttributes, {})).to.deep.equal([{
+			data: [
+				{
+					dimension: { id: 'D0' },
+					value: { id: 'D0V1', missingParents: [], parents: [], hasAdvancedAttributes: true }
+				},
+			],
+			coordinates: { D0: 'D0V1' },
+			key: 'D0=D0V1',
+			flags: [],
+			sideProps: {
+				coordinates: {
+					D0: 'D0V1',
+				},
+				hasAdvancedAttributes: true,
+				hasMetadata: false
+			}
+		}]);
+	});
 });

package/test/getTableLayoutIds.test.js

@@ -45,6 +45,11 @@ describe('injectCombinationsInLayout', () => {
 
 describe('getTableLayoutIds tests', () => {
   it('simple case blank start', () => {
+    const defaultLayoutIds = {
+      header: [],
+      sections: [],
+      rows: []
+    };
     const layoutIds = {
       header: [],
       sections: [],
@@ -59,13 +64,18 @@ describe('getTableLayoutIds tests', () => {
       { id: 'TIME_PERIOD' },
     ];
 
-    expect(getTableLayoutIds(layoutIds, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds, dimensions, attributes, combinations)).to.deep.equal({
       header: ['TIME_PERIOD'],
       sections: ['MEASURE', 'REF_SECTOR'],
       rows: ['REF_AREA']
     });
   });
   it('blank start with combinations', () => {
+    const defaultLayoutIds = {
+      header: [],
+      sections: [],
+      rows: []
+    };
     const layoutIds = {
       header: [],
       sections: ['COMB1'],
@@ -104,7 +114,7 @@ describe('getTableLayoutIds tests', () => {
       { id: 'ATTR4', relationship: [], series: true },
     ];
 
-    expect(getTableLayoutIds(layoutIds, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds, dimensions, attributes, combinations)).to.deep.equal({
       header: ['TRANSACTION'],
       sections: ['COMB1', 'COMB3'],
       rows: ['COMB2', 'REF_AREA']
@@ -123,8 +133,13 @@ describe('getTableLayoutIds tests', () => {
       header: ['D2'],
       rows: ['D3']
     };
+    const defaultLayoutIds = {
+      header: [],
+      sections: [],
+      rows: []
+    };
 
-    expect(getTableLayoutIds(layoutIds, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds, dimensions, attributes, combinations)).to.deep.equal({
       header: [],
       sections: [],
       rows: ['D2']
@@ -155,8 +170,13 @@ describe('getTableLayoutIds tests', () => {
       header: ['D3'],
       rows: []
     };
+    const defaultLayoutIds = {
+      header: [],
+      sections: [],
+      rows: []
+    };
 
-    expect(getTableLayoutIds(layoutIds, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds, dimensions, attributes, combinations)).to.deep.equal({
       header: ['D3'],
       sections: [],
       rows: ['COMB1', 'COMB2']
@@ -183,6 +203,11 @@ describe('getTableLayoutIds tests', () => {
       { id: 'D3' },
       { id: 'D4' }
     ];
+    const defaultLayoutIds = {
+      header: [],
+      sections: [],
+      rows: []
+    };
     const layoutIds1 = {
       sections: ['COMB1', 'D4', 'COMB2'],
       header: ['D3'],
@@ -203,22 +228,22 @@ describe('getTableLayoutIds tests', () => {
       header: ['D3'],
       rows: []
     };
-    expect(getTableLayoutIds(layoutIds1, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds1, dimensions, attributes, combinations)).to.deep.equal({
       header: ['D3'],
       sections: ['D4'],
       rows: ['COMB1', 'COMB2']
     });
-    expect(getTableLayoutIds(layoutIds2, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds2, dimensions, attributes, combinations)).to.deep.equal({
       header: ['D3'],
       sections: ['COMB1', 'COMB2'],
       rows: ['D4']
     });
-    expect(getTableLayoutIds(layoutIds3, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds3, dimensions, attributes, combinations)).to.deep.equal({
       header: ['D3'],
       sections: ['D4'],
       rows: ['COMB2', 'COMB1']
     });
-    expect(getTableLayoutIds(layoutIds4, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds4, dimensions, attributes, combinations)).to.deep.equal({
       header: ['D3'],
       sections: ['COMB1', 'COMB2'],
       rows: ['D4']
@@ -237,15 +262,83 @@ describe('getTableLayoutIds tests', () => {
       { id: 'D1' },
       { id: 'D2' },
     ];
+    const defaultLayoutIds = {
+      header: [],
+      sections: [],
+      rows: []
+    };
     const layoutIds = {
       header: ['D2'],
       sections: ['COMB', 'D1'],
       rows: ['D3']
     };
-    expect(getTableLayoutIds(layoutIds, dimensions, attributes, combinations)).to.deep.equal({
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds, dimensions, attributes, combinations)).to.deep.equal({
       header: ['D2'],
       sections: [],
       rows: ['COMB', 'D1']
     });
   });
+  it('combinations and default layout definition', () => {
+    const defaultLayoutIds = {
+      header: ['MEASURE', 'REF_AREA'],
+      sections: ['COMB2', 'COMB3'],
+      rows: []
+    };
+    const combinations = [
+      {
+        id: 'COMB1',
+        concepts: ['REF_SECTOR', 'MEASURE'],
+      },
+      {
+        id: 'COMB2',
+        concepts: ['UNIT_MEASURE', 'CURRENCY'],
+      },
+      {
+        id: 'COMB3',
+        concepts: ['ATTR1', 'ATTR2'],
+      },
+      {
+        id: 'COMB4',
+        concepts: ['ATTR3', 'ATTR4']
+      }
+    ];
+    const dimensions = [
+      { id: 'REF_AREA' },
+      { id: 'REF_SECTOR' },
+      { id: 'TRANSACTION' },
+      { id: 'MEASURE' },
+      { id: 'UNIT_MEASURE' },
+      { id: 'CURRENCY' }
+    ];
+    const attributes = [
+      { id: 'ATTR1', relationship: ['MEASURE'], series: true },
+      { id: 'ATTR2', relationship: ['MEASURE'], series: true },
+      { id: 'ATTR3', relationship: [], series: true },
+      { id: 'ATTR4', relationship: [], series: true },
+    ];
+
+    const layoutIds1 = {
+      header: [],
+      sections: [],
+      rows: []
+    };
+
+    const layoutIds2 = {
+      header: ['TRANSACTION'],
+      sections: ['REF_AREA'],
+      rows: []
+    };
+
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds1, dimensions, attributes, combinations)).to.deep.equal({
+      header: ['COMB1', 'COMB3', 'REF_AREA'],
+      sections: ['COMB2'],
+      rows: ['TRANSACTION']
+    });
+
+    expect(getTableLayoutIds(defaultLayoutIds, layoutIds2, dimensions, attributes, combinations)).to.deep.equal({
+      header: ['TRANSACTION', 'COMB1', 'COMB3'],
+      sections: ['COMB2'],
+      rows: ['REF_AREA']
+    });
+  });
 });