@sis-cc/dotstatsuite-components 17.32.2 → 18.1.0

package/lib/app.js

@@ -12,7 +12,7 @@ var _app2 = _interopRequireDefault(_app);
 
 var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
-var _styles = require('@material-ui/core/styles');
+var _styles = require('@mui/material/styles');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -22,9 +22,13 @@ var root = (0, _client.createRoot)(container);
 
 var App = function App() {
   return _react2.default.createElement(
-    _styles.ThemeProvider,
-    { theme: theme },
-    _react2.default.createElement(_app2.default, null)
+    _styles.StyledEngineProvider,
+    { injectFirst: true },
+    _react2.default.createElement(
+      _styles.ThemeProvider,
+      { theme: theme },
+      _react2.default.createElement(_app2.default, null)
+    )
   );
 };
 

package/lib/rules2/src/applyHierarchicalCodesToDim.js

@@ -0,0 +1,128 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applyHierarchicalCodesToDim = undefined;
+
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _set = require('babel-runtime/core-js/set');
+
+var _set2 = _interopRequireDefault(_set);
+
+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; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var addParentId = function addParentId(id, ids) {
+  var last = R.last(ids);
+  return R.append(R.isNil(last) ? id : last + '.' + id, ids);
+};
+
+var applyHierarchicalCodesToDim = function applyHierarchicalCodesToDim(hCodes, dim) {
+  var confirmedHierarchisedChilds = new _set2.default([]);
+
+  var indexedValues = R.reduce(function (acc, val) {
+    if (!val.isSelected) {
+      return acc;
+    }
+    return R.assoc(val.id, val, acc);
+  }, {}, dim.values || []);
+
+  var parseHCodes = function parseHCodes(parentsDef, parentsInDim) {
+    return R.reduce(function (acc, hC) {
+      var codeID = hC.codeID,
+          _hC$hierarchicalCodes = hC.hierarchicalCodes,
+          hierarchicalCodes = _hC$hierarchicalCodes === undefined ? [] : _hC$hierarchicalCodes;
+
+      var hasInDim = R.has(codeID, indexedValues);
+      var isUnconfirmed = R.length(parentsInDim) !== R.length(parentsDef);
+      var children = parseHCodes(R.append(codeID, parentsDef), hasInDim ? addParentId(codeID, parentsInDim) : parentsInDim)(hierarchicalCodes);
+      if (!hasInDim) {
+        return R.concat(acc, children);
+      }
+      var val = (0, _extends3.default)({}, R.prop(codeID, indexedValues), {
+        parents: parentsInDim,
+        parent: R.last(parentsInDim),
+        children: children
+      });
+
+      if (isUnconfirmed) {
+        val = R.assoc('unconfirmed', true, val);
+        return R.append(val, acc);
+      }
+      confirmedHierarchisedChilds.add(codeID);
+      return R.append(val, acc);
+    }, []);
+  };
+
+  var parsed = parseHCodes([], [])(hCodes);
+
+  var flattenDescendants = R.reduce(function (acc, val) {
+    var children = flattenDescendants(val.children || []);
+    return R.concat(acc, R.prepend(val, children));
+  }, []);
+
+  var isValid = function isValid(val) {
+    return !val.unconfirmed || !confirmedHierarchisedChilds.has(val.id);
+  };
+
+  var refineCodes = R.reduce(function (acc, hC) {
+    var children = hC.children,
+        _hC$unconfirmed = hC.unconfirmed,
+        unconfirmed = _hC$unconfirmed === undefined ? false : _hC$unconfirmed,
+        val = (0, _objectWithoutProperties3.default)(hC, ['children', 'unconfirmed']);
+
+    if (isValid(hC)) {
+      var _children = refineCodes(children || []);
+      confirmedHierarchisedChilds.add(val.id);
+      return R.concat(acc, R.prepend(val, _children));
+    }
+    var flatDescendants = flattenDescendants(children);
+    var validDescendant = R.find(isValid, flatDescendants);
+    if (!validDescendant) {
+      return acc;
+    }
+    var refined = R.pipe(R.prepend(hC), R.map(function (v) {
+      confirmedHierarchisedChilds.add(v.id);
+      return R.omit(['unconfirmed', 'children'], v);
+    }))(flatDescendants);
+    return R.concat(acc, refined);
+  }, []);
+
+  var refined = refineCodes(parsed);
+
+  var missingValues = R.pipe(R.keys, R.filter(function (id) {
+    return !confirmedHierarchisedChilds.has(id);
+  }), function (ids) {
+    return R.props(ids, indexedValues);
+  }, R.map(function (v) {
+    return (0, _extends3.default)({}, v, { parents: [], parent: undefined });
+  }), R.sortBy(R.propOr(-1, '__indexPosition')))(indexedValues);
+
+  var hierarchicalIndexes = {};
+
+  return R.pipe(R.concat, R.addIndex(R.map)(function (v, ind) {
+    var parents = R.props(v.parents, hierarchicalIndexes);
+    var hierId = R.last(v.parents) ? R.last(v.parents) + '.' + v.id : v.id;
+    hierarchicalIndexes[hierId] = ind;
+    return (0, _extends3.default)({}, v, {
+      parents: parents,
+      __indexPosition: ind
+    });
+  }), function (values) {
+    return (0, _extends3.default)({}, dim, { values: values });
+  })(missingValues, refined);
+};
+exports.applyHierarchicalCodesToDim = applyHierarchicalCodesToDim;

