@sis-cc/dotstatsuite-components 14.4.0 → 15.0.0

package/lib/app.js

@@ -6,14 +6,10 @@ var _react2 = _interopRequireDefault(_react);
 
 var _reactDom = require('react-dom');
 
-var _app = require('./rules-driver/src/app');
+var _app = require('./viewer/src/app');
 
 var _app2 = _interopRequireDefault(_app);
 
-var _app3 = require('./viewer/src/app');
-
-var _app4 = _interopRequireDefault(_app3);
-
 var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
 var _styles = require('@material-ui/core/styles');
@@ -26,7 +22,7 @@ var App = function App() {
   return _react2.default.createElement(
     _styles.ThemeProvider,
     { theme: theme },
-    _react2.default.createElement(_app4.default, null)
+    _react2.default.createElement(_app2.default, null)
   );
 };
 

package/lib/index.js

@@ -3,23 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Viewer = exports.RulesDriver = exports.bridgeD3React = exports.rules2 = exports.rules = undefined;
+exports.Viewer = exports.bridgeD3React = exports.rules2 = exports.rules = undefined;
 
-var _src = require('./rules-driver/src');
-
-Object.defineProperty(exports, 'RulesDriver', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_src).default;
-  }
-});
-
-var _src2 = require('./viewer/src');
+var _src = require('./viewer/src');
 
 Object.defineProperty(exports, 'Viewer', {
   enumerable: true,
   get: function get() {
-    return _interopRequireDefault(_src2).default;
+    return _interopRequireDefault(_src).default;
   }
 });
 
@@ -27,17 +18,17 @@ var _package = require('../package.json');
 
 var _package2 = _interopRequireDefault(_package);
 
-var _src3 = require('./rules/src');
+var _src2 = require('./rules/src');
 
-var rules = _interopRequireWildcard(_src3);
+var rules = _interopRequireWildcard(_src2);
 
-var _src4 = require('./rules2/src');
+var _src3 = require('./rules2/src');
 
-var rules2 = _interopRequireWildcard(_src4);
+var rules2 = _interopRequireWildcard(_src3);
 
-var _src5 = require('./bridge-d3-react/src');
+var _src4 = require('./bridge-d3-react/src');
 
-var bridgeD3React = _interopRequireWildcard(_src5);
+var bridgeD3React = _interopRequireWildcard(_src4);
 
 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; } }
 

