@sis-cc/dotstatsuite-components 12.0.0 → 12.1.0

package/lib/rules/src/table/factories/getLayoutWithFlags.js

@@ -25,7 +25,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var getLayoutSerieAttributes = exports.getLayoutSerieAttributes = function getLayoutSerieAttributes(layoutSerie, seriesAttributes) {
   var length = R.length(layoutSerie);
-  if (length === 0 || length === 1) {
+  if (length === 0) {
     return null;
   }
 
@@ -89,18 +89,27 @@ var getCoordinates = function getCoordinates(data, unitsId) {
 var getLayoutDataWithFlags = exports.getLayoutDataWithFlags = function getLayoutDataWithFlags(seriesAttributes, display, customAttributes, metadataCoordinates, unitsId) {
   var regularAttrsIds = R.concat(customAttributes.flags || [], customAttributes.footnotes || []);
   var formatSublayout = function formatSublayout(getAttributes) {
-    var supplData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var mCoordinates = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var supplData = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     return function (data) {
       var attributes = getAttributes(data);
       var key = getSerieKey(data);
       var cells = getSublayoutDataCells(display, customAttributes)(data);
       var flags = getFlagsFromSeriesAttributes(display, customAttributes)(attributes);
       var coordinates = getCoordinates(R.concat(supplData, data), unitsId);
-      var hasMetadata = (0, _hasCellMetadata.hasCellMetadata)(metadataCoordinates, coordinates);
+      var hasMetadata = (0, _hasCellMetadata.hasCellMetadata)(mCoordinates, coordinates);
+      var dataAdvancedAttrs = R.reduce(function (acc, _ref) {
+        var dimension = _ref.dimension,
+            value = _ref.value;
+
+        var attrs = (0, _extends3.default)({}, dimension.attributes || {}, value.attributes || {});
+        var advAttrs = R.omit(regularAttrsIds, attrs);
+        return (0, _extends3.default)({}, acc, advAttrs);
+      }, {}, data);
       var advancedAttributesSeries = R.isNil(attributes) ? {} : R.filter(function (serie) {
         return !R.isEmpty(R.omit(regularAttrsIds, R.propOr({}, 'attributes', serie)));
       }, attributes);
-      var hasAdvancedAttributes = !R.isEmpty(advancedAttributesSeries);
+      var hasAdvancedAttributes = !R.isEmpty(advancedAttributesSeries) || !R.isEmpty(dataAdvancedAttrs);
       var sideProps = hasMetadata || hasAdvancedAttributes ? { hasAdvancedAttributes: hasAdvancedAttributes, hasMetadata: hasMetadata, coordinates: coordinates } : null;
 
       return { data: cells, key: key, flags: flags, sideProps: sideProps };
@@ -110,15 +119,15 @@ var getLayoutDataWithFlags = exports.getLayoutDataWithFlags = function getLayout
   return R.evolve({
     headerData: R.map(formatSublayout(function (data) {
       return getLayoutSerieAttributes(data, seriesAttributes);
-    })),
+    }, metadataCoordinates.header)),
     sectionsData: R.map(function (sectionData) {
       var sectionSerie = R.head(sectionData);
       var sectionAttributes = getLayoutSerieAttributes(sectionSerie, seriesAttributes);
       return [formatSublayout(function () {
         return sectionAttributes;
-      })(sectionSerie), R.map(formatSublayout(function (rowData) {
+      }, metadataCoordinates.sections)(sectionSerie), R.map(formatSublayout(function (rowData) {
         return getLayoutSerieAttributes(R.concat(sectionSerie, rowData), R.omit(R.keys(sectionAttributes), seriesAttributes));
-      }, sectionSerie))(R.last(sectionData))];
+      }, metadataCoordinates.rows, sectionSerie))(R.last(sectionData))];
     })
   });
 };

package/lib/rules/src/table/factories/getTableData.js