package/lib/rules2/src/hierarchiseDimensionWithAdvancedHierarchy2.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.hierarchiseDimensionWithAdvancedHierarchy = exports.refinePartialHierarchy = undefined;
+exports.refinePartialHierarchy = undefined;
 
 var _extends2 = require('babel-runtime/helpers/extends');
 
@@ -62,39 +62,4 @@ var refinePartialHierarchy = exports.refinePartialHierarchy = function refinePar
   return (0, _extends3.default)({}, refinedBroken, intact, {
     '#ROOT': R.concat(refinedBroken['#ROOT'], intact['#ROOT'])
   });
-};
-
-var hierarchiseDimensionWithAdvancedHierarchy = exports.hierarchiseDimensionWithAdvancedHierarchy = function hierarchiseDimensionWithAdvancedHierarchy(dimension, _hierarchy) {
-  var indexed = R.indexBy(R.prop('id'), dimension.values);
-  var hierarchy = refinePartialHierarchy(_hierarchy, indexed);
-
-  var rest = R.pipe(R.values, R.unnest, R.flip(R.omit)(indexed), R.values)(hierarchy);
-  var index = R.length(rest) - 1;
-  var getChildren = function getChildren(_ref3) {
-    var parentsIndexes = _ref3.parentsIndexes,
-        parentId = _ref3.parentId;
-
-    var childrenIds = R.propOr([], parentId, hierarchy);
-    var children = R.reduce(function (acc, childId) {
-      if (!R.has(childId, indexed)) {
-        return acc;
-      }
-      index = index + 1;
-      var child = (0, _extends3.default)({}, R.prop(childId, indexed), { __indexPosition: index, parents: parentsIndexes, parent: R.isEmpty(parentsIndexes) ? undefined : R.pipe(R.split('.'), R.last)(parentId) });
-      var descendants = getChildren({ parentsIndexes: R.append(index, parentsIndexes), parentId: R.isEmpty(parentsIndexes) ? child.id : parentId + '.' + child.id });
-      return R.append(R.prepend(child, descendants), acc);
-    }, [], childrenIds);
-
-    return children;
-  };
-
-  return R.set(R.lensProp('values'), R.pipe(getChildren, R.flatten, function (values) {
-    if (R.isEmpty(rest)) {
-      return values;
-    }
-    var sortedRest = R.pipe(R.sortBy(R.prop('__indexPosition')), R.addIndex(R.map)(function (val, ind) {
-      return (0, _extends3.default)({}, val, { __indexPosition: ind, parent: undefined, parents: [] });
-    }))(rest);
-    return R.concat(sortedRest, values);
-  })({ parentsIndexes: [], parentId: '#ROOT' }))(dimension);
 };

package/lib/rules2/src/index.js

@@ -114,12 +114,6 @@ Object.defineProperty(exports, 'refinePartialHierarchy', {
     return _hierarchiseDimensionWithAdvancedHierarchy.refinePartialHierarchy;
   }
 });