package/lib/rules/src/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSharedLayoutCompatible = exports.getAvailableChartTypes = exports.getObservationsType = exports.getInformationsStateFromNewProps = exports.getFooterProps = exports.getHeaderProps = exports.getTimePeriodLabel = exports.getFullName = exports.getFlags = exports.getTableProps = exports.getCellValue = exports.prepareData = exports.v8Transformer = exports.getErrors = exports.toProperties = exports.toChartOptions = exports.toChartData = exports.onChangeProperties = exports.stateFromNewProps = exports.initialState = exports.chartTypes = exports.V8_SDMX_JSON = exports.DEFAULT_MAJOR_ATTRIBUTES = exports.DIMENSION_DISPLAY_PARTS = exports.DEFAULT_UPR_IDS = exports.dimensionValueDisplay = exports.isNonIdealState = exports.getTopologyAreasCollections = exports.sourceLabel = exports.header = exports.getUprs = exports.headerUprsLabel = exports.uprAttributesWithOneRelevantValue = exports.uprAttributes = exports.defaultSubtitle = exports.parseFocus = exports.focus = exports.source = exports.series = exports.choroSeries = exports.stackedSeries = exports.timelineSeries = exports.symbolSeries = exports.scatterSeries = exports.stackedDimension = exports.symbolDimension = exports.scatterDimension = exports.sampleSeries = exports.parseDisplay = exports.dimensionsWithValuesIndexedById = exports.splitDimensions = exports.getDimensionValues = exports.getRelevantsDatasetAttributes = exports.extractSdmxArtefacts = exports.extractDataName = exports.extractSdmxErrors = exports.freqM = exports.freqQ = exports.freqA = undefined;
+exports.enhanceObservations = exports.getObservations = exports.getUnitsSeries = exports.getAttachmentSeriesIndexes = exports.getHeaderUnits = exports.getUnitsArtefacts = exports.getUnitsDefinition = exports.refineSeriesAttributesValues = exports.getAttributeValue = exports.getManyValuesDimensions = exports.getOneValueDimensions = exports.parseAttributesValuesFromObservations = exports.getDimensionsAttributesRegisters = exports.parseAttributes = exports.parseDimensionsIds = exports.isSharedLayoutCompatible = exports.getAvailableChartTypes = exports.getObservationsType = exports.getInformationsStateFromNewProps = exports.getFooterProps = exports.getHeaderProps = exports.getTimePeriodLabel = exports.getFullName = exports.getFlags = exports.getTableProps = exports.getCellValue = exports.prepareData = exports.v8Transformer = exports.toSingularity = exports.getErrors = exports.toProperties = exports.toChartOptions = exports.toChartData = exports.onChangeProperties = exports.stateFromNewProps = exports.initialState = exports.chartTypes = exports.V8_SDMX_JSON = exports.DEFAULT_MAJOR_ATTRIBUTES = exports.DIMENSION_DISPLAY_PARTS = exports.DEFAULT_UPR_IDS = exports.dimensionValueDisplay = exports.isNonIdealState = exports.getTopologyAreasCollections = exports.sourceLabel = exports.header = exports.getUprs = exports.headerUprsLabel = exports.uprAttributesWithOneRelevantValue = exports.uprAttributes = exports.defaultSubtitle = exports.parseFocus = exports.focus = exports.source = exports.series = exports.choroSeries = exports.stackedSeries = exports.timelineSeries = exports.symbolSeries = exports.scatterSeries = exports.stackedDimension = exports.symbolDimension = exports.scatterDimension = exports.sampleSeries = exports.parseDisplay = exports.dimensionsWithValuesIndexedById = exports.splitDimensions = exports.getDimensionValues = exports.getRelevantsDatasetAttributes = exports.extractSdmxArtefacts = exports.extractDataName = exports.extractSdmxErrors = exports.freqM = exports.freqQ = exports.freqA = undefined;
 
 var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
 
@@ -175,6 +175,12 @@ Object.defineProperty(exports, 'getErrors', {
     return _properties.getErrors;
   }
 });
+Object.defineProperty(exports, 'toSingularity', {
+  enumerable: true,
+  get: function get() {
+    return _properties.toSingularity;
+  }
+});
 
 var _v8Transformer = require('./v8-transformer');
 
@@ -281,6 +287,141 @@ Object.defineProperty(exports, 'isSharedLayoutCompatible', {
   }
 });
 
