@sis-cc/dotstatsuite-components 10.0.0 → 12.1.0

package/lib/rules2/src/hasLayoutEntryMetadata.js

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLayoutEntryMetadataCoordinates = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+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; } }
+
+/*
+const layoutData = [{ dimension: { id: 'D1', __index: 2 }, value: { id: 'V', __index: 0 } }];
+*/
+
+var getLayoutEntryMetadataCoordinates = exports.getLayoutEntryMetadataCoordinates = function getLayoutEntryMetadataCoordinates(layoutData, metadataSeries) {};

package/lib/rules2/src/index.js

@@ -0,0 +1,47 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _constants = require('./constants');
+
+Object.defineProperty(exports, 'SDMX_3_0_JSON_DATA_FORMAT', {
+  enumerable: true,
+  get: function get() {
+    return _constants.SDMX_3_0_JSON_DATA_FORMAT;
+  }
+});
+Object.defineProperty(exports, 'SDMX_3_0_CSV_DATA_FORMAT', {
+  enumerable: true,
+  get: function get() {
+    return _constants.SDMX_3_0_CSV_DATA_FORMAT;
+  }
+});
+
+var _getSidebarData = require('./getSidebarData');
+
+Object.defineProperty(exports, 'getSidebarData', {
+  enumerable: true,
+  get: function get() {
+    return _getSidebarData.getSidebarData;
+  }
+});
+
+var _parseMetadataSeries = require('./parseMetadataSeries');
+
+Object.defineProperty(exports, 'parseMetadataSeries', {
+  enumerable: true,
+  get: function get() {
+    return _parseMetadataSeries.parseMetadataSeries;
+  }
+});
+
+var _sdmx = require('./sdmx3.0DataFormatPatch');
+
+Object.defineProperty(exports, 'sdmx_3_0_DataFormatPatch', {
+  enumerable: true,
+  get: function get() {
+    return _sdmx.sdmx_3_0_DataFormatPatch;
+  }
+});

package/lib/rules2/src/parseMetadataSeries.js

@@ -0,0 +1,83 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseMetadataSeries = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+var _dotstatsuiteSdmxjs = require('@sis-cc/dotstatsuite-sdmxjs');
+
+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 dimensionValueDisplay = function dimensionValueDisplay(locale, display) {
+  return function (data) {
+    if (display === 'code') {
+      return R.prop('id', data);
+    }
+    if (display === 'both') {
+      return R.prop('id', data) + ': ' + (0, _dotstatsuiteSdmxjs.getLocalisedName)(locale)(data);
+    }
+    return (0, _dotstatsuiteSdmxjs.getLocalisedName)(locale)(data);
+  };
+};
+// options = { locale, display, dimensions = [] };
+var parseMetadataSeries = exports.parseMetadataSeries = function parseMetadataSeries(metadataJson, options) {
+  var metadataAttributes = R.pathOr([], ['data', 'structures', 0, 'attributes', 'dimensionGroup'], metadataJson);
+  var metaAttrLength = R.length(metadataAttributes);
+
+  if (!metaAttrLength) {
+    return {};
+  }
+
+  var dimensions = R.pipe(R.pathOr([], ['data', 'structures', 0, 'dimensions']), function (_ref) {
+    var _ref$series = _ref.series,
+        series = _ref$series === undefined ? [] : _ref$series,
+        _ref$observation = _ref.observation,
+        observation = _ref$observation === undefined ? [] : _ref$observation;
+    return R.concat(series, observation);
+  }, function (dims) {
+    return R.isEmpty(options.dimensions || []) ? dims : R.props(R.pluck('id', options.dimensions), R.indexBy(R.prop('id'), dims));
+  })(metadataJson);
+
+  var metadataSeries = R.pipe(R.pathOr({}, ['data', 'dataSets', 0, 'dimensionGroupAttributes']), function (series) {
+    return R.reduce(function (acc, serieKey) {
+      var indexes = series[serieKey];
+      var metaIndexes = R.take(metaAttrLength, indexes);
+
+      var evolvedKey = R.pipe(R.split(':'), R.addIndex(R.map)(function (vInd, dInd) {
+        if (R.isEmpty(vInd)) {
+          return vInd;
+        }
+        var dim = R.nth(dInd, dimensions);
+        var val = R.nth(Number(vInd), dim.values || []);
+
+        var originalVal = R.find(R.propEq('id', val.id))(R.propOr([], 'values', R.nth(dInd, options.dimensions)));
+        return R.propOr('', '__index', originalVal);
+      }), R.join(':'))(serieKey);
+
+      var attributes = R.addIndex(R.reduce)(function (acc, valueIndex, attrIndex) {
+        if (R.isNil(valueIndex)) {
+          return acc;
+        }
+        var attribute = R.nth(attrIndex, metadataAttributes);
+        var label = dimensionValueDisplay(options.locale, options.display)(attribute);
+
+        var value = R.prop('value', R.nth(valueIndex, attribute.values || []));
+
+        return R.append({
+          id: attribute.id,
+          label: label,
+          value: R.is(Object, value) ? R.prop(options.locale, value) : value
+        }, acc);
+      }, [], metaIndexes);
+
+      return R.assoc(evolvedKey, attributes, acc);
+    }, {}, R.keys(series));
+  })(metadataJson);
+
+  return metadataSeries;
+};

