@sis-cc/dotstatsuite-components 14.3.2 → 14.3.5

package/lib/rules/src/v8-transformer.js

@@ -131,7 +131,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
     var attrAnnotations = R.props(attr.annotations || [], annotations);
     return (0, _extends3.default)({}, attr, {
       display: !R.has(attr.id, hiddenIds) && !(0, _sdmxData.getIsHidden)(attrAnnotations),
-      name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
+      name: (0, _dotstatsuiteSdmxjs.getRefinedName)(attr),
       values: getValues(attr.values || [], attr.id)
     });
   }, R.propOr([], 'dataSet', attributes));

package/lib/rules2/src/hierarchiseDimensionWithAdvancedHierarchy.js

@@ -17,32 +17,51 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var uniq = R.pipe(R.reduce(function (_ref, id) {
+  var ids = _ref.ids,
+      list = _ref.list;
+
+  if (R.has(id, list)) {
+    return { ids: ids, list: list };
+  }
+  return { ids: R.append(id, ids), list: R.assoc(id, id, list) };
+}, { ids: [], list: {} }), R.prop('ids'));
+
 var refinePartialHierarchy = exports.refinePartialHierarchy = function refinePartialHierarchy(hier, indexed) {
-  return R.pipe(R.keys, R.reduce(function (acc, key) {
-    var ids = R.prop(key, hier);
+  var _R$pipe = R.pipe(R.keys, R.reduce(function (_ref2, key) {
+    var intact = _ref2.intact,
+        broken = _ref2.broken;
+
+    var ids = R.filter(function (id) {
+      return R.has(id, indexed);
+    }, hier[key]);
     if (key === '#ROOT') {
-      return R.assoc(key, ids, acc);
+      return { broken: broken, intact: R.assoc(key, ids, intact) };
     }
-    var refinedKey = R.pipe(R.split('.'), R.takeLastWhile(function (id) {
+    var splitKey = R.split('.', key);
+    var filtered = R.takeLastWhile(function (id) {
       return R.has(id, indexed);
-    }), R.join('.'))(key);
-    if (R.isEmpty(refinedKey)) {
-      return R.over(R.lensProp('#ROOT0'), R.ifElse(R.isNil, R.always([ids]), R.append(ids)))(acc);
+    }, splitKey);
+    if (R.length(filtered) === R.length(splitKey)) {
+      return { broken: broken, intact: R.assoc(key, ids, intact) };
     }
-    return R.over(R.lensProp(refinedKey), R.ifElse(R.isNil, R.always([ids]), R.append(ids)))(acc);
-  }, {}), function (res) {
-    var roots = R.pipe(R.propOr([], '#ROOT0'), R.unnest, R.sortBy(function (id) {
-      return R.path([id, '__indexPosition'], indexed);
-    }))(res);
-    return R.pipe(R.over(R.lensProp('#ROOT'), function (ids) {
-      return [R.concat(roots, ids)];
-    }), R.dissoc('#ROOT0'))(res);
-  }, R.mapObjIndexed(function (ids) {
-    if (R.length(ids) > 1) {
-      return null;
-    }
-    return R.head(ids);
-  }))(hier);
+    var refinedKey = R.isEmpty(filtered) ? '#ROOT' : R.join('.', filtered);
+    return {
+      intact: intact,
+      broken: R.over(R.lensProp(refinedKey), R.ifElse(R.isNil, R.always([ids]), R.append(ids)))(broken)
+    };
+  }, { intact: {}, broken: {} }))(hier),
+      intact = _R$pipe.intact,
+      broken = _R$pipe.broken;
+
+  var intactIds = R.pipe(R.values, R.unnest)(intact);
+  var refinedBroken = R.pipe(R.omit(intactIds), R.over(R.lensProp('#ROOT'), R.pipe(function (i) {
+    return R.isNil(i) ? [] : i;
+  }, R.unnest, R.reject(R.flip(R.includes)(intactIds)))), R.map(R.pipe(R.unnest, uniq)))(broken);
+
+  return (0, _extends3.default)({}, refinedBroken, intact, {
+    '#ROOT': R.concat(refinedBroken['#ROOT'], intact['#ROOT'])
+  });
 };
 
 var hierarchiseDimensionWithAdvancedHierarchy = exports.hierarchiseDimensionWithAdvancedHierarchy = function hierarchiseDimensionWithAdvancedHierarchy(dimension, _hierarchy) {

package/lib/viewer/src/index.js

@@ -38,6 +38,10 @@ var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
 var _styles = require('@material-ui/core/styles');
 
+var _HourglassEmpty = require('@material-ui/icons/HourglassEmpty');
+
+var _HourglassEmpty2 = _interopRequireDefault(_HourglassEmpty);
+
 var _options = require('./chartUtils/options');
 
 var _options2 = _interopRequireDefault(_options);
@@ -100,8 +104,15 @@ var ViewContent = function ViewContent(_ref3) {
       errorMessage = _ref3.errorMessage,
       rest = (0, _objectWithoutProperties3.default)(_ref3, ['loading', 'loadingProps', 'noData', 'type', 'width', 'errorMessage']);
 
-  if (loading) return _react2.default.createElement(_dotstatsuiteVisions.Loading, (0, _extends3.default)({ message: loading }, loadingProps));
-  if (!width) return _react2.default.createElement(_dotstatsuiteVisions.Loading, (0, _extends3.default)({ message: loading }, loadingProps));
+  var theme = (0, _styles.useTheme)();
+  if (loading) return _react2.default.createElement(_dotstatsuiteVisions.NoData, {
+    message: loading,
+    icon: _react2.default.createElement(_HourglassEmpty2.default, { style: { fontSize: 50, color: loadingProps.isWarning ? theme.palette.warning.main : theme.palette.primary.main } })
+  });
+  if (!width) return _react2.default.createElement(_dotstatsuiteVisions.NoData, {
+    message: loading,
+    icon: _react2.default.createElement(_HourglassEmpty2.default, { style: { fontSize: 50, color: loadingProps.isWarning ? theme.palette.warning.main : theme.palette.primary.main } })
+  });
   if (errorMessage) return _react2.default.createElement(_dotstatsuiteVisions.NoData, { message: errorMessage });
 
   if (type === 'table') {

package/package.json

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

package/src/rules/src/v8-transformer.js

@@ -128,7 +128,7 @@ export const dataTransformer = (dataNew, options = {}) => {
       return ({
         ...attr,
         display: !R.has(attr.id, hiddenIds) && !getIsHidden(attrAnnotations),
-        name: getRefinedName(observation),
+        name: getRefinedName(attr),
         values: getValues(attr.values || [], attr.id)
       });
     },

package/src/rules2/src/hierarchiseDimensionWithAdvancedHierarchy.js

@@ -1,50 +1,64 @@
 import * as R from 'ramda';
 
-export const refinePartialHierarchy = (hier, indexed) => R.pipe(
-  R.keys,
+const uniq = R.pipe(
   R.reduce(
-    (acc, key) => {
-      const ids = R.prop(key, hier);
-      if (key === '#ROOT') {
-        return R.assoc(key, ids, acc);
+    ({ ids, list }, id) => {
+      if (R.has(id, list)) {
+        return ({ ids, list });
       }
-      const refinedKey = R.pipe(
-        R.split('.'),
-        R.takeLastWhile(id => R.has(id, indexed)),
-        R.join('.')
-      )(key);
-      if (R.isEmpty(refinedKey)) {
-        return R.over(R.lensProp('#ROOT0'), R.ifElse(R.isNil, R.always([ids]), R.append(ids)))(acc)
-      }
-      return R.over(R.lensProp(refinedKey), R.ifElse(R.isNil, R.always([ids]), R.append(ids)))(acc);
+      return ({ ids: R.append(id, ids), list: R.assoc(id, id, list) });
     },
-    {}
+    { ids: [], list: {} }
   ),
-  (res) => {
-    const roots = R.pipe(
-      R.propOr([], '#ROOT0'),
-      R.unnest,
-      R.sortBy(id => R.path([id, '__indexPosition'], indexed))
-    )(res);
-    return R.pipe(
-      R.over(R.lensProp('#ROOT'), ids => [R.concat(roots, ids)]),
-      R.dissoc('#ROOT0')
-    )(res);
-  },
-  R.mapObjIndexed(
-    (ids) => {
-      if (R.length(ids) > 1) {
-        return null;
-      }
-      return R.head(ids);
-    }
-  )
-)(hier);
+  R.prop('ids')
+);
+
+export const refinePartialHierarchy = (hier, indexed) => {
+  const { intact, broken } = R.pipe(
+    R.keys,
+    R.reduce(
+      ({ intact, broken }, key) => {
+        const ids = R.filter(id => R.has(id, indexed), hier[key]);
+        if (key === '#ROOT') {
+          return ({ broken, intact: R.assoc(key, ids, intact) });
+        }
+        const splitKey = R.split('.', key);
+        const filtered = R.takeLastWhile(id => R.has(id, indexed), splitKey);
+        if (R.length(filtered) === R.length(splitKey)) {
+          return ({ broken, intact: R.assoc(key, ids, intact) });
+        }
+        const refinedKey = R.isEmpty(filtered) ? '#ROOT' : R.join('.', filtered);
+        return ({
+          intact,
+          broken: R.over(R.lensProp(refinedKey), R.ifElse(R.isNil, R.always([ids]), R.append(ids)))(broken)
+        });
+      },
+      { intact: {}, broken: {} }
+    )
+  )(hier);
+  const intactIds = R.pipe(R.values, R.unnest)(intact);
+  const refinedBroken = R.pipe(
+    R.omit(intactIds),
+    R.over(
+      R.lensProp('#ROOT'),
+      R.pipe(
+        i => R.isNil(i) ? [] : i,
+        R.unnest,
+        R.reject(R.flip(R.includes)(intactIds)))
+      ),
+    R.map(R.pipe(R.unnest, uniq))
+  )(broken);
+
+  return ({
+    ...refinedBroken,
+    ...intact,
+    '#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);
-  
 
   let rest = indexed;
   const getChildren = (parents, hier) => R.pipe(

package/src/viewer/src/index.js

@@ -3,8 +3,9 @@ import * as R from 'ramda';
 import cx from 'classnames';
 import { compose, withState, withProps } from 'recompose';
 import sizeMe from 'react-sizeme';
-import { Loading, NoData, TableHtml5 } from '@sis-cc/dotstatsuite-visions';
+import { NoData as IconMessage, TableHtml5 } from '@sis-cc/dotstatsuite-visions';
 import { useTheme, makeStyles } from '@material-ui/core/styles';
+import HourglassEmptyIcon from '@material-ui/icons/HourglassEmpty';
 import getChartOptions from './chartUtils/options';
 import Header from './header';
 import Chart from './chart';
@@ -34,14 +35,21 @@ const useStyles = makeStyles(() => ({
 }));
 
 const ViewContent = ({ loading, loadingProps={}, noData = 'No Data', type, width, errorMessage, ...rest }) => {
-  if (loading) return <Loading message={loading} {...loadingProps} />;
-  if (!width) return <Loading message={loading} {...loadingProps} />;
-  if (errorMessage) return <NoData message={errorMessage} />;
+  const theme = useTheme();
+  if (loading) return <IconMessage
+    message={loading}
+    icon={<HourglassEmptyIcon style={{ fontSize: 50, color: loadingProps.isWarning ? theme.palette.warning.main : theme.palette.primary.main }} />}
+  />;
+  if (!width) return <IconMessage
+    message={loading}
+    icon={<HourglassEmptyIcon style={{ fontSize: 50, color: loadingProps.isWarning ? theme.palette.warning.main : theme.palette.primary.main }} />}
+  />;
+  if (errorMessage) return <IconMessage message={errorMessage} />;
 
   if (type === 'table') {
     const tableProps = R.propOr({}, 'tableProps', rest);
     const hasNoObs = R.pipe(R.prop('cells'), R.anyPass([R.isNil, R.isEmpty]))(tableProps);
-    if (hasNoObs) return <NoData message={noData} />;
+    if (hasNoObs) return <IconMessage message={noData} />;
 
     return <TableHtml5 isRtl={R.prop('isRtl', rest)} {...tableProps} />;
   }

package/test/hierarchiseDimensionWithAdvancedHierarchy.test.js

@@ -71,8 +71,8 @@ describe('hierarchiseDimensionWithAdvancedHierarchy tests', () => {
       id: 'test',
       values: [
         { id: 'AFK', parent: undefined, parents: [], __indexPosition: 3 },
-        { id: 'CAN', parent: undefined, parents: [], __indexPosition: 1 },
         { id: 'USA', parent: undefined, parents: [], __indexPosition: 2 },
+        { id: 'CAN', parent: undefined, parents: [], __indexPosition: 1 },
         { id: 'W', parent: undefined, parents: [], __indexPosition: 8 },
         { id: 'EA', parent: 'W', parents: ['W'], __indexPosition: 6 },
         { id: 'FRA', parent: 'EA', parents: ['W', 'EA'], __indexPosition: 5 },
@@ -131,4 +131,64 @@ describe('hierarchiseDimensionWithAdvancedHierarchy tests', () => {
 
     expect(hierarchiseDimensionWithAdvancedHierarchy(dimension, hierarchy)).to.deep.equal(expected);
   });
+  it('non duplicates case 1', () => {
+    const hierarchy = {
+      '#ROOT': ['ONU', 'OECD'],
+      'OECD': ['FRA', 'USA'],
+      'ONU': ['USA', 'FRA'],
+    };
+
+    const dimension = {
+      id: 'REF_AREA',
+      values: [
+        { id: 'FRA' },
+        { id: 'USA' }
+      ]
+    };
+
+    const expected = {
+      id: 'REF_AREA',
+      values: [
+        { id: 'FRA', parents: [], parent: undefined },
+        { id: 'USA', parents: [], parent: undefined }
+      ]
+    };
+
+    expect(hierarchiseDimensionWithAdvancedHierarchy(dimension, hierarchy)).to.deep.equal(expected);
+  });
+  it('non duplicates case 2', () => {
+    const hierarchy = {
+      '#ROOT': ['ONU', 'OECD'],
+      'ONU': ['USA', 'FRA'],
+      'OECD': ['FRA', 'USA'],
+      'ONU.USA': ['NY', 'LA'],
+      'ONU.FRA': ['PA', 'LY']
+    };
+
+    const dimension = {
+      id: 'REF_AREA',
+      values: [
+        { id: 'OECD' },
+        { id: 'FRA' },
+        { id: 'PA' },
+        { id: 'LY' },
+        { id: 'USA' },
+        { id: 'NY' },
+        { id: 'LA' },
+      ]
+    };
+
+    const expected = {
+      id: 'REF_AREA',
+      values: [
+        { id: 'OECD', parents: [], parent: undefined },
+        { id: 'FRA', parents: ['OECD'], parent: 'OECD' },
+        { id: 'PA', parents: ['OECD.FRA'], parent: 'FRA' },
+        { id: 'LY', parents: ['OECD.FRA'], parent: 'FRA' },
+        { id: 'USA', parents: ['OECD'], parent: 'OECD' },
+        { id: 'NY', parents: ['OECD.USA'], parent: 'USA' },
+        { id: 'LA', parents: ['OECD.USA'], parent: 'USA' },
+      ]
+    };
+  });
 });