@sis-cc/dotstatsuite-visions 8.0.8 → 8.0.9

package/es/TableHtml5/TableHtml5.js

@@ -9,6 +9,7 @@ import Header from './header';
 import SubHeader from './subHeader';
 import Section from './section';
 import Cell from './cell';
+import { defaultLabelAccessor } from './utils';
 
 /*
  *  Accessibility.
@@ -74,7 +75,7 @@ var TableHtml5 = function TableHtml5(_ref) {
       testId = _ref$testId === undefined ? 'vis-table' : _ref$testId,
       HTMLRenderer = _ref.HTMLRenderer,
       _ref$labelAccessor = _ref.labelAccessor,
-      labelAccessor = _ref$labelAccessor === undefined ? R.prop('name') : _ref$labelAccessor;
+      labelAccessor = _ref$labelAccessor === undefined ? defaultLabelAccessor : _ref$labelAccessor;
 
   var classes = useStyles();
 

package/es/TableHtml5/header.js

@@ -94,7 +94,12 @@ var Header = function Header(_ref) {
             Typography,
             { variant: 'body1', className: classes.cellLabelHeader },
             R.pipe(R.path([0, 'data', index, 'dimension']), labelAccessor)(headerData),
-            React.createElement(Flags, { HTMLRenderer: HTMLRenderer, flags: flags, isHeader: true, labelAccessor: labelAccessor })
+            React.createElement(Flags, {
+              HTMLRenderer: HTMLRenderer,
+              flags: flags,
+              isHeader: true,
+              labelAccessor: labelAccessor
+            })
           )
         )
       ),
@@ -138,7 +143,12 @@ var Header = function Header(_ref) {
                 variant: 'body1'
               },
               R.prop('label', value),
-              React.createElement(Flags, { HTMLRenderer: HTMLRenderer, flags: flags, isHeader: true, labelAccessor: labelAccessor })
+              React.createElement(Flags, {
+                HTMLRenderer: HTMLRenderer,
+                flags: flags,
+                isHeader: true,
+                labelAccessor: labelAccessor
+              })
             )
           )
         );

package/es/TableHtml5/subHeader.js

@@ -108,7 +108,11 @@ var SubHeader = React.forwardRef(function (_ref, refs) {
           className: cx(classes.fillerCell, (_cx = {}, _cx[classes.highlight] = R.prop(index)(activeCellIds), _cx))
         },
         !R.isNil(SideIcon) && React.createElement(SideIcon, { sideProps: R.prop('sideProps', item) }),
-        React.createElement(Flags, { flags: R.prop('flags', item), labelAccessor: labelAccessor, HTMLRenderer: HTMLRenderer })
+        React.createElement(Flags, {
+          flags: R.prop('flags', item),
+          labelAccessor: labelAccessor,
+          HTMLRenderer: HTMLRenderer
+        })
       );
     }, headerData)
   );

package/es/TableHtml5/utils.js

@@ -1,22 +1,23 @@
 import * as R from 'ramda';
 
-var getLabel = function getLabel(labelAccessor) {
-  return function (value) {
-    return R.pipe(R.propOr([], 'missingParents'), R.map(labelAccessor), R.append(labelAccessor(value)), R.join(' > '))(value);
-  };
-};
-
 export var getValue = function getValue(labelAccessor) {
   return function (item) {
     return R.has('values', item) ? R.reduce(function (acc, val) {
       return {
+        label: acc.label,
         id: R.isEmpty(acc.id) ? val.id : acc.id + ', ' + val.id,
-        label: R.isEmpty(acc.label) ? getLabel(labelAccessor)(val) : acc.label + ', ' + getLabel(labelAccessor)(val),
         flags: R.concat(acc.flags, val.flags || []),
         parents: R.concat(acc.parents, val.parents || [])
       };
-    }, { id: '', label: '', flags: [], parents: [] }, R.prop('values', item)) : R.pipe(R.prop('value'), function (val) {
-      return R.assoc('label', getLabel(labelAccessor)(val), val);
+    }, { id: '', flags: [], parents: [], label: labelAccessor(item.values) }, item.values) : R.pipe(R.prop('value'), function (val) {
+      return R.assoc('label', labelAccessor(val), val);
     })(item);
   };
+};
+
+export var defaultLabelAccessor = function defaultLabelAccessor(item) {
+  if (R.is(Object, item)) {
+    return R.prop('name', item);
+  }
+  return R.pipe(R.pluck('name'), R.join(', '))(item);
 };

package/lib/TableHtml5/TableHtml5.js

@@ -39,6 +39,8 @@ var _cell = require('./cell');
 
 var _cell2 = _interopRequireDefault(_cell);
 
+var _utils = require('./utils');
+
 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 }; }
@@ -107,7 +109,7 @@ var TableHtml5 = function TableHtml5(_ref) {
       testId = _ref$testId === undefined ? 'vis-table' : _ref$testId,
       HTMLRenderer = _ref.HTMLRenderer,
       _ref$labelAccessor = _ref.labelAccessor,
-      labelAccessor = _ref$labelAccessor === undefined ? R.prop('name') : _ref$labelAccessor;
+      labelAccessor = _ref$labelAccessor === undefined ? _utils.defaultLabelAccessor : _ref$labelAccessor;
 
   var classes = useStyles();
 

package/lib/TableHtml5/header.js

@@ -128,7 +128,12 @@ var Header = function Header(_ref) {
             _Typography2.default,
             { variant: 'body1', className: classes.cellLabelHeader },
             R.pipe(R.path([0, 'data', index, 'dimension']), labelAccessor)(headerData),
-            _react2.default.createElement(_flags2.default, { HTMLRenderer: HTMLRenderer, flags: flags, isHeader: true, labelAccessor: labelAccessor })
+            _react2.default.createElement(_flags2.default, {
+              HTMLRenderer: HTMLRenderer,
+              flags: flags,
+              isHeader: true,
+              labelAccessor: labelAccessor
+            })
           )
         )
       ),
@@ -172,7 +177,12 @@ var Header = function Header(_ref) {
                 variant: 'body1'
               },
               R.prop('label', value),
-              _react2.default.createElement(_flags2.default, { HTMLRenderer: HTMLRenderer, flags: flags, isHeader: true, labelAccessor: labelAccessor })
+              _react2.default.createElement(_flags2.default, {
+                HTMLRenderer: HTMLRenderer,
+                flags: flags,
+                isHeader: true,
+                labelAccessor: labelAccessor
+              })
             )
           )
         );

package/lib/TableHtml5/subHeader.js

@@ -141,7 +141,11 @@ var SubHeader = _react2.default.forwardRef(function (_ref, refs) {
           className: (0, _classnames2.default)(classes.fillerCell, (_cx = {}, _cx[classes.highlight] = R.prop(index)(activeCellIds), _cx))
         },
         !R.isNil(SideIcon) && _react2.default.createElement(SideIcon, { sideProps: R.prop('sideProps', item) }),
-        _react2.default.createElement(_flags2.default, { flags: R.prop('flags', item), labelAccessor: labelAccessor, HTMLRenderer: HTMLRenderer })
+        _react2.default.createElement(_flags2.default, {
+          flags: R.prop('flags', item),
+          labelAccessor: labelAccessor,
+          HTMLRenderer: HTMLRenderer
+        })
       );
     }, headerData)
   );

package/lib/TableHtml5/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.getValue = undefined;
+exports.defaultLabelAccessor = exports.getValue = undefined;
 
 var _ramda = require('ramda');
 
@@ -9,23 +9,24 @@ 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 getLabel = function getLabel(labelAccessor) {
-  return function (value) {
-    return R.pipe(R.propOr([], 'missingParents'), R.map(labelAccessor), R.append(labelAccessor(value)), R.join(' > '))(value);
-  };
-};
-
 var getValue = exports.getValue = function getValue(labelAccessor) {
   return function (item) {
     return R.has('values', item) ? R.reduce(function (acc, val) {
       return {
+        label: acc.label,
         id: R.isEmpty(acc.id) ? val.id : acc.id + ', ' + val.id,
-        label: R.isEmpty(acc.label) ? getLabel(labelAccessor)(val) : acc.label + ', ' + getLabel(labelAccessor)(val),
         flags: R.concat(acc.flags, val.flags || []),
         parents: R.concat(acc.parents, val.parents || [])
       };
-    }, { id: '', label: '', flags: [], parents: [] }, R.prop('values', item)) : R.pipe(R.prop('value'), function (val) {
-      return R.assoc('label', getLabel(labelAccessor)(val), val);
+    }, { id: '', flags: [], parents: [], label: labelAccessor(item.values) }, item.values) : R.pipe(R.prop('value'), function (val) {
+      return R.assoc('label', labelAccessor(val), val);
     })(item);
   };
+};
+
+var defaultLabelAccessor = exports.defaultLabelAccessor = function defaultLabelAccessor(item) {
+  if (R.is(Object, item)) {
+    return R.prop('name', item);
+  }
+  return R.pipe(R.pluck('name'), R.join(', '))(item);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "8.0.8",
+  "version": "8.0.9",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",