package/lib/rules2/src/refineMetadataCoordinates.js

@@ -0,0 +1,34 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.refineMetadataCoordinates = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+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 refineMetadataCoordinates = exports.refineMetadataCoordinates = function refineMetadataCoordinates(metadataCoordinates, layoutIds, headerDimensionsIds) {
+  return R.reduce(function (acc, coordinates) {
+    var refinedCoord = R.omit(headerDimensionsIds, coordinates);
+    if (R.isEmpty(refinedCoord)) {
+      return acc;
+    }
+    var removedHeaderCodes = R.omit(layoutIds.header, refinedCoord);
+    if (R.isEmpty(removedHeaderCodes)) {
+      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('sections'), R.append(refinedCoord))(acc);
+    }
+    var removedRowsCodes = R.omit(layoutIds.rows, removedSectionCodes);
+    if (R.isEmpty(removedRowsCodes)) {
+      return R.over(R.lensProp('rows'), R.append(refinedCoord))(acc);
+    }
+    return R.over(R.lensProp('cells'), R.append(refinedCoord))(acc);
+  }, { cells: [], header: [], sections: [], rows: [] }, metadataCoordinates);
+};

package/lib/rules2/src/sdmx3.0DataFormatPatch.js

@@ -0,0 +1,20 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sdmx_3_0_DataFormatPatch = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+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 sdmx_3_0_DataFormatPatch = exports.sdmx_3_0_DataFormatPatch = function sdmx_3_0_DataFormatPatch(sdmxJson) {
+  var dataSet = R.pipe(R.pathOr({}, ['data', 'dataSets']), R.head)(sdmxJson);
+  var structureIndex = R.prop('structure', dataSet);
+  var structure = R.pipe(R.pathOr([], ['data', 'structures']), R.nth(structureIndex))(sdmxJson);
+
+  return R.set(R.lensPath(['data', 'structure']), structure)(sdmxJson);
+};

package/lib/viewer/src/chart.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
+
+var _defineProperty3 = _interopRequireDefault(_defineProperty2);
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -14,9 +18,11 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
-var _glamorous = require('glamorous');
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
 
-var _glamorous2 = _interopRequireDefault(_glamorous);
+var _styles = require('@material-ui/core/styles');
 
 var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