-Object.defineProperty(exports, 'hierarchiseDimensionWithAdvancedHierarchy', {
-  enumerable: true,
-  get: function get() {
-    return _hierarchiseDimensionWithAdvancedHierarchy.hierarchiseDimensionWithAdvancedHierarchy;
-  }
-});
 
 var _hierarchiseDimensionWithNativeHierarchy = require('./hierarchiseDimensionWithNativeHierarchy2');
 
@@ -437,4 +431,13 @@ Object.defineProperty(exports, 'declineObservationsOverAttributes', {
   get: function get() {
     return _declineObservationsOverAttributes.declineObservationsOverAttributes;
   }
+});
+
+var _applyHierarchicalCodesToDim = require('./applyHierarchicalCodesToDim');
+
+Object.defineProperty(exports, 'applyHierarchicalCodesToDim', {
+  enumerable: true,
+  get: function get() {
+    return _applyHierarchicalCodesToDim.applyHierarchicalCodesToDim;
+  }
 });

package/lib/rules2/src/parseCombinations.js

@@ -35,6 +35,7 @@ var hasInvalidValues = R.pipe(R.prop('values'), R.anyPass([R.isNil, R.complement
 var isConceptInvalid = R.anyPass([hasInvalidValues /* add more... */]);
 var filterValidConcepts = R.reject(isConceptInvalid);
 // concepts is an array of ids... (misnamed!)
+var conceptIdsLens = R.lensProp('concepts');
 var rejectInvalidConceptIds = function rejectInvalidConceptIds() {
   var concepts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return function () {
@@ -43,7 +44,7 @@ var rejectInvalidConceptIds = function rejectInvalidConceptIds() {
     var validConceptIds = R.pluck('id', filterValidConcepts(concepts));
     return R.reduce(function (acc, comb) {
       var refinedConcepts = R.intersection(validConceptIds, comb.concepts);
-      if (R.length(refinedConcepts) < 1) {
+      if (R.length(refinedConcepts) < 2) {
         return acc;
       }
       return R.append((0, _extends4.default)({}, comb, { concepts: refinedConcepts }), acc);

package/lib/rules2/src/prepareData.js

@@ -35,8 +35,6 @@ var _getOneValueDimensions = require('./getOneValueDimensions');
 
 var _hierarchiseDimensionWithNativeHierarchy = require('./hierarchiseDimensionWithNativeHierarchy2');
 
-var _hierarchiseDimensionWithAdvancedHierarchy = require('./hierarchiseDimensionWithAdvancedHierarchy2');
-
 var _getDataflowAttributes = require('./getDataflowAttributes');
 
 var _getHeaderTitle = require('./getHeaderTitle');
@@ -47,6 +45,8 @@ var _getHeaderCombinations = require('./getHeaderCombinations');
 
 var _getHeaderCoordinates = require('./getHeaderCoordinates');
 
+var _applyHierarchicalCodesToDim = require('./applyHierarchicalCodesToDim');
+
 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 prepareData = exports.prepareData = function prepareData(sdmxJson, _ref) {
@@ -86,7 +86,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, _ref) {
     if (R.isEmpty(R.propOr({}, dim.id, hierarchies))) {
       return (0, _hierarchiseDimensionWithNativeHierarchy.hierarchiseDimensionWithNativeHierarchy)(dim);
     }
-    return (0, _hierarchiseDimensionWithAdvancedHierarchy.hierarchiseDimensionWithAdvancedHierarchy)(dim, R.prop(dim.id, hierarchies));
+    return (0, _applyHierarchicalCodesToDim.applyHierarchicalCodesToDim)(R.prop(dim.id, hierarchies), dim);
   }, manyValuesDimensions);
   var duplicatedObservations = (0, _duplicateObservations.duplicateObs)(R.values(hierarchisedDimensions), enhancedObservations);
 

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

@@ -90,7 +90,7 @@ var getCoordinates = function getCoordinates(indexes, topCoordinates, definition
 
 var getAttributesSeries = function getAttributesSeries(validator, attributesSeries) {
 	return R.reduce(function (acc, attrs) {
-		var attr = R.head(R.values(attrs)) || {};
+		var attr = R.head(R.values(attrs));
 		if (R.length(attr.relationship || []) === 1 && !attr.combined) {
 			return acc;
 		}
@@ -130,7 +130,7 @@ var getSerieFlagsAndSideProps = function getSerieFlagsAndSideProps(coordinates,
 	var flags = (0, _getFlagsAndNotes.getFlagsAndNotes)(layoutAttrValues, customAttributes);
 	var hasMetadata = !R.isNil(R.find(validator, metadataCoordinates));
 	var hasDataAdvancedAttributes = R.any(function (d) {
-		return R.has('value', d) ? R.prop('hasAdvancedAttributes', d.value) : R.any(R.prop('hasAdvancedAttributes'), d.values);
+		return R.has('value', d) ? d.hasAdvancedAttributes : R.any(R.prop('hasAdvancedAttributes'), d.values);
 	}, data);
 	var hasAdvancedAttributes = hasDataAdvancedAttributes || getHasAdvancedAttributes(layoutAttrValues, customAttributes);
 	var sideProps = hasMetadata || hasAdvancedAttributes ? { hasMetadata: hasMetadata, hasAdvancedAttributes: hasAdvancedAttributes, coordinates: coordinates } : null;

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

@@ -61,7 +61,7 @@ var parseSerieIndexesHierarchies = function parseSerieIndexesHierarchies(serieIn
         return R.over(R.lensProp('presentParentsIndexes'), function (p) {
           return R.isNil(p) ? [i] : R.append(i, p);
         }, _acc);
-      } else if (i > previousIndex && R.pathOr(false, [dimensionIndex, 'values', i, 'isSelected'], dimensions)) {
+      } else if (i > previousIndex) {
         registeredIndexes.add(i);
         return R.over(R.lensProp('missingParentsIndexes'), function (m) {
           return R.isNil(m) ? [i] : R.append(i, m);

package/lib/viewer/src/app.js

@@ -16,7 +16,7 @@ var _reactHelmet = require('react-helmet');
 
 var _core = require('@blueprintjs/core');
 
-var _styles = require('@material-ui/core/styles');
+var _styles = require('@mui/material/styles');
 
 var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
@@ -152,26 +152,22 @@ exports.default = function () {
   return _react2.default.createElement(
     'div',
     { style: { padding: 10 } },
+    _react2.default.createElement(_reactHelmet.Helmet, { htmlAttributes: { dir: isRtl ? 'rtl' : 'ltr' } }),
     _react2.default.createElement(
-      _styles.ThemeProvider,
-      { theme: theme },
-      _react2.default.createElement(_reactHelmet.Helmet, { htmlAttributes: { dir: isRtl ? 'rtl' : 'ltr' } }),
-      _react2.default.createElement(
-        'button',
-        { onClick: function onClick() {
-            return setRtl(!isRtl);
-          } },
-        isRtl ? 'left to right' : 'right to left'
-      ),
-      _react2.default.createElement(
-        _core.Tabs2,
-        { renderActiveTabPanelOnly: false },
-        _react2.default.createElement(_core.Tab2, {
-          id: 'uc1',
-          title: _react2.default.createElement(AppTab, { label: 'full screen resizable chart', iconName: 'fullscreen' }),
-          panel: _react2.default.createElement(_useCase2.default, { isRtl: isRtl, config: config, style: style, options: options })
-        })
-      )
+      'button',
+      { onClick: function onClick() {
+          return setRtl(!isRtl);
+        } },
+      isRtl ? 'left to right' : 'right to left'
+    ),
+    _react2.default.createElement(
+      _core.Tabs2,
+      { renderActiveTabPanelOnly: false },
+      _react2.default.createElement(_core.Tab2, {
+        id: 'uc1',
+        title: _react2.default.createElement(AppTab, { label: 'full screen resizable chart', iconName: 'fullscreen' }),
+        panel: _react2.default.createElement(_useCase2.default, { isRtl: isRtl, config: config, style: style, options: options })
+      })
     )
   );
 };

package/lib/viewer/src/index.js

@@ -38,7 +38,7 @@ var _size2 = _interopRequireDefault(_size);
 
 var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
-var _styles = require('@material-ui/core/styles');
+var _styles = require('@mui/styles');
 
 var _options = require('./chartUtils/options');
 

package/lib/viewer/src/legends/AxisLegend.js

@@ -20,7 +20,9 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
-var _styles = require('@material-ui/core/styles');
+var _makeStyles = require('@mui/styles/makeStyles');
+
+var _makeStyles2 = _interopRequireDefault(_makeStyles);
 
 var _constants = require('../../../rules/src/constants');
 
@@ -30,7 +32,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var useStyles = (0, _styles.makeStyles)(function (theme) {
+var useStyles = (0, _makeStyles2.default)(function (theme) {
   var legendFont = (0, _utils.getFontFromTheme)(['axisLegend'])(theme);
   return {
     xLegend: legendFont,

package/lib/viewer/src/legends/ChartLegends.js

@@ -20,7 +20,7 @@ var _dotstatsuiteD3Charts = require('@sis-cc/dotstatsuite-d3-charts');
 
 var _src = require('../../../bridge-d3-react/src');
 
-var _styles = require('@material-ui/core/styles');
+var _styles = require('@mui/material/styles');
 
 var _AxisLegend = require('./AxisLegend');
 

package/lib/viewer/src/legends/Legend.js

@@ -20,7 +20,9 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
-var _styles = require('@material-ui/core/styles');
+var _makeStyles = require('@mui/styles/makeStyles');
+
+var _makeStyles2 = _interopRequireDefault(_makeStyles);
 
 var _utils = require('../utils');
 
@@ -28,7 +30,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var useStyles = (0, _styles.makeStyles)(function (theme) {
+var useStyles = (0, _makeStyles2.default)(function (theme) {
   return {
     legend: (0, _extends3.default)({}, (0, _utils.getFontFromTheme)(['chartLegend'])(theme), {
       display: 'flex',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "17.32.2",
+  "version": "18.1.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -13,7 +13,8 @@
   },
   "devDependencies": {
     "@blueprintjs/core": "^1.22.0",
-    "@material-ui/core": "^4",
+    "@mui/material": "^5.16.5",
+    "@mui/styles": "^5.16.5",
     "@sis-cc/dotstatsuite-sdmxjs": "*",
     "@sis-cc/dotstatsuite-visions": "*",
     "react": "^18",
@@ -23,6 +24,11 @@
     "web-component-env": "^2.0.0"
   },
   "dependencies": {
+    "@emotion/react": "^11.13.3",
+    "@emotion/styled": "^11.13.0",
+    "@mui/icons-material": "^5.16.5",
+    "@mui/material": "^5.16.5",
+    "@mui/styles": "^5.16.5",
     "@react-hook/size": "^2.1.1",
     "@sis-cc/dotstatsuite-d3-charts": "^8.3.0",
     "date-fns": "^1.30.1",
@@ -34,7 +40,8 @@
     "ramda": "^0.26.1"
   },
   "peerDependencies": {
-    "@material-ui/core": "^4",
+    "@mui/icons-material": "^5.16.5",
+    "@mui/material": "^5.16.5",
     "@sis-cc/dotstatsuite-sdmxjs": "^8",
     "@sis-cc/dotstatsuite-visions": "^9",
     "react": "^18",

package/src/app.js

@@ -2,17 +2,19 @@ import React from 'react';
 import { createRoot } from 'react-dom/client';
 import ViewerApp from './viewer/src/app';
 import { sisccTheme } from '@sis-cc/dotstatsuite-visions';
-import { ThemeProvider } from '@material-ui/core/styles';
-import { createTheme } from '@material-ui/core/styles';
+import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles';
+import { createTheme } from '@mui/material/styles';
 
 const theme = createTheme(sisccTheme({ rtl: 'ltr' }));
 const container = document.getElementById('root');
 const root = createRoot(container);
 
 const App = () => (
-  <ThemeProvider theme={theme}>
-    <ViewerApp />
-  </ThemeProvider>
+  <StyledEngineProvider injectFirst>
+    <ThemeProvider theme={theme}>
+      <ViewerApp />
+    </ThemeProvider>
+  </StyledEngineProvider>
 );
 
 root.render(<App />);

package/src/rules2/src/applyHierarchicalCodesToDim.js

@@ -0,0 +1,101 @@
+import * as R from 'ramda';
+
+const addParentId = (id, ids) => {
+  const last = R.last(ids);
+  return R.append(R.isNil(last) ? id : `${last}.${id}`, ids); 
+}
+
+export const applyHierarchicalCodesToDim = (hCodes, dim) => {
+  let confirmedHierarchisedChilds = new Set([]);
+
+  const indexedValues = R.reduce((acc, val) => {
+    if (!val.isSelected) {
+      return acc;
+    }
+    return R.assoc(val.id, val, acc);
+  }, {}, dim.values || []);
+
+  const parseHCodes = (parentsDef, parentsInDim) => R.reduce((acc, hC) => {
+    const { codeID, hierarchicalCodes = [] } = hC;
+    const hasInDim = R.has(codeID, indexedValues);
+    const isUnconfirmed = R.length(parentsInDim) !== R.length(parentsDef);
+    const children = parseHCodes(
+      R.append(codeID, parentsDef),
+      hasInDim ? addParentId(codeID, parentsInDim) : parentsInDim
+    )(hierarchicalCodes);
+    if (!hasInDim) {
+      return R.concat(acc, children);
+    }
+    let val = {
+      ...R.prop(codeID, indexedValues),
+      parents: parentsInDim,
+      parent: R.last(parentsInDim),
+      children
+    };
+
+    if (isUnconfirmed) {
+      val = R.assoc('unconfirmed', true, val);
+      return R.append(val, acc);
+    }
+    confirmedHierarchisedChilds.add(codeID);
+    return R.append(val, acc);
+  }, []);
+
+  const parsed = parseHCodes([], [])(hCodes);
+
+  const flattenDescendants = R.reduce((acc, val ) => {
+    const children = flattenDescendants(val.children || []);
+    return R.concat(acc, R.prepend(val, children));
+  }, []);
+
+  const isValid = val => !val.unconfirmed || !confirmedHierarchisedChilds.has(val.id);
+
+  const refineCodes = R.reduce((acc, hC) => {
+    const { children, unconfirmed = false, ...val } = hC;
+    if (isValid(hC)) {
+      const _children = refineCodes(children || []);
+      confirmedHierarchisedChilds.add(val.id);
+      return R.concat(acc, R.prepend(val, _children));
+    }
+    const flatDescendants = flattenDescendants(children);
+    const validDescendant = R.find(isValid, flatDescendants);
+    if (!validDescendant) {
+      return acc;
+    }
+    const refined = R.pipe(
+      R.prepend(hC),
+      R.map(v => {
+        confirmedHierarchisedChilds.add(v.id);
+        return R.omit(['unconfirmed', 'children'], v);
+      })
+    )(flatDescendants);
+    return R.concat(acc, refined);
+  }, []);
+
+  const refined = refineCodes(parsed);
+
+  const missingValues = R.pipe(
+    R.keys,
+    R.filter(id => !confirmedHierarchisedChilds.has(id)),
+    ids => R.props(ids, indexedValues),
+    R.map(v => ({ ...v, parents: [], parent: undefined })),
+    R.sortBy(R.propOr(-1, '__indexPosition')),
+  )(indexedValues);
+
+  let hierarchicalIndexes = {};
+
+  return R.pipe(
+    R.concat,
+    R.addIndex(R.map)((v, ind) => {
+      const parents = R.props(v.parents, hierarchicalIndexes);
+      const hierId = R.last(v.parents) ? `${R.last(v.parents)}.${v.id}` : v.id;
+      hierarchicalIndexes[hierId] = ind;
+      return {
+        ...v,
+        parents,
+        __indexPosition: ind
+      };
+    }),
+    values => ({ ...dim, values })
+  )(missingValues, refined);
+};

package/src/rules2/src/hierarchiseDimensionWithAdvancedHierarchy2.js

@@ -55,48 +55,3 @@ export const refinePartialHierarchy = (hier, indexed) => {
     '#ROOT': R.concat(refinedBroken['#ROOT'], intact['#ROOT'])
   })
 };
-
-export const hierarchiseDimensionWithAdvancedHierarchy = (dimension, _hierarchy) => {
-  const indexed = R.indexBy(R.prop('id'), dimension.values);
-  const hierarchy = refinePartialHierarchy(_hierarchy, indexed);
-
-  const rest = R.pipe(
-    R.values,
-    R.unnest,
-    R.flip(R.omit)(indexed),
-    R.values,
-  )(hierarchy);
-  let index = R.length(rest) - 1;
-  const getChildren = ({ parentsIndexes, parentId }) => {
-    const childrenIds = R.propOr([], parentId, hierarchy);
-    const children = R.reduce((acc, childId) => {
-      if (!R.has(childId, indexed)) {
-        return acc;
-      }
-      index = index + 1;
-      const child = { ...R.prop(childId, indexed), __indexPosition: index, parents: parentsIndexes, parent: R.isEmpty(parentsIndexes) ? undefined : R.pipe(R.split('.'), R.last)(parentId) };
-      const descendants = getChildren({ parentsIndexes: R.append(index, parentsIndexes), parentId: R.isEmpty(parentsIndexes) ? child.id : `${parentId}.${child.id}` });
-      return R.append(R.prepend(child, descendants), acc);
-    }, [], childrenIds);
-
-    return children;
-  }
-
-  return R.set(
-    R.lensProp('values'),
-    R.pipe(
-      getChildren,
-      R.flatten,
-      values => {
-        if (R.isEmpty(rest)) {
-          return values;
-        }
-        const sortedRest = R.pipe(
-          R.sortBy(R.prop('__indexPosition')),
-          R.addIndex(R.map)((val, ind) => ({ ...val, __indexPosition: ind, parent: undefined, parents: [] })),
-        )(rest);
-        return R.concat(sortedRest, values);
-      }
-    )({ parentsIndexes: [], parentId: '#ROOT' })
-  )(dimension);
-};

package/src/rules2/src/index.js

@@ -12,7 +12,7 @@ export { getHCodelistsRefs, getHCodelistsRefsInData } from './getHCodelistsRefsI
 export { parseHierarchicalCodelist } from './parseHierarchicalCodelist';
 export { getMetadataCoordinates } from './getMetadataCoordinates';
 export { duplicateObs } from './duplicateObservations';
-export { refinePartialHierarchy, hierarchiseDimensionWithAdvancedHierarchy } from './hierarchiseDimensionWithAdvancedHierarchy2';
+export { refinePartialHierarchy } from './hierarchiseDimensionWithAdvancedHierarchy2';
 export { hierarchiseDimensionWithNativeHierarchy } from './hierarchiseDimensionWithNativeHierarchy2';
 export { getDimensionValuesIndexes } from './getDimensionValuesIndexes';
 export { getCombinationDefinitions, parseCombinationDefinition } from './getCombinationDefinitions';
@@ -47,3 +47,4 @@ export { parseValueHierarchy } from './table/parseValueHierarchy';
 export { parseLayoutIndexesHierarchies } from './table/parseSeriesIndexesHierarchies';
 export { getTableLayoutIds, injectCombinationsInLayout } from './table/getTableLayoutIds';
 export { declineObservationsOverAttributes } from './table/declineObservationsOverAttributes';
+export { applyHierarchicalCodesToDim } from './applyHierarchicalCodesToDim';

package/src/rules2/src/parseCombinations.js

@@ -18,13 +18,14 @@ const hasInvalidValues = R.pipe(
 const isConceptInvalid = R.anyPass([hasInvalidValues /* add more... */]);
 const filterValidConcepts = R.reject(isConceptInvalid);
 // concepts is an array of ids... (misnamed!)
+const conceptIdsLens = R.lensProp('concepts');
 const rejectInvalidConceptIds =
   (concepts = []) =>
   (combinations = []) => {
     const validConceptIds = R.pluck('id', filterValidConcepts(concepts));
     return R.reduce((acc, comb) => {
       const refinedConcepts = R.intersection(validConceptIds, comb.concepts);
-      if (R.length(refinedConcepts) < 1) {
+      if (R.length(refinedConcepts) < 2) {
         return acc;
       }
       return R.append({ ...comb, concepts: refinedConcepts }, acc);