@@ -96,7 +96,7 @@ var getTableProps = exports.getTableProps = function getTableProps(_ref) {
     display: display, unitDimension: unitDimension, unitsDisplay: unitsLevelDisplay, unitsSeries: unitsSeries,
     unitsDefinitionCodes: unitsDefinitionCodes, unitsIndexes: unitsAttachmentIndexesInLayout,
     partialUnitSerieIndexes: partialUnitSerieIndexes, rejectedValueIds: rejectedValueIds, layoutIds: layoutIds
-  }), (0, _getLayoutWithFlags.getLayoutDataWithFlags)(seriesAttributesValues, display, customAttributes, refinedMetadataCoordinates.layout, unitDimension.id), (0, _cleanUnitsInLayoutData.cleanUnitsInLayoutData)({ unitsDisplay: unitsLevelDisplay, unitsLayoutIndexes: unitsIndexesInLayout }))(layout, R.propOr({}, 'observations', data));
+  }), (0, _getLayoutWithFlags.getLayoutDataWithFlags)(seriesAttributesValues, display, customAttributes, refinedMetadataCoordinates, unitDimension.id), (0, _cleanUnitsInLayoutData.cleanUnitsInLayoutData)({ unitsDisplay: unitsLevelDisplay, unitsLayoutIndexes: unitsIndexesInLayout }))(layout, R.propOr({}, 'observations', data));
 
   return (0, _extends3.default)({
     cells: (0, _getCuratedCells.getCuratedCells)({ layout: layout, observations: cells, shape: ['header', 'sections', 'rows'] }),

package/lib/rules2/src/refineMetadataCoordinates.js

@@ -19,16 +19,16 @@ var refineMetadataCoordinates = exports.refineMetadataCoordinates = function ref
     }
     var removedHeaderCodes = R.omit(layoutIds.header, refinedCoord);
     if (R.isEmpty(removedHeaderCodes)) {
-      return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+      return R.over(R.lensProp('header'), R.append(refinedCoord))(acc);
     }
     var removedSectionCodes = R.omit(layoutIds.sections, refinedCoord);
     if (R.isEmpty(removedSectionCodes)) {
-      return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+      return R.over(R.lensProp('sections'), R.append(refinedCoord))(acc);
     }
     var removedRowsCodes = R.omit(layoutIds.rows, removedSectionCodes);
     if (R.isEmpty(removedRowsCodes)) {
-      return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+      return R.over(R.lensProp('rows'), R.append(refinedCoord))(acc);
     }
     return R.over(R.lensProp('cells'), R.append(refinedCoord))(acc);
-  }, { cells: [], layout: [] }, metadataCoordinates);
+  }, { cells: [], header: [], sections: [], rows: [] }, metadataCoordinates);
 };

package/package.json

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

package/src/rules/src/table/factories/getLayoutWithFlags.js