@@ -40,46 +46,47 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var Container = _glamorous2.default.div({
-  backgroundColor: 'none',
-  overflow: 'hidden',
-  position: 'relative',
-  direction: 'ltr !important'
-}, function (_ref) {
-  var type = _ref.type;
-
-  if (!R.equals(_constants.SCATTER, type)) return {};
+var useStyles = (0, _styles.makeStyles)(function () {
   return {
-    '& .rcw-chart__chart__line--x:last-of-type': {
-      visibility: 'hidden'
-    },
-    '& .rcw-chart__chart__line--y:last-of-type': {
-      visibility: 'hidden'
+    container: {
+      backgroundColor: 'none',
+      overflow: 'hidden',
+      position: 'relative',
+      direction: 'ltr !important'
     },
-    '& .rcw-chart__chart__axis--x': {
-      '& .tick:last-of-type': {
+    chartContainer: {
+      '& .rcw-chart__chart__line--x:last-of-type': {
         visibility: 'hidden'
-      }
-    },
-    '& .rcw-chart__chart__axis--y': {
-      '& .tick:last-of-type': {
+      },
+      '& .rcw-chart__chart__line--y:last-of-type': {
         visibility: 'hidden'
+      },
+      '& .rcw-chart__chart__axis--x': {
+        '& .tick:last-of-type': {
+          visibility: 'hidden'
+        }
+      },
+      '& .rcw-chart__chart__axis--y': {
+        '& .tick:last-of-type': {
+          visibility: 'hidden'
+        }
       }
     }
   };
 });
 
-var Chart = function Chart(_ref2) {
-  var options = _ref2.options,
-      series = _ref2.series,
-      type = _ref2.type,
-      width = _ref2.width,
-      getAxisOptions = _ref2.getAxisOptions;
+var Chart = function Chart(_ref) {
+  var options = _ref.options,
+      series = _ref.series,
+      type = _ref.type,
+      width = _ref.width,
+      getAxisOptions = _ref.getAxisOptions;
 
+  var classes = useStyles();
   var ChartClass = charts[type];
   return _react2.default.createElement(
-    Container,
-    { type: type },
+    'div',
+    { className: (0, _classnames2.default)((0, _defineProperty3.default)({}, classes.chartContainer, !R.equals(_constants.SCATTER, type))) },
     _react2.default.createElement(ChartClass, {
       data: series,
       options: options,
@@ -89,9 +96,9 @@ var Chart = function Chart(_ref2) {
   );
 };
 
-exports.default = (0, _recompose.compose)((0, _recompose.withProps)(function (_ref3) {
-  var heightOffsets = _ref3.heightOffsets,
-      options = _ref3.options;
+exports.default = (0, _recompose.compose)((0, _recompose.withProps)(function (_ref2) {
+  var heightOffsets = _ref2.heightOffsets,
+      options = _ref2.options;
   return {
     options: R.over( // adjust svg height regarding header and footer height
     R.lensPath(['base', 'height']), R.pipe(function (h) {
@@ -99,10 +106,10 @@ exports.default = (0, _recompose.compose)((0, _recompose.withProps)(function (_r
     }, R.when(R.gt(0), R.always(300))), // 2 = borders
     options)
   };
-}), (0, _recompose.branch)(_utils.isChartNoData, (0, _recompose.renderComponent)(function (_ref4) {
-  var noData = _ref4.noData,
-      options = _ref4.options,
-      fixedHeight = _ref4.fixedHeight;
+}), (0, _recompose.branch)(_utils.isChartNoData, (0, _recompose.renderComponent)(function (_ref3) {
+  var noData = _ref3.noData,
+      options = _ref3.options,
+      fixedHeight = _ref3.fixedHeight;
 
   if (R.isNil(fixedHeight)) {
     return _react2.default.createElement(_dotstatsuiteVisions.NoData, { message: noData || 'No Data' });
@@ -114,10 +121,10 @@ exports.default = (0, _recompose.compose)((0, _recompose.withProps)(function (_r
     { style: style },
     _react2.default.createElement(_dotstatsuiteVisions.NoData, { message: noData || 'No Data' })
   );
-})), (0, _recompose.withProps)(function (_ref5) {
-  var data = _ref5.data,
-      options = _ref5.options,
-      type = _ref5.type;
+})), (0, _recompose.withProps)(function (_ref4) {
+  var data = _ref4.data,
+      options = _ref4.options,
+      type = _ref4.type;
   return {
     series: (0, _series2.default)(data.series, type, options) // responsive rule only display highlighted data
   };

package/lib/viewer/src/index.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
+
+var _defineProperty3 = _interopRequireDefault(_defineProperty2);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -20,6 +24,10 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
 var _recompose = require('recompose');
 
 var _reactSizeme = require('react-sizeme');
@@ -28,10 +36,6 @@ var _reactSizeme2 = _interopRequireDefault(_reactSizeme);
 
 var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
-var _glamorous = require('glamorous');
-
-var _glamorous2 = _interopRequireDefault(_glamorous);
-
 var _styles = require('@material-ui/core/styles');
 
 var _options = require('./chartUtils/options');
@@ -54,37 +58,45 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var Container = _glamorous2.default.div({
-  borderColor: '#007bc7',
-  borderBottomWidth: 1,
-  borderLeftWidth: 0,
-  borderTopWidth: 1,
-  borderRightWidth: 0,
-  borderStyle: 'solid',
-  '& svg text::selection': {
-    background: 'none'
-  } }, function (_ref) {
-  var type = _ref.type,
-      fixedWidth = _ref.fixedWidth,
-      fixedHeight = _ref.fixedHeight;
-  return R.ifElse(R.always(type === 'table'), R.always({
-    minWidth: '100%',
-    minHeight: '100%'
-  }), R.always({
-    width: fixedWidth || '100%',
-    height: fixedHeight || '100%',
-    overflow: 'hidden'
-  }));
+var useStyles = (0, _styles.makeStyles)(function (theme) {
+  return {
+    container: {
+      borderColor: '#007bc7',
+      borderBottomWidth: 1,
+      borderLeftWidth: 0,
+      borderTopWidth: 1,
+      borderRightWidth: 0,
+      borderStyle: 'solid',
+      '& svg text::selection': {
+        background: 'none'
+      }
+    },
+    tableContainer: {
+      minWidth: '100%',
+      minHeight: '100%'
+    },
+    chartContainer: {
+      width: function width(_ref) {
+        var fixedWidth = _ref.fixedWidth;
+        return fixedWidth || '100%';
+      },
+      height: function height(_ref2) {
+        var fixedHeight = _ref2.fixedHeight;
+        return fixedHeight || '100%';
+      },
+      overflow: 'hidden'
+    }
+  };
 });
 
-var ViewContent = function ViewContent(_ref2) {
-  var loading = _ref2.loading,
-      _ref2$noData = _ref2.noData,
-      noData = _ref2$noData === undefined ? 'No Data' : _ref2$noData,
-      type = _ref2.type,
-      width = _ref2.width,
-      errorMessage = _ref2.errorMessage,
-      rest = (0, _objectWithoutProperties3.default)(_ref2, ['loading', 'noData', 'type', 'width', 'errorMessage']);
+var ViewContent = function ViewContent(_ref3) {
+  var loading = _ref3.loading,
+      _ref3$noData = _ref3.noData,
+      noData = _ref3$noData === undefined ? 'No Data' : _ref3$noData,
+      type = _ref3.type,
+      width = _ref3.width,
+      errorMessage = _ref3.errorMessage,
+      rest = (0, _objectWithoutProperties3.default)(_ref3, ['loading', 'noData', 'type', 'width', 'errorMessage']);
 
   if (loading) return _react2.default.createElement(_dotstatsuiteVisions.Loading, { message: loading });
   if (!width) return _react2.default.createElement(_dotstatsuiteVisions.Loading, { message: loading });
@@ -109,14 +121,20 @@ var ViewContent = function ViewContent(_ref2) {
   });
 };
 
-var Viewer = function Viewer(_ref3) {
-  var getResponsiveSize = _ref3.getResponsiveSize,
-      setFooterOffset = _ref3.setFooterOffset,
-      setHeaderOffset = _ref3.setHeaderOffset,
-      size = _ref3.size,
-      type = _ref3.type,
-      rest = (0, _objectWithoutProperties3.default)(_ref3, ['getResponsiveSize', 'setFooterOffset', 'setHeaderOffset', 'size', 'type']);
+var Viewer = function Viewer(_ref4) {
+  var _cx;
 
+  var getResponsiveSize = _ref4.getResponsiveSize,
+      setFooterOffset = _ref4.setFooterOffset,
+      setHeaderOffset = _ref4.setHeaderOffset,
+      size = _ref4.size,
+      type = _ref4.type,
+      rest = (0, _objectWithoutProperties3.default)(_ref4, ['getResponsiveSize', 'setFooterOffset', 'setHeaderOffset', 'size', 'type']);
+
+  var classes = useStyles({
+    fixedWidth: rest.fixedWidth,
+    fixedHeight: rest.fixedHeight
+  });
   (0, _react.useEffect)(function () {
     if (R.is(Function, getResponsiveSize)) {
       getResponsiveSize({
@@ -127,8 +145,10 @@ var Viewer = function Viewer(_ref3) {
   });
 
   return _react2.default.createElement(
-    Container,
-    (0, _extends3.default)({ type: type }, R.pick(['fixedWidth', 'fixedHeight'], rest)),
+    'div',
+    {
+      className: (0, _classnames2.default)(classes.container, (_cx = {}, (0, _defineProperty3.default)(_cx, classes.tableContainer, type === 'table'), (0, _defineProperty3.default)(_cx, classes.chartContainer, type !== 'table'), _cx))
+    },
     _react2.default.createElement(_header2.default, (0, _extends3.default)({
       onSize: function onSize(size) {
         return setHeaderOffset(size.height);
@@ -146,9 +166,9 @@ var Viewer = function Viewer(_ref3) {
   );
 };
 
-exports.default = (0, _recompose.compose)((0, _reactSizeme2.default)({ noPlaceholder: true, monitorWidth: true, monitorHeight: true }), (0, _recompose.withState)('heightOffsets', 'setHeightOffsets', { footer: undefined, header: undefined }), (0, _recompose.withProps)(function (_ref4) {
-  var heightOffsets = _ref4.heightOffsets,
-      setHeightOffsets = _ref4.setHeightOffsets;
+exports.default = (0, _recompose.compose)((0, _reactSizeme2.default)({ noPlaceholder: true, monitorWidth: true, monitorHeight: true }), (0, _recompose.withState)('heightOffsets', 'setHeightOffsets', { footer: undefined, header: undefined }), (0, _recompose.withProps)(function (_ref5) {
+  var heightOffsets = _ref5.heightOffsets,
+      setHeightOffsets = _ref5.setHeightOffsets;
   return {
     heightOffsets: R.evolve({
       footer: R.when(R.isNil, R.always(0)),
@@ -162,11 +182,11 @@ exports.default = (0, _recompose.compose)((0, _reactSizeme2.default)({ noPlaceho
     }
   };
 }), (0, _recompose.withProps)( // inject responsive size if needed for chart
-function (_ref5) {
-  var chartOptions = _ref5.chartOptions,
-      heightOffsets = _ref5.heightOffsets,
-      size = _ref5.size,
-      type = _ref5.type;
+function (_ref6) {
+  var chartOptions = _ref6.chartOptions,
+      heightOffsets = _ref6.heightOffsets,
+      size = _ref6.size,
+      type = _ref6.type;
 
   if (type === 'table') {
     return {};
@@ -178,12 +198,12 @@ function (_ref5) {
     fixedHeight: R.path(['base', 'height'], chartOptions)
   };
 }), (0, _recompose.withProps)( // compute all chart options regarding oecd design
-function (_ref6) {
-  var chartData = _ref6.chartData,
-      chartOptions = _ref6.chartOptions,
-      timeFormats = _ref6.timeFormats,
-      type = _ref6.type,
-      locale = _ref6.locale;
+function (_ref7) {
+  var chartData = _ref7.chartData,
+      chartOptions = _ref7.chartOptions,
+      timeFormats = _ref7.timeFormats,
+      type = _ref7.type,
+      locale = _ref7.locale;
 
   if (type === 'table') {
     return {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "10.0.0",
+  "version": "12.1.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -24,24 +24,19 @@
     "@react-hook/size": "^2.1.1",
     "@sis-cc/dotstatsuite-d3-charts": "^8.0.0",
     "date-fns": "^1.30.1",
-    "glamor": "^2.20.40",
-    "glamorous": "^4.13.1",
     "lodash": "^4.17.2",
     "lodash.compose": "^2.4.1",
     "memoizee": "^0.4.4",
     "numeral": "^2.0.6",
     "prop-types": "^15.6.2",
-    "query-string": "^4.3.2",
     "ramda": "^0.26.1",
-    "react-addons-css-transition-group": "^15.6.2",
     "react-dom": "^16.5.2",
-    "react-select": "^1.2.1",
     "react-sizeme": "^2.3.6",
     "recompose": "^0.30.0"
   },
   "peerDependencies": {
     "@material-ui/core": "^4.x",
-    "@sis-cc/dotstatsuite-visions": "^6.x",
+    "@sis-cc/dotstatsuite-visions": "^7.x",
     "@sis-cc/dotstatsuite-sdmxjs": "^5.x",
     "react": "16.x"
   }

package/src/index.js

@@ -2,9 +2,11 @@ import meta from '../package.json';
 console.info(`${meta.name}@${meta.version}`);
 
 import * as rules from './rules/src';
+import * as rules2 from './rules2/src';
 import * as bridgeD3React from './bridge-d3-react/src';
 
 export { rules };
+export { rules2 };
 export { bridgeD3React };
 
 export { default as RulesDriver } from './rules-driver/src';

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

@@ -1,12 +1,13 @@
 import * as R from 'ramda';
 import { dimensionValueDisplay } from '../../dimension-utils';
+import { hasCellMetadata } from '../../../../rules2/src/hasCellMetadata';
 
 const getAttrLabel = (display) => (attribute) => `${display(attribute)}: ${display(R.propOr({}, 'value', attribute))}`;
 
 export const getFlags = (customAttributesIds, display, unitsProps) => ({ attributes={}, units={} }) => {
   const refinedAttributes = R.omit(R.propOr([], 'rejected', customAttributesIds), attributes);
   const flags = R.pipe(R.pick(R.propOr([], 'flags', customAttributesIds)), R.values)(refinedAttributes);
-  const footnotes = R.pipe(R.omit(R.propOr([], 'flags', customAttributesIds)), R.values)(refinedAttributes);
+  const footnotes = R.pipe(R.pick(R.propOr([], 'footnotes', customAttributesIds)), R.values)(refinedAttributes);
 
   const unitsDisplay = R.prop('unitsDisplay', unitsProps);
   const rejectedUnitsValueIds = R.propOr([], 'rejectedValueIds', unitsProps);
@@ -73,9 +74,16 @@ export const getFlags = (customAttributesIds, display, unitsProps) => ({ attribu
   )(flags, footnotes);
 };
 
-const isValidNumber = R.both(R.is(Number), R.complement(R.equals(NaN)));
+const getSideProps = ({ attributes, indexedDimValIds }, customAttributes, metadataCoordinates) => {
+  const rejected = [...customAttributes.flags || [], ...customAttributes.footnotes || [], ...customAttributes.rejected || []];
+  const advancedAttributes = R.omit(rejected, attributes);
+  const hasAdvancedAttributes = !R.isEmpty(advancedAttributes);
+  const hasMetadata = hasCellMetadata(metadataCoordinates, indexedDimValIds);
 
-export const getCells = (data, display, customAttributes, unitsProps) => R.mapObjIndexed(
+  return hasAdvancedAttributes || hasMetadata ? { hasAdvancedAttributes, hasMetadata, coordinates: indexedDimValIds } : null;
+}
+
+export const getCells = (data, display, customAttributes, unitsProps, metadataCoordinates) => R.mapObjIndexed(
   (observation) => R.pipe(
     R.set(
       R.lensProp('flags'),
@@ -85,7 +93,8 @@ export const getCells = (data, display, customAttributes, unitsProps) => R.mapOb
     ),
     R.set(R.lensProp('intValue'), R.prop('value', observation)),
     R.set(R.lensProp('value'), R.prop('formattedValue', observation)),
-    R.assoc('indexedDimValIds', R.prop('indexedDimValIds', observation))
+    R.assoc('indexedDimValIds', R.prop('indexedDimValIds', observation)),
+    R.assoc('sideProps', getSideProps(observation, customAttributes, metadataCoordinates))
   )({}),
   R.propOr({}, 'observations', data)
 );