@sis-cc/dotstatsuite-visions 12.29.0 → 12.31.0

package/lib/UserRightForm/PermsissionsTabs.js

@@ -10,7 +10,25 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
-var _material = require('@mui/material');
+var _Box = require('@mui/material/Box');
+
+var _Box2 = _interopRequireDefault(_Box);
+
+var _Grid = require('@mui/material/Grid');
+
+var _Grid2 = _interopRequireDefault(_Grid);
+
+var _Tabs = require('@mui/material/Tabs');
+
+var _Tabs2 = _interopRequireDefault(_Tabs);
+
+var _Tab = require('@mui/material/Tab');
+
+var _Tab2 = _interopRequireDefault(_Tab);
+
+var _Typography = require('@mui/material/Typography');
+
+var _Typography2 = _interopRequireDefault(_Typography);
 
 var _makeStyles = require('@mui/styles/makeStyles');
 
@@ -80,10 +98,10 @@ var PermissionsTabs = function PermissionsTabs(_ref) {
   }, permissionGroupsData);
 
   return _react2.default.createElement(
-    _material.Grid,
+    _Grid2.default,
     null,
     _react2.default.createElement(
-      _material.Typography,
+      _Typography2.default,
       {
         variant: 'h6',
         className: classes.label,
@@ -92,21 +110,21 @@ var PermissionsTabs = function PermissionsTabs(_ref) {
       R.prop('title')(labels)
     ),
     _react2.default.createElement(
-      _material.Grid,
+      _Grid2.default,
       { className: classes.tabs },
       _react2.default.createElement(
-        _material.Tabs,
+        _Tabs2.default,
         {
           value: valueTabs,
           onChange: handleValueTabsChange,
           'aria-label': R.prop('title')(labels),
           className: classes.tab
         },
-        _react2.default.createElement(_material.Tab, { label: R.path(['permissions', 'label'], data) }),
-        _react2.default.createElement(_material.Tab, { label: R.path(['options', 'label'], data) })
+        _react2.default.createElement(_Tab2.default, { label: R.path(['permissions', 'label'], data) }),
+        _react2.default.createElement(_Tab2.default, { label: R.path(['options', 'label'], data) })
       ),
       _react2.default.createElement(
-        _material.Box,
+        _Box2.default,
         null,
         _react2.default.createElement(_Permissions2.default, {
           data: valueTabs === 0 ? evolvedPermissionGroupsData : permissionsData,

package/lib/UserRightForm/UserRightForm.js

@@ -16,7 +16,13 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
-var _material = require('@mui/material');
+var _Grid = require('@mui/material/Grid');
+
+var _Grid2 = _interopRequireDefault(_Grid);
+
+var _Typography = require('@mui/material/Typography');
+
+var _Typography2 = _interopRequireDefault(_Typography);
 
 var _makeStyles = require('@mui/styles/makeStyles');
 
@@ -189,24 +195,24 @@ var UserRightForm = function UserRightForm(_ref) {
   var isValid = isValidPermissions && isValidFields && (hasPermissionsSelectionChanged || hasFieldsChanged);
 
   return _react2.default.createElement(
-    _material.Grid,
+    _Grid2.default,
     { container: true, className: classes.paper, 'data-testid': 'permission-test-id' },
     _react2.default.createElement(
-      _material.Grid,
+      _Grid2.default,
       { item: true, container: true, xs: 12, md: 12, justifyContent: 'space-between' },
       _react2.default.createElement(
-        _material.Grid,
+        _Grid2.default,
         { item: true, container: true, xs: 12, sm: 12, md: 6, 'flex-direction': 'column' },
         _react2.default.createElement(
-          _material.Grid,
+          _Grid2.default,
           { item: true, container: true, xs: 12, alignItems: 'center' },
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 5, style: { marginTop: '4px' } },
             _react2.default.createElement(_.Mode, { modes: modes, mode: mode, changeMode: onChange, isSmall: true })
           ),
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 7 },
             _react2.default.createElement(_Input2.default, {
               variant: 'outlined',
@@ -223,19 +229,19 @@ var UserRightForm = function UserRightForm(_ref) {
           )
         ),
         _react2.default.createElement(
-          _material.Grid,
+          _Grid2.default,
           { item: true, container: true, xs: 12, alignItems: 'center' },
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 5 },
             _react2.default.createElement(
-              _material.Typography,
+              _Typography2.default,
               { variant: 'h6', className: classes.contentLabel, style: { paddingTop: 8 } },
               R.prop('dataspace')(labels)
             )
           ),
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 7 },
             _react2.default.createElement(_Select2.default, {
               value: R.defaultTo('*', dataspaceValue),
@@ -249,19 +255,19 @@ var UserRightForm = function UserRightForm(_ref) {
           )
         ),
         _react2.default.createElement(
-          _material.Grid,
+          _Grid2.default,
           { item: true, container: true, xs: 12, alignItems: 'center' },
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 5 },
             _react2.default.createElement(
-              _material.Typography,
+              _Typography2.default,
               { variant: 'h6', className: classes.contentLabel, style: { paddingTop: 8 } },
               R.prop('artefactType')(labels)
             )
           ),
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 7 },
             _react2.default.createElement(_Select2.default, {
               value: R.defaultTo('*', artefactTypeValue),
@@ -276,22 +282,22 @@ var UserRightForm = function UserRightForm(_ref) {
         )
       ),
       _react2.default.createElement(
-        _material.Grid,
+        _Grid2.default,
         { item: true, container: true, xs: 12, sm: 12, md: 5, 'flex-direction': 'column' },
         _react2.default.createElement(
-          _material.Grid,
+          _Grid2.default,
           { item: true, container: true, xs: 12, alignItems: 'center' },
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 4 },
             _react2.default.createElement(
-              _material.Typography,
+              _Typography2.default,
               { variant: 'h6', className: classes.contentLabel, style: { paddingTop: 8 } },
               R.prop('maintenanceAgencyID')(labels)
             )
           ),
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 8 },
             _react2.default.createElement(_Input2.default, {
               variant: 'outlined',
@@ -310,19 +316,19 @@ var UserRightForm = function UserRightForm(_ref) {
           )
         ),
         _react2.default.createElement(
-          _material.Grid,
+          _Grid2.default,
           { item: true, container: true, xs: 12, alignItems: 'center' },
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 4 },
             _react2.default.createElement(
-              _material.Typography,
+              _Typography2.default,
               { variant: 'h6', className: classes.contentLabel, style: { paddingTop: 8 } },
               R.prop('artefactID')(labels)
             )
           ),
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 8 },
             _react2.default.createElement(_Input2.default, {
               variant: 'outlined',
@@ -339,19 +345,19 @@ var UserRightForm = function UserRightForm(_ref) {
           )
         ),
         _react2.default.createElement(
-          _material.Grid,
+          _Grid2.default,
           { item: true, container: true, xs: 12, alignItems: 'center' },
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 4 },
             _react2.default.createElement(
-              _material.Typography,
+              _Typography2.default,
               { variant: 'h6', className: classes.contentLabel, style: { paddingTop: 8 } },
               R.prop('artefactVersion')(labels)
             )
           ),
           _react2.default.createElement(
-            _material.Grid,
+            _Grid2.default,
             { item: true, xs: 12, md: 8 },
             _react2.default.createElement(_Input2.default, {
               variant: 'outlined',
@@ -372,7 +378,7 @@ var UserRightForm = function UserRightForm(_ref) {
       )
     ),
     _react2.default.createElement(
-      _material.Grid,
+      _Grid2.default,
       { item: true, container: true },
       _react2.default.createElement(_PermsissionsTabs2.default, {
         data: evolvedPermissions,
@@ -382,10 +388,10 @@ var UserRightForm = function UserRightForm(_ref) {
       })
     ),
     _react2.default.createElement(
-      _material.Grid,
+      _Grid2.default,
       { item: true, container: true, justifyContent: 'flex-end', alignItems: 'center' },
       _react2.default.createElement(
-        _material.Grid,
+        _Grid2.default,
         { item: true },
         _react2.default.createElement(
           _Button2.default,
@@ -403,7 +409,7 @@ var UserRightForm = function UserRightForm(_ref) {
         )
       ),
       R.is(Function, onSubmit) && _react2.default.createElement(
-        _material.Grid,
+        _Grid2.default,
         { item: true },
         _react2.default.createElement(
           _Button2.default,

package/lib/VirtualizedTree/withSpotlight.js

@@ -16,6 +16,8 @@ var _react2 = _interopRequireDefault(_react);
 
 var _utils = require('./utils');
 
+var _utils2 = require('../utils');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; } }
@@ -44,23 +46,22 @@ var spotlightFilter = exports.spotlightFilter = function spotlightFilter(term) {
       }
       return acc;
     };
-    var matchRegExp = function matchRegExp(str) {
-      return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    };
 
     // Highlight matching terms in the label
     var highlightLabel = function highlightLabel(label) {
-      var regex = new RegExp('(' + matchRegExp(term) + ')', 'gi');
-      return label.replace(regex, function (match) {
-        return '<span style=background-color:yellow;border-bottom:2px solid #8CC841>' + match + '</span>';
-      });
+      var i = (0, _utils2.prepareTerm)(label).indexOf((0, _utils2.prepareTerm)(term));
+      var l = R.length(term);
+
+      var pre = label.slice(0, i);
+      var match = label.slice(i, i + l);
+      var post = label.slice(i + l);
+
+      return pre + '<span style=background-color:yellow;border-bottom:2px solid #8CC841>' + match + '</span>' + post;
     };
 
     var recurse = function recurse(item) {
       var label = labelRenderer(item);
-      var isValidItem = function isValidItem(item) {
-        return R.includes(R.toLower(term), R.toLower(item));
-      };
+      var isValidItem = (0, _utils2.searchTerm)(term);
 
       var result = [];
 

package/lib/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.newDate = exports.getIsRtl = exports.getDark = exports.getLight = exports.withBlank = exports.spotlightScopeListEngine = exports.reduceChildren = undefined;
+exports.searchTerm = exports.prepareTerm = exports.newDate = exports.getIsRtl = exports.getDark = exports.getLight = exports.withBlank = exports.spotlightScopeListEngine = exports.reduceChildren = 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; };
 
@@ -17,6 +17,10 @@ var _dateFns = require('date-fns');
 
 var _dateFns2 = _interopRequireDefault(_dateFns);
 
+var _diacritics = require('diacritics');
+
+var diacritics = _interopRequireWildcard(_diacritics);
+
 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 }; }
@@ -84,4 +88,11 @@ var getIsRtl = exports.getIsRtl = function getIsRtl(theme) {
 var newDate = exports.newDate = function newDate(stringDate) {
   var date = new Date(stringDate);
   return _dateFns2.default.addMinutes(date, date.getTimezoneOffset());
+};
+
+var prepareTerm = exports.prepareTerm = R.pipe(diacritics.remove, R.toLower);
+var searchTerm = exports.searchTerm = function searchTerm(term) {
+  return function (label) {
+    return R.includes(prepareTerm(term), prepareTerm(label));
+  };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "12.29.0",
+  "version": "12.31.0",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",
@@ -27,12 +27,14 @@
     "test": "jest",
     "test:watch": "jest --watch --no-cache",
     "lint": "eslint src/ --color",
-    "precommit": "lint-staged"
+    "precommit": "lint-staged",
+    "transform": "npx jscodeshift -t scripts/transform-mui-imports.js demo/"
   },
   "dependencies": {
     "@hello-pangea/dnd": "^16.6.0",
     "@react-hook/size": "^2.1.1",
     "classnames": "^2.2.6",
+    "diacritics": "^1.3.0",
     "isemail": "^3.2.0",
     "prop-types": "^15.7.2",
     "ramda": "^0.27.0",