@@ -5,7 +5,7 @@ import { hasCellMetadata } from '../../../../rules2/src/hasCellMetadata';
 
 export const getLayoutSerieAttributes  = (layoutSerie, seriesAttributes) => {
   const length = R.length(layoutSerie);
-  if (length === 0 || length === 1) {
+  if (length === 0) {
     return null;
   }
 
@@ -88,36 +88,47 @@ const getCoordinates = (data, unitsId) => R.reduce(
 
 export const getLayoutDataWithFlags = (seriesAttributes, display, customAttributes, metadataCoordinates, unitsId) => {
   const regularAttrsIds = R.concat(customAttributes.flags || [], customAttributes.footnotes || []);
-  const formatSublayout = (getAttributes, supplData = []) => data => {
+  const formatSublayout = (getAttributes, mCoordinates = [], supplData = []) => data => {
     const attributes = getAttributes(data);
     const key = getSerieKey(data);
     const cells = getSublayoutDataCells(display, customAttributes)(data);
     const flags = getFlagsFromSeriesAttributes(display, customAttributes)(attributes);
     const coordinates = getCoordinates(R.concat(supplData, data), unitsId);
-    const hasMetadata = hasCellMetadata(metadataCoordinates, coordinates);
+    const hasMetadata = hasCellMetadata(mCoordinates, coordinates);
+    const dataAdvancedAttrs = R.reduce(
+      (acc, { dimension, value }) => {
+        const attrs = { ...dimension.attributes || {}, ...value.attributes || {}};
+        const advAttrs = R.omit(regularAttrsIds, attrs);
+        return  ({ ...acc, ...advAttrs })
+      },
+      {},
+      data
+    );
     const advancedAttributesSeries = R.isNil(attributes)
       ? {}
       : R.filter(
         serie => !R.isEmpty(R.omit(regularAttrsIds, R.propOr({}, 'attributes', serie))),
         attributes
       );
-    const hasAdvancedAttributes = !R.isEmpty(advancedAttributesSeries);
+    const hasAdvancedAttributes = !R.isEmpty(advancedAttributesSeries) || !R.isEmpty(dataAdvancedAttrs);
     const sideProps = hasMetadata || hasAdvancedAttributes ? { hasAdvancedAttributes, hasMetadata, coordinates } : null;
 
     return ({ data: cells, key, flags, sideProps });
   };
 
   return R.evolve({
-  headerData: R.map(formatSublayout(data => getLayoutSerieAttributes(data, seriesAttributes))),
+  headerData: R.map(formatSublayout(data => getLayoutSerieAttributes(data, seriesAttributes), metadataCoordinates.header)),
   sectionsData: R.map(
     sectionData => {
       const sectionSerie = R.head(sectionData);
       const sectionAttributes = getLayoutSerieAttributes(sectionSerie, seriesAttributes);
       return ([
-        formatSublayout(() => sectionAttributes)(sectionSerie),
+        formatSublayout(() => sectionAttributes, metadataCoordinates.sections)(sectionSerie),
         R.map(
-          formatSublayout(rowData => getLayoutSerieAttributes(R.concat(sectionSerie, rowData), R.omit(R.keys(sectionAttributes), seriesAttributes)),
-          sectionSerie)
+          formatSublayout(
+            rowData => getLayoutSerieAttributes(R.concat(sectionSerie, rowData), R.omit(R.keys(sectionAttributes), seriesAttributes)),
+            metadataCoordinates.rows,
+            sectionSerie)
         )(R.last(sectionData))
       ]);
     }

package/src/rules/src/table/factories/getTableData.js

@@ -97,7 +97,7 @@ export const getTableProps = ({ data, layoutIds, display, customAttributes, limi
       unitsDefinitionCodes, unitsIndexes: unitsAttachmentIndexesInLayout,
       partialUnitSerieIndexes, rejectedValueIds, layoutIds
     }),
-    getLayoutDataWithFlags(seriesAttributesValues, display, customAttributes, refinedMetadataCoordinates.layout, unitDimension.id),
+    getLayoutDataWithFlags(seriesAttributesValues, display, customAttributes, refinedMetadataCoordinates, unitDimension.id),
     cleanUnitsInLayoutData({ unitsDisplay: unitsLevelDisplay, unitsLayoutIndexes: unitsIndexesInLayout }),
   )(layout, R.propOr({}, 'observations', data));
   

package/src/rules2/src/refineMetadataCoordinates.js

@@ -9,19 +9,19 @@ export const refineMetadataCoordinates = (metadataCoordinates, layoutIds, header
       }
       const removedHeaderCodes = R.omit(layoutIds.header, refinedCoord);
       if (R.isEmpty(removedHeaderCodes)) {
-        return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+        return R.over(R.lensProp('header'), R.append(refinedCoord))(acc);
       }
       const removedSectionCodes = R.omit(layoutIds.sections, refinedCoord);
       if (R.isEmpty(removedSectionCodes)) {
-        return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+        return R.over(R.lensProp('sections'), R.append(refinedCoord))(acc);
       }
       const removedRowsCodes = R.omit(layoutIds.rows, removedSectionCodes);
       if (R.isEmpty(removedRowsCodes)) {
-        return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+        return R.over(R.lensProp('rows'), R.append(refinedCoord))(acc);
       }
       return R.over(R.lensProp('cells'), R.append(refinedCoord))(acc);
     }, 
-    { cells: [], layout: [] },
+    { cells: [], header: [], sections: [], rows: [] },
     metadataCoordinates
   );
 };

package/test/getLayoutDataWithFlags.test.js

@@ -134,9 +134,9 @@ const expected = {
 
 describe('getLayoutDataWithFlags test', () => {
   it('empty', () => {
-    expect(getLayoutDataWithFlags({}, 'label', {})({ headerData: [], sectionsData: [] })).to.deep.equal({ headerData: [], sectionsData: [] });
+    expect(getLayoutDataWithFlags({}, 'label', {}, {}, [])({ headerData: [], sectionsData: [] })).to.deep.equal({ headerData: [], sectionsData: [] });
   });
   it('multi cases', () => {
-    expect(getLayoutDataWithFlags(attributesValues, 'code', customAttributes, [], [])(layoutData)).to.deep.equal(expected);
+    expect(getLayoutDataWithFlags(attributesValues, 'code', customAttributes, {}, [])(layoutData)).to.deep.equal(expected);
   });
 });