@gridsuite/commons-ui 0.19.0 → 0.20.0

package/lib/components/ElementSearchDialog/element-search-dialog.js

@@ -117,7 +117,14 @@ var ElementSearchDialog = function ElementSearchDialog(props) {
     noOptionsText: intl.formatMessage({
       id: 'element_search/noResult'
     }),
-    renderOption: renderElement,
+    renderOption: function renderOption(props, element, _ref) {
+      var inputValue = _ref.inputValue;
+      return renderElement(_extends({}, props, {
+        element: element,
+        inputValue: inputValue,
+        onClose: onClose
+      }));
+    },
     renderInput: function renderInput(params) {
       return /*#__PURE__*/_react["default"].createElement(_material.TextField, _extends({
         autoFocus: true

package/lib/components/ElementSearchDialog/equipment-item.js

@@ -0,0 +1,70 @@
+"use strict";
+
+exports.__esModule = true;
+exports.EquipmentItem = void 0;
+
+var _index = require("./index");
+
+var _match = _interopRequireDefault(require("autosuggest-highlight/match"));
+
+var _parse = _interopRequireDefault(require("autosuggest-highlight/parse"));
+
+var _clsx = _interopRequireDefault(require("clsx"));
+
+var _reactIntl = require("react-intl");
+
+var _OverflowableText = _interopRequireDefault(require("../OverflowableText"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _EquipmentType = require("../../utils/EquipmentType");
+
+var _excluded = ["inputValue", "suffixRenderer", "element"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _extends() { _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; }; return _extends.apply(this, arguments); }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var EquipmentItem = function EquipmentItem(_ref) {
+  var inputValue = _ref.inputValue,
+      _ref$suffixRenderer = _ref.suffixRenderer,
+      suffixRenderer = _ref$suffixRenderer === void 0 ? _index.TagRenderer : _ref$suffixRenderer,
+      element = _ref.element,
+      props = _objectWithoutPropertiesLoose(_ref, _excluded);
+
+  var matches = (0, _match["default"])(element.label, inputValue, {
+    insideWords: true,
+    findAllOccurrences: true
+  });
+  var parts = (0, _parse["default"])(element.label, matches);
+  /* override li.key otherwise it will use label which could be duplicated */
+
+  return /*#__PURE__*/_react["default"].createElement("li", _extends({
+    key: element.key
+  }, props), /*#__PURE__*/_react["default"].createElement("div", {
+    className: props.classes.equipmentOption
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _clsx["default"])(props.classes.equipmentTag, props.classes.equipmentTypeTag)
+  }, /*#__PURE__*/_react["default"].createElement(_reactIntl.FormattedMessage, {
+    id: _EquipmentType.EQUIPMENT_TYPE[element.type].tagLabel
+  })), /*#__PURE__*/_react["default"].createElement(_OverflowableText["default"], {
+    text: parts.map(function (e) {
+      return e.text;
+    }).join(),
+    className: props.classes.result
+  }, parts.map(function (part, index) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      key: index,
+      style: {
+        fontWeight: part.highlight ? 'bold' : 'inherit'
+      }
+    }, part.text);
+  })), suffixRenderer({
+    props: props,
+    element: element
+  })));
+};
+
+exports.EquipmentItem = EquipmentItem;

package/lib/components/ElementSearchDialog/index.js

@@ -1,12 +1,14 @@
 "use strict";
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports.TagRenderer = exports["default"] = void 0;
 
 var _elementSearchDialog = _interopRequireDefault(require("./element-search-dialog"));
 
 exports["default"] = _elementSearchDialog["default"];
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _tagRenderer = require("./tag-renderer");
 
-module.exports = exports.default;
+exports.TagRenderer = _tagRenderer.TagRenderer;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/lib/components/ElementSearchDialog/tag-renderer.js

@@ -0,0 +1,38 @@
+"use strict";
+
+exports.__esModule = true;
+exports.TagRenderer = void 0;
+
+var _OverflowableText = _interopRequireDefault(require("../OverflowableText"));
+
+var _clsx = _interopRequireDefault(require("clsx"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _EquipmentType = require("../../utils/EquipmentType");
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+/**
+ * Copyright (c) 2022, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+var TagRenderer = function TagRenderer(_ref) {
+  var props = _ref.props,
+      element = _ref.element;
+  if (element.type !== _EquipmentType.EQUIPMENT_TYPE.SUBSTATION.name && element.type !== _EquipmentType.EQUIPMENT_TYPE.VOLTAGE_LEVEL.name) return /*#__PURE__*/_react["default"].createElement(_OverflowableText["default"], {
+    text: element.voltageLevelLabel,
+    className: (0, _clsx["default"])(props.classes.equipmentTag, props.classes.equipmentVlTag)
+  });
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null);
+};
+
+exports.TagRenderer = TagRenderer;
+TagRenderer.propTypes = process.env.NODE_ENV !== "production" ? {
+  element: _propTypes["default"].object,
+  props: _propTypes["default"].object
+} : {};

package/lib/components/OverflowableText/overflowable-text.js

@@ -79,7 +79,7 @@ var OverflowableText = function OverflowableText(_ref) {
 exports.OverflowableText = OverflowableText;
 OverflowableText.propTypes = process.env.NODE_ENV !== "production" ? {
   children: _propTypes["default"].array,
-  text: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number]).isRequired,
+  text: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number, _propTypes["default"].node]),
   className: _propTypes["default"].string
 } : {};
 var _default = OverflowableText;