+var _parseDimensionsIds = require('./table/preparators/parseDimensionsIds');
+
+Object.defineProperty(exports, 'parseDimensionsIds', {
+  enumerable: true,
+  get: function get() {
+    return _parseDimensionsIds.parseDimensionsIds;
+  }
+});
+
+var _parseAttributes = require('./table/preparators/parseAttributes');
+
+Object.defineProperty(exports, 'parseAttributes', {
+  enumerable: true,
+  get: function get() {
+    return _parseAttributes.parseAttributes;
+  }
+});
+
+var _getDimensionsAttributesRegisters = require('./table/preparators/getDimensionsAttributesRegisters');
+
+Object.defineProperty(exports, 'getDimensionsAttributesRegisters', {
+  enumerable: true,
+  get: function get() {
+    return _getDimensionsAttributesRegisters.getDimensionsAttributesRegisters;
+  }
+});
+
+var _parseAttributesValuesFromObservations = require('./table/preparators/parseAttributesValuesFromObservations');
+
+Object.defineProperty(exports, 'parseAttributesValuesFromObservations', {
+  enumerable: true,
+  get: function get() {
+    return _parseAttributesValuesFromObservations.parseAttributesValuesFromObservations;
+  }
+});
+
+var _getOneValueDimensions = require('./table/preparators/getOneValueDimensions');
+
+Object.defineProperty(exports, 'getOneValueDimensions', {
+  enumerable: true,
+  get: function get() {
+    return _getOneValueDimensions.getOneValueDimensions;
+  }
+});
+
+var _getManyValuesDimensions = require('./table/preparators/getManyValuesDimensions');
+
+Object.defineProperty(exports, 'getManyValuesDimensions', {
+  enumerable: true,
+  get: function get() {
+    return _getManyValuesDimensions.getManyValuesDimensions;
+  }
+});
+
+var _getAttributeValue = require('./table/preparators/getAttributeValue');
+
+Object.defineProperty(exports, 'getAttributeValue', {
+  enumerable: true,
+  get: function get() {
+    return _getAttributeValue.getAttributeValue;
+  }
+});
+
+var _refineSeriesAttributesValues = require('./table/preparators/refineSeriesAttributesValues');
+
+Object.defineProperty(exports, 'refineSeriesAttributesValues', {
+  enumerable: true,
+  get: function get() {
+    return _refineSeriesAttributesValues.refineSeriesAttributesValues;
+  }
+});
+
+var _getUnitsDefinition = require('./table/units/getUnitsDefinition');
+
+Object.defineProperty(exports, 'getUnitsDefinition', {
+  enumerable: true,
+  get: function get() {
+    return _getUnitsDefinition.getUnitsDefinition;
+  }
+});
+
+var _getUnitsArtefacts = require('./table/units/getUnitsArtefacts');
+
+Object.defineProperty(exports, 'getUnitsArtefacts', {
+  enumerable: true,
+  get: function get() {
+    return _getUnitsArtefacts.getUnitsArtefacts;
+  }
+});
+
+var _getHeaderUnits = require('./table/units/getHeaderUnits');
+
+Object.defineProperty(exports, 'getHeaderUnits', {
+  enumerable: true,
+  get: function get() {
+    return _getHeaderUnits.getHeaderUnits;
+  }
+});
+
+var _getAttachmentSeriesIndexes = require('./table/units/getAttachmentSeriesIndexes');
+
+Object.defineProperty(exports, 'getAttachmentSeriesIndexes', {
+  enumerable: true,
+  get: function get() {
+    return _getAttachmentSeriesIndexes.getAttachmentSeriesIndexes;
+  }
+});
+
+var _getUnitsSeries = require('./table/units/getUnitsSeries');
+
+Object.defineProperty(exports, 'getUnitsSeries', {
+  enumerable: true,
+  get: function get() {
+    return _getUnitsSeries.getUnitsSeries;
+  }
+});
+
+var _getObservations = require('./preparators/getObservations');
+
+Object.defineProperty(exports, 'getObservations', {
+  enumerable: true,
+  get: function get() {
+    return _getObservations.getObservations;
+  }
+});
+
+var _enhanceObservations = require('./preparators/enhanceObservations');
+
+Object.defineProperty(exports, 'enhanceObservations', {
+  enumerable: true,
+  get: function get() {
+    return _enhanceObservations.enhanceObservations;
+  }
+});
+
 var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);

package/lib/rules/src/properties/index.js

@@ -31,8 +31,6 @@ var _linear = require('./linear');
 
 var _utils = require('./utils');
 
-var _getInformationsStateFromNewProps = require('./getInformationsStateFromNewProps');
-
 var _getHeaderProps = require('./getHeaderProps');
 
 var _getStringifiedSubtitle = require('./getStringifiedSubtitle');
