@sis-cc/dotstatsuite-visions 10.5.2 → 10.6.1

package/lib/VirtualizedTree/Item.js

@@ -64,6 +64,7 @@ var Item = function Item(_ref) {
       description = _ref$description === undefined ? '' : _ref$description,
       isSelected = _ref.isSelected,
       isDisabled = _ref.isDisabled,
+      isGreyed = _ref.isGreyed,
       changeList = _ref.changeList,
       ariaLabel = _ref.ariaLabel,
       NavigateIcon = _ref.NavigateIcon,
@@ -71,7 +72,6 @@ var Item = function Item(_ref) {
       hasChildrenOnLevel = _ref.hasChildrenOnLevel,
       count = _ref.count,
       svgPath = _ref.svgPath,
-      testId = _ref.testId,
       style = _ref.style,
       isRtl = _ref.isRtl,
       accessibility = _ref.accessibility,
@@ -117,6 +117,7 @@ var Item = function Item(_ref) {
       _react2.default.createElement(NavigateIcon, null)
     ),
     _react2.default.createElement(_ListItemText2.default, _extends({
+      'data-testid': 'value_' + id,
       tabIndex: 0,
       'aria-label': isDisabled ? R.propOr('', 'disableItemLabel')(labels) + ' ' + label : label,
       'aria-pressed': isSelected,
@@ -143,13 +144,13 @@ var Item = function Item(_ref) {
             color: 'primary',
             className: (0, _classnames2.default)(classes.labelIcon, (_cx3 = {}, _cx3[classes.disabledLabel] = isDisabled, _cx3))
           },
-          isSelected && R.not(isDisabled) ? _react2.default.createElement(_CheckBoxOutlined2.default, null) : _react2.default.createElement(_CheckBoxOutlineBlankOutlined2.default, null)
+          isSelected ? _react2.default.createElement(_CheckBoxOutlined2.default, null) : _react2.default.createElement(_CheckBoxOutlineBlankOutlined2.default, null)
         ),
         svgPath && _react2.default.createElement(
           _SvgIcon2.default,
           {
             color: 'primary',
-            className: (0, _classnames2.default)(classes.labelIcon, (_cx4 = {}, _cx4[classes.disabledLabel] = isDisabled, _cx4))
+            className: (0, _classnames2.default)(classes.labelIcon, (_cx4 = {}, _cx4[classes.disabledLabel] = isGreyed || isDisabled, _cx4))
           },
           _react2.default.createElement('path', { d: svgPath })
         ),
@@ -176,10 +177,9 @@ var Item = function Item(_ref) {
           _react2.default.createElement(
             _Typography2.default,
             {
-              'data-testid': testId + '_value_' + id,
               color: 'inherit',
               variant: 'body2',
-              className: (0, _classnames2.default)(classes.label, (_cx5 = {}, _cx5[classes.disabledLabel] = isDisabled, _cx5[classes.tooltipNotice] = !R.isEmpty(description), _cx5))
+              className: (0, _classnames2.default)(classes.label, (_cx5 = {}, _cx5[classes.disabledLabel] = isGreyed || isDisabled, _cx5[classes.tooltipNotice] = !R.isEmpty(description), _cx5))
             },
             label
           )
@@ -215,7 +215,6 @@ Item.propTypes = process.env.NODE_ENV !== "production" ? {
   svgPath: _propTypes2.default.string,
   style: _propTypes2.default.object,
   isRtl: _propTypes2.default.bool,
-  testId: _propTypes2.default.string,
   accessibility: _propTypes2.default.bool,
   index: _propTypes2.default.number,
   labelRenderer: _propTypes2.default.func,
@@ -223,7 +222,8 @@ Item.propTypes = process.env.NODE_ENV !== "production" ? {
   hierarchicalId: _propTypes2.default.string,
   labels: _propTypes2.default.object,
   depth: _propTypes2.default.number,
-  eventsCallbacks: _propTypes2.default.func
+  eventsCallbacks: _propTypes2.default.func,
+  isGreyed: _propTypes2.default.bool
 } : {};
 
 exports.default = Item;

package/lib/VirtualizedTree/VirtualizedTree.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.getDepth = exports.getHasChildrenOnLevel = exports.getDisplayedIds = exports.getHierarchicalId = undefined;
+exports.getHasChildrenOnLevel = exports.getDisplayedIds = undefined;
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
@@ -45,23 +45,23 @@ var _core = require('@material-ui/core');
 
 var _styles = require('../ScopeList/styles');
 
-var _utils = require('../utils');
+var _utils = require('./utils');
+
+var _utils2 = 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 }; }
 
-var getSingleItemScope = function getSingleItemScope(item) {
-  return [item];
-};
-
-var getHierarchicalId = exports.getHierarchicalId = function getHierarchicalId(item) {
-  return R.prop('hierarchicalId', item) || R.prop('id', item);
+var singleScopeGetter = function singleScopeGetter() {
+  return function (item) {
+    return [item];
+  };
 };
 
 var getDisplayedIds = exports.getDisplayedIds = function getDisplayedIds(items, grouped, expanded) {
   return R.pipe(R.map(function (item) {
-    var hierarchicalId = getHierarchicalId(item);
+    var hierarchicalId = (0, _utils.getHierarchicalId)(item);
     if (R.has(hierarchicalId, grouped) && R.has(hierarchicalId, expanded)) {
       var children = getDisplayedIds(R.prop(hierarchicalId, grouped), grouped, expanded);
       return R.prepend(hierarchicalId, children);
@@ -72,29 +72,22 @@ var getDisplayedIds = exports.getDisplayedIds = function getDisplayedIds(items,
 
 var getHasChildrenOnLevel = exports.getHasChildrenOnLevel = function getHasChildrenOnLevel(groupedItems) {
   return function (item) {
-    if (R.has(getHierarchicalId(item), groupedItems)) {
+    if (R.has((0, _utils.getHierarchicalId)(item), groupedItems)) {
       return true;
     }
     return R.pipe(R.prop(R.propOr('#ROOT', 'parentId', item)), R.find(function (it) {
-      return R.has(getHierarchicalId(it), groupedItems);
+      return R.has((0, _utils.getHierarchicalId)(it), groupedItems);
     }), R.complement(R.isNil))(groupedItems);
   };
 };
 
-var getDepth = exports.getDepth = function getDepth(indexedItems) {
-  return function (item) {
-    if (R.isNil(item.parentId)) {
-      return 0;
-    }
-    var parent = R.prop(item.parentId, indexedItems);
-    return getDepth(indexedItems)(parent) + 1;
-  };
-};
-
 var VirtualizedTree = function VirtualizedTree(props) {
   var accessibility = props.accessibility,
       changeSelection = props.changeSelection,
-      disableAccessor = props.disableAccessor,
+      _props$disableAccesso = props.disableAccessor,
+      disableAccessor = _props$disableAccesso === undefined ? R.always(false) : _props$disableAccesso,
+      _props$isGreyed = props.isGreyed,
+      isGreyed = _props$isGreyed === undefined ? R.always(false) : _props$isGreyed,
       HTMLRenderer = props.HTMLRenderer,
       items = props.items,
       labelRenderer = props.labelRenderer,
@@ -104,8 +97,8 @@ var VirtualizedTree = function VirtualizedTree(props) {
       collapse = props.collapse,
       _props$maxTreeHeight = props.maxTreeHeight,
       maxTreeHeight = _props$maxTreeHeight === undefined ? 250 : _props$maxTreeHeight,
-      _props$getItemScope = props.getItemScope,
-      getItemScope = _props$getItemScope === undefined ? getSingleItemScope : _props$getItemScope,
+      _props$scopeGetter = props.scopeGetter,
+      scopeGetter = _props$scopeGetter === undefined ? singleScopeGetter : _props$scopeGetter,
       _props$treeHeight = props.treeHeight,
       treeHeight = _props$treeHeight === undefined ? 0 : _props$treeHeight;
 
@@ -132,21 +125,41 @@ var VirtualizedTree = function VirtualizedTree(props) {
       setLastItemId = _useState5[1];
 
   var _useMemo = (0, _react.useMemo)(function () {
-    var indexedItemsById = R.indexBy(getHierarchicalId, items);
-    var groupedItemsByParentId = R.groupBy(R.propOr('#ROOT', 'parentId'), items);
+    var refinedItems = R.map(function (item) {
+      return _extends({}, item, {
+        isSelected: (0, _utils.isItemSelected)(selectIds)(item),
+        isGreyed: R.is(Function, isGreyed) ? isGreyed(item) : false,
+        isDisabled: R.is(Function, disableAccessor) ? disableAccessor(item, selectIds) : false
+      });
+    }, items);
+    var indexedItemsById = R.indexBy(_utils.getHierarchicalId, refinedItems);
+    var groupedItemsByParentId = R.groupBy(R.propOr('#ROOT', 'parentId'), refinedItems);
     return { indexedItemsById: indexedItemsById, groupedItemsByParentId: groupedItemsByParentId };
-  }, [items]),
+  }, [items, selectIds]),
       indexedItemsById = _useMemo.indexedItemsById,
       groupedItemsByParentId = _useMemo.groupedItemsByParentId;
 
   var list = (0, _react.useMemo)(function () {
     return getDisplayedIds(R.propOr([], '#ROOT', groupedItemsByParentId), groupedItemsByParentId, expandedIds);
   }, [items, expandedIds]);
+
+  var getItemScope = scopeGetter({ indexedItemsById: indexedItemsById, groupedItemsByParentId: groupedItemsByParentId });
+
+  var isItemSelected = (0, _utils.isItemSelected)(selectIds);
+
   var multiSelect = function multiSelect(id) {
     var item = R.prop(id, indexedItemsById);
     var ids = R.pipe(getItemScope, R.filter(function (v) {
       return v.isSelected === item.isSelected;
-    }), R.map(getHierarchicalId))(item);
+    }), function (items) {
+      return (0, _utils.getDuplicates)(items, indexedItemsById);
+    }, R.map(_utils.getHierarchicalId))(item);
+
+    if (isItemSelected(item)) {
+      var deprecatedIds = (0, _utils.getDeprecatedIds)(ids, { indexedItemsById: indexedItemsById, groupedItemsByParentId: groupedItemsByParentId }, selectIds);
+      ids = R.concat(ids, deprecatedIds);
+    }
+
     if (R.has(id, selectIds)) {
       setSelectIds(R.omit(ids, selectIds));
     } else {
@@ -160,7 +173,7 @@ var VirtualizedTree = function VirtualizedTree(props) {
         return R.props(ids, indexedItemsById);
       }, R.map(getItemScope), R.unnest, R.filter(function (v) {
         return v.isSelected === isSelected;
-      }), R.map(getHierarchicalId), R.indexBy(R.identity))(list);
+      }), R.map(_utils.getHierarchicalId), R.indexBy(R.identity))(list);
       setShiftIndexes(indexes);
       setSelectIds(_selectIds);
     };
@@ -180,7 +193,7 @@ var VirtualizedTree = function VirtualizedTree(props) {
       }
       var ids = R.pipe(getItemScope, R.filter(function (v) {
         return v.isSelected === item.isSelected;
-      }), R.map(getHierarchicalId), R.indexBy(R.identity))(item);
+      }), R.map(_utils.getHierarchicalId), R.indexBy(R.identity))(item);
       setShiftIndexes(R.append(index, shiftIndexes));
       setSelectIds(ids);
     } else if (R.length(shiftIndexes) === 1 && index === R.head(shiftIndexes)) {
@@ -250,12 +263,6 @@ var VirtualizedTree = function VirtualizedTree(props) {
       apply();
     }
   };
-  var isItemSelected = function isItemSelected(item) {
-    if (!R.isEmpty(selectIds) && R.has(getHierarchicalId(item), selectIds)) {
-      return !item.isSelected;
-    }
-    return !!item.isSelected;
-  };
   var ref = (0, _react.useRef)();
   var classes = (0, _styles.useStyles)();
 
@@ -292,7 +299,7 @@ var VirtualizedTree = function VirtualizedTree(props) {
   if (R.isEmpty(list)) {
     return null;
   }
-  var isRtl = (0, _utils.getIsRtl)(theme);
+  var isRtl = (0, _utils2.getIsRtl)(theme);
   return _react2.default.createElement(
     _List4.default,
     {
@@ -323,22 +330,20 @@ var VirtualizedTree = function VirtualizedTree(props) {
             var itemId = R.nth(index, list);
             var item = R.prop(itemId, indexedItemsById);
             return _react2.default.createElement(_Item2.default, _extends({}, item, {
-              id: getHierarchicalId(item),
+              id: (0, _utils.getHierarchicalId)(item),
               label: labelRenderer(item),
-              key: getHierarchicalId(item),
-              depth: getDepth(indexedItemsById)(item),
+              key: (0, _utils.getHierarchicalId)(item),
+              depth: (0, _utils.getDepth)(indexedItemsById)(item),
               hasChild: R.has(itemId, groupedItemsByParentId),
               hasChildrenOnLevel: getHasChildrenOnLevel(groupedItemsByParentId)(item),
               changeList: R.has(itemId, expandedIds) ? function () {
-                return collapse(getHierarchicalId(item));
+                return collapse((0, _utils.getHierarchicalId)(item));
               } : function () {
-                return expand(getHierarchicalId(item));
+                return expand((0, _utils.getHierarchicalId)(item));
               },
               NavigateIcon: R.has(itemId, expandedIds) ? _ExpandLess2.default : _ExpandMore2.default,
               isRtl: isRtl,
-              isDisabled: R.is(Function, disableAccessor) ? disableAccessor(item) : false,
               eventsCallbacks: eventsCallbacks,
-              isSelected: isItemSelected(item),
               HTMLRenderer: HTMLRenderer,
               classes: classes,
               labels: labels,
@@ -364,9 +369,7 @@ VirtualizedTree.propTypes = process.env.NODE_ENV !== "production" ? {
   isRtl: _propTypes2.default.bool,
   items: _propTypes2.default.array,
   labels: _propTypes2.default.shape({
-    disableItemLabel: _propTypes2.default.string,
-    colapseAll: _propTypes2.default.string,
-    expandAll: _propTypes2.default.string
+    disableItemLabel: _propTypes2.default.string
   }),
   labelRenderer: _propTypes2.default.func,
   withExpandControl: _propTypes2.default.bool,
@@ -374,7 +377,9 @@ VirtualizedTree.propTypes = process.env.NODE_ENV !== "production" ? {
   expandedIds: _propTypes2.default.object,
   expand: _propTypes2.default.func,
   collapse: _propTypes2.default.func,
-  treeHeight: _propTypes2.default.number
+  treeHeight: _propTypes2.default.number,
+  isGreyed: _propTypes2.default.func,
+  scopeGetter: _propTypes2.default.func
 } : {};
 
 exports.default = VirtualizedTree;

package/lib/VirtualizedTree/utils.js

@@ -0,0 +1,159 @@
+'use strict';
+
+exports.__esModule = true;
+exports.getScopeGetters = exports.getHierDisableAccessor = exports.getSingleDisableAccessor = exports.getDeprecatedIds = exports.getDuplicates = exports.getDepth = exports.isItemSelected = exports.getDescendants = exports.getHierarchicalId = 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 getHierarchicalId = exports.getHierarchicalId = function getHierarchicalId(item) {
+  return R.prop('hierarchicalId', item) || R.prop('id', item);
+};
+
+var getDescendants = exports.getDescendants = function getDescendants(id, groupedItems) {
+  var reccurse = function reccurse(_id) {
+    var children = R.propOr([], _id, groupedItems);
+    return R.pipe(R.map(function (item) {
+      var __id = getHierarchicalId(item);
+      var descendants = reccurse(__id);
+      return R.prepend(item, descendants);
+    }), R.unnest)(children);
+  };
+
+  return reccurse(id);
+};
+
+var isItemSelected = exports.isItemSelected = function isItemSelected(selectIds) {
+  return function (item) {
+    if (!R.isEmpty(selectIds) && R.has(getHierarchicalId(item), selectIds)) {
+      return !item.isSelected;
+    }
+    return !!item.isSelected;
+  };
+};
+
+var getDepth = exports.getDepth = function getDepth(indexedItems) {
+  return function (item) {
+    if (R.isNil(item.parentId)) {
+      return 0;
+    }
+    var parent = R.prop(item.parentId, indexedItems);
+    return getDepth(indexedItems)(parent) + 1;
+  };
+};
+
+var getDuplicates = exports.getDuplicates = function getDuplicates(items, indexedItems) {
+  var itemsIds = R.pluck('id', items);
+  var grouped = R.pipe(R.values, R.groupBy(R.prop('id')))(indexedItems);
+  return R.pipe(R.props(itemsIds), R.unnest)(grouped);
+};
+
+var getDeprecatedIds = exports.getDeprecatedIds = function getDeprecatedIds(ids, items, selectedIds) {
+  var groupedItemsByParentId = items.groupedItemsByParentId,
+      indexedItemsById = items.indexedItemsById;
+
+  var _ids = ids;
+  var reccurse = function reccurse(scopeIds) {
+    var scopeItems = R.props(scopeIds, indexedItemsById);
+    var grouped = R.groupBy(R.propOr('#ROOT', 'parentId'), scopeItems);
+    var refined = R.omit(R.append('#ROOT', _ids), grouped);
+
+    var deprecatedParents = R.reduce(function (acc, id) {
+      var _item = R.prop(id, indexedItemsById);
+      if (!isItemSelected(selectedIds)(_item)) {
+        return acc;
+      }
+      var _itemsIds = R.has('hierarchicalId', _item) ? R.pipe(R.values, R.filter(R.propEq('id', _item.id)), R.map(getHierarchicalId))(indexedItemsById) : [id];
+
+      if (R.propOr(true, 'isEnabled', _item)) {
+        return acc;
+      }
+      var children = R.pipe(R.props(_itemsIds), R.unnest)(groupedItemsByParentId);
+      var selectedChild = R.find(function (child) {
+        return !R.includes(getHierarchicalId(child), _ids) && isItemSelected(selectedIds)(child);
+      }, children);
+      if (R.isNil(selectedChild)) {
+        return R.concat(acc, _itemsIds);
+      }
+      return acc;
+    }, [], R.keys(refined));
+
+    if (!R.isEmpty(deprecatedParents)) {
+      _ids = R.concat(_ids, deprecatedParents);
+      var deprecatedAncestors = reccurse(deprecatedParents);
+      return R.concat(deprecatedParents, deprecatedAncestors);
+    }
+
+    return deprecatedParents;
+  };
+
+  return reccurse(ids);
+};
+
+var getSingleDisableAccessor = exports.getSingleDisableAccessor = function getSingleDisableAccessor(groupedItems, disableAccessor) {
+  // items => total list
+  return function (item, selectedIds) {
+    if (!isItemSelected(selectedIds)(item) && disableAccessor(item)) {
+      var descendants = getDescendants(getHierarchicalId(item), groupedItems);
+      var validDescendant = R.find(isItemSelected(selectedIds), descendants);
+      return R.isNil(validDescendant);
+    }
+    return false;
+  };
+};
+
+var getHierDisableAccessor = exports.getHierDisableAccessor = function getHierDisableAccessor(groupedItems, spotlightedGroupedItems, disableAccessor) {
+  var accessor = function accessor(item, selectedIds) {
+    if (!isItemSelected(selectedIds)(item) && disableAccessor(item)) {
+      var spotlightedDescendants = getDescendants(getHierarchicalId(item), spotlightedGroupedItems);
+      var validSpotlightedDescendant = R.find(function (_item) {
+        return !accessor(_item, spotlightedGroupedItems);
+      }, spotlightedDescendants);
+      if (R.isNil(validSpotlightedDescendant)) {
+        var descendants = getDescendants(getHierarchicalId(item), groupedItems);
+        var validDescendant = R.find(isItemSelected(selectedIds), descendants);
+        return R.isNil(validDescendant);
+      }
+    }
+    return false;
+  };
+  return accessor;
+};
+
+var getScopeGetters = exports.getScopeGetters = {
+  all: function all(items) {
+    return function () {
+      return R.reject(R.prop('isDisabled'), R.values(items.indexedItemsById));
+    };
+  },
+  single: function single() {
+    return function (item) {
+      return [item];
+    };
+  },
+  children: function children(items) {
+    return function (item) {
+      var childItems = R.propOr([], getHierarchicalId(item), items.groupedItemsByParentId);
+      return R.reject(R.prop('isDisabled'), R.prepend(item, childItems));
+    };
+  },
+  branch: function branch(items) {
+    return function (item) {
+      var descendants = getDescendants(getHierarchicalId(item), items.groupedItemsByParentId);
+      var res = R.reject(R.prop('isDisabled'), R.prepend(item, descendants));
+      return res;
+    };
+  },
+  level: function level(items) {
+    return function (item) {
+      var indexed = items.indexedItemsById;
+      var depth = getDepth(indexed)(item);
+      return R.filter(function (it) {
+        return !R.prop('isDisabled', it) && getDepth(indexed)(it) === depth;
+      }, R.values(indexed));
+    };
+  }
+};

package/lib/VirtualizedTree/withExpansionTree.js

@@ -13,7 +13,7 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
-var _VirtualizedTree = require('./VirtualizedTree');
+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; } }
 
@@ -37,7 +37,7 @@ var withExpansionTree = function withExpansionTree(Component) {
         setItemsIds = _useState2[1];
 
     (0, _react.useEffect)(function () {
-      var ids = R.map(_VirtualizedTree.getHierarchicalId, items);
+      var ids = R.map(_utils.getHierarchicalId, items);
       if (!R.isEmpty(R.symmetricDifference(ids, itemsIds))) setItemsIds(ids);
     }, [items]);
 

package/lib/VirtualizedTree/withSpotlight.js

@@ -13,7 +13,7 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _VirtualizedTree = require('./VirtualizedTree');
+var _utils = require('./utils');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -35,8 +35,8 @@ var spotlightFilter = exports.spotlightFilter = function spotlightFilter(term) {
       if (isValidItem) {
         return true;
       }
-      if (R.has((0, _VirtualizedTree.getHierarchicalId)(item), groupedItemsByParentId)) {
-        var filtered = recurse(R.prop((0, _VirtualizedTree.getHierarchicalId)(item), groupedItemsByParentId));
+      if (R.has((0, _utils.getHierarchicalId)(item), groupedItemsByParentId)) {
+        var filtered = recurse(R.prop((0, _utils.getHierarchicalId)(item), groupedItemsByParentId));
         if (!R.isEmpty(filtered)) {
           return true;
         }
@@ -70,6 +70,7 @@ var withSpotlight = function withSpotlight(Component) {
     }, [term, items]);
 
     return _react2.default.createElement(Component, _extends({}, rest, {
+      allItems: items,
       items: filteredItems,
       labelRenderer: labelRenderer,
       hasSpotlight: R.length(items) >= 8,

package/package.json

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