package/lib/components/TreeViewFinder/TreeViewFinder.js

@@ -83,6 +83,7 @@ var defaultStyles = {
  *
  * @param {Object}          classes - CSS classes, please use withStyles API from MaterialUI
  * @param {String}          [title] - Title of the Dialog
+ * @param {String}          [contentText] - Content text of the Dialog
  * @param {Boolean}         open - dialog state boolean handler (Controlled)
  * @param {EventListener}   onClose - onClose callback to call when closing dialog
  * @param {Object[]}        data - data to feed the component (Controlled).
@@ -103,6 +104,7 @@ var TreeViewFinder = function TreeViewFinder(props) {
   var intl = (0, _reactIntl.useIntl)();
   var classes = props.classes,
       title = props.title,
+      contentText = props.contentText,
       open = props.open,
       data = props.data,
       defaultExpanded = props.defaultExpanded,
@@ -248,7 +250,7 @@ var TreeViewFinder = function TreeViewFinder(props) {
     id: 'treeview_finder/finderTitle'
   }, {
     multiselect: multiselect
-  })), /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], null, /*#__PURE__*/_react["default"].createElement(_DialogContentText["default"], null, intl.formatMessage({
+  })), /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], null, /*#__PURE__*/_react["default"].createElement(_DialogContentText["default"], null, contentText ? contentText : intl.formatMessage({
     id: 'treeview_finder/contentText'
   }, {
     multiselect: multiselect
@@ -312,6 +314,7 @@ TreeViewFinder.propTypes = process.env.NODE_ENV !== "production" ? {
   //uncontrolled
   classes: _propTypes["default"].object.isRequired,
   title: _propTypes["default"].string,
+  contentText: _propTypes["default"].string,
   validationButtonText: _propTypes["default"].string,
   defaultSelected: _propTypes["default"].arrayOf(_propTypes["default"].string),
   defaultExpanded: _propTypes["default"].arrayOf(_propTypes["default"].string),

package/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.setSignInCallbackError = exports.SIGNIN_CALLBACK_ERROR = exports.setLoggedUser = exports.USER = exports.LANG_FRENCH = exports.LANG_ENGLISH = exports.LANG_SYSTEM = exports.LIGHT_THEME = exports.DARK_THEME = exports.DEFAULT_ROW_HEIGHT = exports.DEFAULT_HEADER_HEIGHT = exports.DEFAULT_CELL_PADDING = exports.getFileIcon = exports.elementType = exports.getPreLoginPath = exports.dispatchUser = exports.logout = exports.initializeAuthenticationProd = exports.initializeAuthenticationDev = exports.equipmentStyles = exports.renderEquipmentForSearchBar = exports.getEquipmentsInfosForSearchBar = exports.EQUIPMENT_TYPE = void 0;
+exports.EquipmentItem = exports.TagRenderer = exports.setSignInCallbackError = exports.SIGNIN_CALLBACK_ERROR = exports.setLoggedUser = exports.USER = exports.LANG_FRENCH = exports.LANG_ENGLISH = exports.LANG_SYSTEM = exports.LIGHT_THEME = exports.DARK_THEME = exports.DEFAULT_ROW_HEIGHT = exports.DEFAULT_HEADER_HEIGHT = exports.DEFAULT_CELL_PADDING = exports.getFileIcon = exports.elementType = exports.getPreLoginPath = exports.dispatchUser = exports.logout = exports.initializeAuthenticationProd = exports.initializeAuthenticationDev = exports.equipmentStyles = exports.getEquipmentsInfosForSearchBar = exports.EQUIPMENT_TYPE = void 0;
 
 var _TreeViewFinder2 = _interopRequireDefault(require("./components/TreeViewFinder"));
 
@@ -35,15 +35,15 @@ var _OverflowableText2 = _interopRequireDefault(require("./components/Overflowab
 
 exports.OverflowableText = _OverflowableText2["default"];
 
-var _ElementSearchDialog2 = _interopRequireDefault(require("./components/ElementSearchDialog"));
+var _ElementSearchDialog2 = _interopRequireWildcard(require("./components/ElementSearchDialog"));
 
 exports.ElementSearchDialog = _ElementSearchDialog2["default"];
+exports.TagRenderer = _ElementSearchDialog2.TagRenderer;
 
 var _EquipmentType = require("./utils/EquipmentType");
 
 exports.EQUIPMENT_TYPE = _EquipmentType.EQUIPMENT_TYPE;
 exports.getEquipmentsInfosForSearchBar = _EquipmentType.getEquipmentsInfosForSearchBar;
-exports.renderEquipmentForSearchBar = _EquipmentType.renderEquipmentForSearchBar;
 exports.equipmentStyles = _EquipmentType.equipmentStyles;
 
 var _AuthService = require("./utils/AuthService");
@@ -136,4 +136,12 @@ var _equipmentSearchFr = _interopRequireDefault(require("./components/translatio
 
 exports.equipment_search_fr = _equipmentSearchFr["default"];
 
+var _equipmentItem = require("./components/ElementSearchDialog/equipment-item");
+
+exports.EquipmentItem = _equipmentItem.EquipmentItem;
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/lib/utils/EquipmentType.js

@@ -1,24 +1,16 @@
 "use strict";
 
 exports.__esModule = true;
-exports.renderEquipmentForSearchBar = exports.getEquipmentsInfosForSearchBar = exports.EQUIPMENT_TYPE = exports.equipmentStyles = exports.VL_TAG_MAX_SIZE = exports.TYPE_TAG_MAX_SIZE = void 0;
-
-var _match = _interopRequireDefault(require("autosuggest-highlight/match"));
-
-var _parse = _interopRequireDefault(require("autosuggest-highlight/parse"));
-
-var _clsx = _interopRequireDefault(require("clsx"));
-
-var _react = _interopRequireDefault(require("react"));
+exports.getEquipmentsInfosForSearchBar = exports.EQUIPMENT_TYPE = exports.equipmentStyles = exports.VL_TAG_MAX_SIZE = exports.TYPE_TAG_MAX_SIZE = void 0;
 
 var _TopBar = require("../components/TopBar/TopBar");
 
-var _OverflowableText = _interopRequireDefault(require("../components/OverflowableText"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _extends() { _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; }; return _extends.apply(this, arguments); }
-
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 var TYPE_TAG_MAX_SIZE = '90px';
 exports.TYPE_TAG_MAX_SIZE = TYPE_TAG_MAX_SIZE;
 var VL_TAG_MAX_SIZE = '100px';
@@ -171,43 +163,4 @@ exports.getEquipmentsInfosForSearchBar = getEquipmentsInfosForSearchBar;
 
 var sortEquipments = function sortEquipments(a, b) {
   return EQUIPMENT_TYPE[a.type].sortOrder < EQUIPMENT_TYPE[b.type].sortOrder ? -1 : EQUIPMENT_TYPE[a.type].sortOrder > EQUIPMENT_TYPE[b.type].sortOrder ? 1 : a.label.localeCompare(b.label);
-};
-
-var renderEquipmentForSearchBar = function renderEquipmentForSearchBar(classes, intl) {
-  return function (props, element, _ref) {
-    var inputValue = _ref.inputValue;
-    var matches = (0, _match["default"])(element.label, inputValue, {
-      insideWords: true,
-      findAllOccurrences: true
-    });
-    var parts = (0, _parse["default"])(element.label, matches);
-    /* override li.key otherwise it will use label which could be duplicated */
-
-    return /*#__PURE__*/_react["default"].createElement("li", _extends({}, props, {
-      key: element.key
-    }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: classes.equipmentOption
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _clsx["default"])(classes.equipmentTag, classes.equipmentTypeTag)
-    }, intl.formatMessage({
-      id: EQUIPMENT_TYPE[element.type].tagLabel
-    })), /*#__PURE__*/_react["default"].createElement(_OverflowableText["default"], {
-      text: parts.map(function (e) {
-        return e.text;
-      }).join(),
-      className: classes.result
-    }, parts.map(function (part, index) {
-      return /*#__PURE__*/_react["default"].createElement("span", {
-        key: index,
-        style: {
-          fontWeight: part.highlight ? 'bold' : 'inherit'
-        }
-      }, part.text);
-    })), element.type !== EQUIPMENT_TYPE.SUBSTATION.name && element.type !== EQUIPMENT_TYPE.VOLTAGE_LEVEL.name && /*#__PURE__*/_react["default"].createElement(_OverflowableText["default"], {
-      text: element.voltageLevelLabel,
-      className: (0, _clsx["default"])(classes.equipmentTag, classes.equipmentVlTag)
-    })));
-  };
-};
-
-exports.renderEquipmentForSearchBar = renderEquipmentForSearchBar;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.19.0",
+    "version": "0.20.0",
     "description": "common react components for gridsuite applications",
     "main": "lib/index.js",
     "files": [