@@ -170,8 +168,7 @@ var stateFromNewProps = exports.stateFromNewProps = function stateFromNewProps(p
   var symbolState = (0, _symbol.symbolStateFromNewProps)(props, state);
   var stackedState = (0, _stacked.stackedStateFromNewProps)(props, state);
   var linearState = (0, _linear.linearStateFromNewProps)(props.type);
-  var informationState = (0, _getInformationsStateFromNewProps.getInformationsStateFromNewProps)(props, state);
-  return (0, _extends3.default)({}, focusState, scatterState, symbolState, stackedState, linearState, informationState, {
+  return (0, _extends3.default)({}, focusState, scatterState, symbolState, stackedState, linearState, {
     fixedWidth: R.prop('fixedWidth', state),
     fixedHeight: R.prop('fixedHeight', state),
     responsiveWidth: R.prop('responsiveWidth', state),
@@ -234,7 +231,7 @@ var propertiesParsers = {
   }
 };
 
-var onChangeProperties = exports.onChangeProperties = function onChangeProperties(props, state, onChange) {
+var onChangeProperties = exports.onChangeProperties = function onChangeProperties(state, onChange) {
   return function (newProperties) {
     var apply = R.is(Function, onChange) ? onChange : R.identity;
     var refined = R.pipe(R.mapObjIndexed(function (value, key) {

package/lib/rules/src/table/preparators/prepareData.js

@@ -5,13 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.prepareData = undefined;
 
-var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
+var _extends2 = require('babel-runtime/helpers/extends');
 
-var _defineProperty3 = _interopRequireDefault(_defineProperty2);
-
-var _extends3 = require('babel-runtime/helpers/extends');
-
-var _extends4 = _interopRequireDefault(_extends3);
+var _extends3 = _interopRequireDefault(_extends2);
 
 var _ramda = require('ramda');
 
@@ -59,8 +55,6 @@ var _hierarchiseDimensionWithAdvancedHierarchy = require('../../../../rules2/src
 
 var _hierarchiseDimensionWithNativeHierarchy = require('../../../../rules2/src/hierarchiseDimensionWithNativeHierarchy');
 
-var _getDimensionValuesIndexes = require('../../../../rules2/src/getDimensionValuesIndexes');
-
 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; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -172,12 +166,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
     return (0, _hierarchiseDimensionWithAdvancedHierarchy.hierarchiseDimensionWithAdvancedHierarchy)(dim, R.prop(dim.id, hierarchies));
   })(manyValuesDimensions);
 
-  var valuesIndexes = R.reduce(function (acc, dim) {
-    return (0, _extends4.default)({}, acc, (0, _defineProperty3.default)({}, dim.__index, (0, _getDimensionValuesIndexes.getDimensionValuesIndexes)(dim.values)));
-  }, {}, R.values(hierarchisedDimensions));
-
-  var duplicatedObservations = (0, _duplicateObservations.duplicateObservations)(observations, valuesIndexes);
-
+  var duplicatedObservations = (0, _duplicateObservations.duplicateObs)(R.values(hierarchisedDimensions), observations);
   return {
     dimensions: {
       one: oneValueDimensions,
@@ -192,7 +181,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
       unitsSeries: unitsSeries
     },
     metadataCoordinates: metadataCoordinates,
-    advancedAttributes: (0, _extends4.default)({}, dataflowAdvancedAttributes, observationsAdvancedAttributes, seriesAdvancedAttributes),
+    advancedAttributes: (0, _extends3.default)({}, dataflowAdvancedAttributes, observationsAdvancedAttributes, seriesAdvancedAttributes),
     observations: duplicatedObservations,
     observationsType: (0, _getObservationsType.getObservationsType)(sdmxJson.data),
     dataflowAttributes: dataflowAttributes,

package/lib/rules2/src/duplicateObservations.js

@@ -3,11 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.duplicateObservations = undefined;
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
+exports.duplicateObs = undefined;
 
 var _ramda = require('ramda');
 
@@ -15,37 +11,25 @@ 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; } }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var duplicateObservations = exports.duplicateObservations = function duplicateObservations(observations, indexes) {
-  return R.addIndex(R.reduce)(function (acc, obs, i) {
-
-    var orderedIndexes = R.addIndex(R.map)(function (valueIndex, dimIndex) {
-      return R.pathOr([Number(valueIndex)], [dimIndex, valueIndex], indexes);
-    }, R.propOr([], 'dimValuesIndexes', obs));
-
-    var cartesian = void 0;
-
-    if (R.any(function (is) {
-      return R.length(is) > 1;
-    })(orderedIndexes)) {
-      cartesian = R.reduce(function (acc, oInds) {
-        var r = R.map(function (i) {
-          return R.map(function (is) {
-            return R.append(i, is);
-          }, acc);
-        }, oInds);
-        return R.unnest(r);
-      }, R.pipe(R.head, R.map(R.of))(orderedIndexes), R.tail(orderedIndexes));
-    } else {
-      cartesian = [R.unnest(orderedIndexes)];
-    }
-
-    var duplicatedObs = R.reduce(function (acc, orderedDimIndexes) {
-      var key = R.join(':', orderedDimIndexes);
-      return R.assoc(key, (0, _extends3.default)({}, obs, { orderedDimIndexes: orderedDimIndexes }), acc);
-    }, {}, cartesian);
-
-    return R.mergeRight(acc, duplicatedObs);
-  }, {}, R.values(observations));
+var duplicateObs = exports.duplicateObs = function duplicateObs(dims, observations) {
+  var duplicated = R.reduce(function (obs, dim) {
+    var groupedObs = R.groupBy(function (o) {
+      return R.prop(dim.id, o.indexedDimValIds);
+    }, obs);
+    var enhancedObs = R.addIndex(R.map)(function (value, index) {
+      var matchingObs = R.propOr([], value.id, groupedObs);
+
+      return R.map(function (obs) {
+        return R.over(R.lensProp('orderedDimIndexes'), function (_indexes) {
+          var indexes = R.isNil(_indexes) ? R.map(function (i) {
+            return Number(i);
+          }, obs.dimValuesIndexes) : _indexes;
+          return R.set(R.lensIndex(dim.__index), index)(indexes);
+        })(obs);
+      }, matchingObs);
+    }, dim.values);
+    return R.unnest(enhancedObs);
+  }, R.values(observations), dims);
+  var res = R.indexBy(R.pipe(R.prop('orderedDimIndexes'), R.join(':')), duplicated);
+  return res;
 };

package/lib/rules2/src/index.js

@@ -104,4 +104,67 @@ Object.defineProperty(exports, 'refinePartialHierarchy', {
   get: function get() {
     return _hierarchiseDimensionWithAdvancedHierarchy.refinePartialHierarchy;
   }
+});
+
+var _getMetadataCoordinates = require('./getMetadataCoordinates');
+
+Object.defineProperty(exports, 'getMetadataCoordinates', {
+  enumerable: true,
+  get: function get() {
+    return _getMetadataCoordinates.getMetadataCoordinates;
+  }
+});
+
+var _getAdvancedAttributes = require('./getAdvancedAttributes');
+
+Object.defineProperty(exports, 'getDataflowAdvancedAttributes', {
+  enumerable: true,
+  get: function get() {
+    return _getAdvancedAttributes.getDataflowAdvancedAttributes;
+  }
+});
+Object.defineProperty(exports, 'getObservationsAdvancedAttributes', {
+  enumerable: true,
+  get: function get() {
+    return _getAdvancedAttributes.getObservationsAdvancedAttributes;
+  }
+});
+Object.defineProperty(exports, 'getSeriesAdvancedAttributes', {
+  enumerable: true,
+  get: function get() {
+    return _getAdvancedAttributes.getSeriesAdvancedAttributes;
+  }
+});
+
+var _duplicateObservations = require('./duplicateObservations');
+
+Object.defineProperty(exports, 'duplicateObs', {
+  enumerable: true,
+  get: function get() {
+    return _duplicateObservations.duplicateObs;
+  }
+});
+Object.defineProperty(exports, 'hierarchiseDimensionWithAdvancedHierarchy', {
+  enumerable: true,
+  get: function get() {
+    return _hierarchiseDimensionWithAdvancedHierarchy.hierarchiseDimensionWithAdvancedHierarchy;
+  }
+});
+
+var _hierarchiseDimensionWithNativeHierarchy = require('./hierarchiseDimensionWithNativeHierarchy');
+
+Object.defineProperty(exports, 'hierarchiseDimensionWithNativeHierarchy', {
+  enumerable: true,
+  get: function get() {
+    return _hierarchiseDimensionWithNativeHierarchy.hierarchiseDimensionWithNativeHierarchy;
+  }
+});
+
+var _getDimensionValuesIndexes = require('./getDimensionValuesIndexes');
+
+Object.defineProperty(exports, 'getDimensionValuesIndexes', {
+  enumerable: true,
+  get: function get() {
+    return _getDimensionValuesIndexes.getDimensionValuesIndexes;
+  }
 });

package/package.json

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

package/src/app.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { render } from 'react-dom';
-import RulesDriverApp from './rules-driver/src/app';
 import ViewerApp from './viewer/src/app';
 import { sisccTheme } from '@sis-cc/dotstatsuite-visions';
 import { ThemeProvider } from '@material-ui/core/styles';
@@ -10,7 +9,6 @@ const theme = createMuiTheme(sisccTheme({ rtl: 'ltr' }));
 
 const App = () => (
   <ThemeProvider theme={theme}>
-    {/*<RulesDriverApp />*/}
     <ViewerApp />
   </ThemeProvider>
 );

package/src/index.js

@@ -9,5 +9,4 @@ export { rules };
 export { rules2 };
 export { bridgeD3React };
 
-export { default as RulesDriver } from './rules-driver/src';
 export { default as Viewer } from './viewer/src';

package/src/rules/src/index.js

@@ -377,6 +377,7 @@ export {
   toChartOptions,
   toProperties,
   getErrors,
+  toSingularity
 } from './properties';
 export { dataTransformer as v8Transformer } from './v8-transformer';
 export {
@@ -394,3 +395,21 @@ export { getInformationsStateFromNewProps } from './properties/getInformationsSt
 export { getObservationsType } from './properties/getObservationsType';
 export { getAvailableChartTypes } from './properties/getAvailableChartTypes';
 export { isSharedLayoutCompatible } from './layout';
+
+export { parseDimensionsIds } from './table/preparators/parseDimensionsIds';
+export { parseAttributes } from './table/preparators/parseAttributes';
+export { getDimensionsAttributesRegisters } from './table/preparators/getDimensionsAttributesRegisters';
+export { parseAttributesValuesFromObservations } from './table/preparators/parseAttributesValuesFromObservations';
+export { getOneValueDimensions } from './table/preparators/getOneValueDimensions';
+export { getManyValuesDimensions } from './table/preparators/getManyValuesDimensions';
+export { getAttributeValue } from './table/preparators/getAttributeValue';
+export { refineSeriesAttributesValues } from './table/preparators/refineSeriesAttributesValues';
+
+export { getUnitsDefinition } from './table/units/getUnitsDefinition';
+export { getUnitsArtefacts } from './table/units/getUnitsArtefacts';
+export { getHeaderUnits } from './table/units/getHeaderUnits';
+export { getAttachmentSeriesIndexes } from './table/units/getAttachmentSeriesIndexes';
+export { getUnitsSeries } from './table/units/getUnitsSeries';
+
+export { getObservations } from './preparators/getObservations';
+export { enhanceObservations } from './preparators/enhanceObservations';

package/src/rules/src/properties/index.js

@@ -52,7 +52,6 @@ import {
   isNumber,
   optionParser,
 } from './utils';
-import { getInformationsStateFromNewProps } from './getInformationsStateFromNewProps';
 import { getTitleLabel, getSubtitle, getSourceLabel } from './getHeaderProps';
 import { stringifySubtitle } from './getStringifiedSubtitle';
 import { getHasNoTimePeriodError } from './errors';
@@ -197,14 +196,12 @@ export const stateFromNewProps = (props, state) => {
   const symbolState = symbolStateFromNewProps(props, state);
   const stackedState = stackedStateFromNewProps(props, state);
   const linearState = linearStateFromNewProps(props.type);
-  const informationState = getInformationsStateFromNewProps(props, state);
   return ({
   ...focusState,
   ...scatterState,
   ...symbolState,
   ...stackedState,
   ...linearState,
-  ...informationState,
   fixedWidth: R.prop('fixedWidth', state),
   fixedHeight: R.prop('fixedHeight', state),
   responsiveWidth: R.prop('responsiveWidth', state),
@@ -242,7 +239,7 @@ const propertiesParsers = {
   stepY: (value) => isNaturalInt(value) ? value : undefined,
 };
 
-export const onChangeProperties = (props, state, onChange) => (newProperties) => {
+export const onChangeProperties = (state, onChange) => (newProperties) => {
   const apply = R.is(Function, onChange) ? onChange : R.identity;
   const refined = R.pipe(
     R.mapObjIndexed((value, key) => {

package/src/rules/src/table/preparators/prepareData.js

@@ -24,10 +24,9 @@ import {
   getObservationsAdvancedAttributes,
   getSeriesAdvancedAttributes
 } from '../../../../rules2/src/getAdvancedAttributes';
-import { duplicateObservations } from '../../../../rules2/src/duplicateObservations';
+import { duplicateObs } from '../../../../rules2/src/duplicateObservations';
 import { hierarchiseDimensionWithAdvancedHierarchy } from '../../../../rules2/src/hierarchiseDimensionWithAdvancedHierarchy';
 import { hierarchiseDimensionWithNativeHierarchy } from '../../../../rules2/src/hierarchiseDimensionWithNativeHierarchy';
-import { getDimensionValuesIndexes } from '../../../../rules2/src/getDimensionValuesIndexes';
 
 export const prepareData = (sdmxJson, customAttributes, unitsProps={}, _options={}) => {
   const {
@@ -172,14 +171,7 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}, _options=
     return hierarchiseDimensionWithAdvancedHierarchy(dim, R.prop(dim.id, hierarchies));
   })(manyValuesDimensions);
 
-  const valuesIndexes = R.reduce(
-    (acc, dim) => ({ ...acc, [dim.__index]: getDimensionValuesIndexes(dim.values) }),
-    {},
-    R.values(hierarchisedDimensions)
-  );
-
-  const duplicatedObservations = duplicateObservations(observations, valuesIndexes);
-
+  const duplicatedObservations = duplicateObs(R.values(hierarchisedDimensions), observations);
   return ({
     dimensions: {
       one: oneValueDimensions,

package/src/rules2/src/duplicateObservations.js

@@ -1,45 +1,31 @@
 import * as R from 'ramda';
 
-export const duplicateObservations = (observations, indexes) => {
-  return R.addIndex(R.reduce)(
-    (acc, obs, i) => {
+export const duplicateObs = (dims, observations) => {
+  const duplicated = R.reduce(
+    (obs, dim) => {
+      const groupedObs = R.groupBy(o => R.prop(dim.id, o.indexedDimValIds), obs);
+      const enhancedObs = R.addIndex(R.map)(
+        (value, index) => {
+          const matchingObs = R.propOr([], value.id, groupedObs);
 
-      const orderedIndexes = R.addIndex(R.map)(
-        (valueIndex, dimIndex) => R.pathOr([Number(valueIndex)], [dimIndex, valueIndex], indexes),
-        R.propOr([], 'dimValuesIndexes', obs)
-      );
-
-      let cartesian;
-
-      if (R.any(is => R.length(is) > 1)(orderedIndexes)) {
-        cartesian = R.reduce(
-          (acc, oInds) => {
-            const r = R.map(
-              i => R.map(is => R.append(i, is), acc),
-              oInds
-            );
-            return R.unnest(r);
-          },
-          R.pipe(R.head, R.map(R.of))(orderedIndexes),
-          R.tail(orderedIndexes)
-        );
-      }
-      else {
-        cartesian = [R.unnest(orderedIndexes)];
-      }
-
-      const duplicatedObs = R.reduce(
-        (acc, orderedDimIndexes) => {
-          const key = R.join(':', orderedDimIndexes);
-          return R.assoc(key, { ...obs, orderedDimIndexes }, acc);
+          return R.map(
+            obs => R.over(
+              R.lensProp('orderedDimIndexes'),
+              _indexes => {
+                const indexes = R.isNil(_indexes) ? R.map(i => Number(i), obs.dimValuesIndexes) : _indexes;
+                return R.set(R.lensIndex(dim.__index), index)(indexes);
+              }
+            )(obs),
+            matchingObs
+          );
         },
-        {},
-        cartesian
+        dim.values
       );
-
-      return R.mergeRight(acc, duplicatedObs);
+      return R.unnest(enhancedObs);
     },
-    {},
-    R.values(observations)
-  )
-};
+    R.values(observations),
+    dims
+  );
+  const res =  R.indexBy(R.pipe(R.prop('orderedDimIndexes'), R.join(':')), duplicated);
+  return res;
+};