@gridsuite/commons-ui 0.37.0 → 0.39.0

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

@@ -45,6 +45,13 @@ var ElementSearchDialog = function ElementSearchDialog(props) {
       });
     }
   }, [searchTermDisabled, searchTermDisableReason]);
+
+  // to reset the value between the dialog closing and opening
+  useEffect(function () {
+    setValue(function (old) {
+      return !open ? null : old;
+    });
+  }, [open]);
   var handleSearchTermChange = function handleSearchTermChange(term) {
     if (term) {
       setLoading(true);

package/es/components/TopBar/TopBar.js

@@ -497,7 +497,7 @@ var TopBar = function TopBar(_ref2) {
     defaultMessage: 'Settings'
   })))), /*#__PURE__*/React.createElement(StyledMenuItem, {
     sx: styles.borderBottom,
-    disabled: true,
+    disabled: !onAboutClick,
     style: {
       opacity: '1'
     },

package/es/components/TreeViewFinder/TreeViewFinder.js

@@ -1,4 +1,5 @@
 var _defaultStyles;
+function _extends() { _extends = Object.assign ? Object.assign.bind() : 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
@@ -7,7 +8,7 @@ var _defaultStyles;
  */
 
 import React, { useState, useCallback, useEffect } from 'react';
-import { FormattedMessage, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import { toNestedGlobalSelectors, makeComposeClasses } from '../../utils/styles';
 import { styled } from '@mui/system';
@@ -23,6 +24,7 @@ import Typography from '@mui/material/Typography';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import CheckIcon from '@mui/icons-material/Check';
+import CancelButton from '../react-hook-form/utils/cancel-button';
 
 // As a bunch of individual variables to try to make it easier
 // to track that they are all used. Not sure, maybe group them in an object ?
@@ -84,6 +86,7 @@ var composeClasses = makeComposeClasses(generateTreeViewFinderClass);
  * @param {String}          [validationButtonText=default text] - Customized Validation Button text (default: Add N Elements)
  * @param {Boolean}         [onlyLeaves=true] - Allow/Forbid selection only on leaves
  * @param {Boolean}         [multiselect=false] - Allow/Forbid multiselection on Tree
+ * @param {Object}          [cancelButtonProps] - The cancel button props
  */
 var TreeViewFinder = function TreeViewFinder(props) {
   var intl = useIntl();
@@ -100,7 +103,8 @@ var TreeViewFinder = function TreeViewFinder(props) {
     onlyLeaves = props.onlyLeaves,
     multiselect = props.multiselect,
     sortMethod = props.sortMethod,
-    className = props.className;
+    className = props.className,
+    cancelButtonProps = props.cancelButtonProps;
   var _useState = useState({}),
     mapPrintedNodes = _useState[0],
     setMapPrintedNodes = _useState[1];
@@ -277,8 +281,7 @@ var TreeViewFinder = function TreeViewFinder(props) {
     multiSelect: multiselect
   }, data && Array.isArray(data) ? data.sort(sortMethod).map(function (child) {
     return renderTree(child);
-  }) : null)), /*#__PURE__*/React.createElement(DialogActions, null, /*#__PURE__*/React.createElement(Button, {
-    variant: "contained",
+  }) : null)), /*#__PURE__*/React.createElement(DialogActions, null, /*#__PURE__*/React.createElement(CancelButton, _extends({
     style: {
       "float": 'left',
       margin: '5px'
@@ -287,10 +290,8 @@ var TreeViewFinder = function TreeViewFinder(props) {
       _onClose([]);
       setSelected([]);
     }
-  }, /*#__PURE__*/React.createElement(FormattedMessage, {
-    id: "treeview_finder/cancel"
-  })), /*#__PURE__*/React.createElement(Button, {
-    variant: "contained",
+  }, cancelButtonProps)), /*#__PURE__*/React.createElement(Button, {
+    variant: "outlined",
     style: {
       "float": 'left',
       margin: '5px'
@@ -323,7 +324,8 @@ TreeViewFinder.propTypes = process.env.NODE_ENV !== "production" ? {
   defaultExpanded: PropTypes.arrayOf(PropTypes.string),
   onlyLeaves: PropTypes.bool,
   multiselect: PropTypes.bool,
-  sortMethod: PropTypes.func
+  sortMethod: PropTypes.func,
+  cancelButtonProps: PropTypes.object
 } : {};
 
 /* TreeViewFinder props default values */

package/es/components/react-hook-form/utils/cancel-button.js

@@ -0,0 +1,23 @@
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : 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) 2023, 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/.
+ */
+
+import React from 'react';
+import { Button } from '@mui/material';
+import { FormattedMessage } from 'react-intl';
+import PropTypes from 'prop-types';
+var CancelButton = function CancelButton(_ref) {
+  var buttonProps = _extends({}, (_objectDestructuringEmpty(_ref), _ref));
+  return /*#__PURE__*/React.createElement(Button, buttonProps, /*#__PURE__*/React.createElement(FormattedMessage, {
+    id: "cancel"
+  }));
+};
+CancelButton.propTypes = process.env.NODE_ENV !== "production" ? {
+  buttonProps: PropTypes.object
+} : {};
+export default CancelButton;

package/es/components/react-hook-form/utils/submit-button.js

@@ -1,3 +1,5 @@
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : 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) 2022, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -9,17 +11,19 @@ import React from 'react';
 import { Button } from '@mui/material';
 import { useFormState } from 'react-hook-form';
 import { FormattedMessage } from 'react-intl';
+import PropTypes from 'prop-types';
 var SubmitButton = function SubmitButton(_ref) {
-  var onClick = _ref.onClick,
-    _ref$disabled = _ref.disabled,
-    disabled = _ref$disabled === void 0 ? false : _ref$disabled;
+  var _buttonProps$disabled;
+  var buttonProps = _extends({}, (_objectDestructuringEmpty(_ref), _ref));
   var _useFormState = useFormState(),
     isDirty = _useFormState.isDirty;
-  return /*#__PURE__*/React.createElement(Button, {
-    onClick: onClick,
-    disabled: !isDirty || disabled
-  }, /*#__PURE__*/React.createElement(FormattedMessage, {
+  return /*#__PURE__*/React.createElement(Button, _extends({}, buttonProps, {
+    disabled: !isDirty || ((_buttonProps$disabled = buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.disabled) !== null && _buttonProps$disabled !== void 0 ? _buttonProps$disabled : false)
+  }), /*#__PURE__*/React.createElement(FormattedMessage, {
     id: "validate"
   }));
 };
+SubmitButton.propTypes = process.env.NODE_ENV !== "production" ? {
+  buttonProps: PropTypes.object
+} : {};
 export default SubmitButton;

package/es/components/translations/common-button-en.js

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2023, 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 common_button_en = {
+  cancel: 'Cancel',
+  validate: 'Validate'
+};
+export default common_button_en;

package/es/components/translations/common-button-fr.js

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2023, 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 common_button_fr = {
+  cancel: 'Annuler',
+  validate: 'Valider'
+};
+export default common_button_fr;

package/es/components/translations/treeview-finder-en.js

@@ -7,7 +7,6 @@
 
 var treeview_finder_en = {
   'treeview_finder/close': 'Close',
-  'treeview_finder/cancel': 'Cancel',
   'treeview_finder/validate': 'Validate',
   'treeview_finder/add': 'Add...',
   'treeview_finder/deleteSelection': 'Delete selection',

package/es/components/translations/treeview-finder-fr.js

@@ -7,7 +7,6 @@
 
 var treeview_finder_fr = {
   'treeview_finder/close': 'Fermer',
-  'treeview_finder/cancel': 'Annuler',
   'treeview_finder/validate': 'Valider',
   'treeview_finder/add': 'Ajouter...',
   'treeview_finder/deleteSelection': 'Supprimer la selection',

package/es/index.js

@@ -43,6 +43,8 @@ export { default as flat_parameters_en } from './components/translations/flat-pa
 export { default as flat_parameters_fr } from './components/translations/flat-parameters-fr';
 export { default as multiple_selection_dialog_en } from './components/translations/multiple-selection-dialog-en';
 export { default as multiple_selection_dialog_fr } from './components/translations/multiple-selection-dialog-fr';
+export { default as common_button_en } from './components/translations/common-button-en';
+export { default as common_button_fr } from './components/translations/common-button-fr';
 export { TagRenderer } from './components/ElementSearchDialog';
 export { EquipmentItem } from './components/ElementSearchDialog/equipment-item';
 export { default as CardErrorBoundary } from './components/CardErrorBoundary';
@@ -64,4 +66,5 @@ export { default as MidFormError } from './components/react-hook-form/error-mana
 export { default as TextFieldWithAdornment } from './components/react-hook-form/utils/text-field-with-adornment';
 export { default as FieldLabel } from './components/react-hook-form/utils/field-label';
 export { default as SubmitButton } from './components/react-hook-form/utils/submit-button';
+export { default as CancelButton } from './components/react-hook-form/utils/cancel-button';
 export { genHelperPreviousValue, genHelperError, identity, isFieldRequired } from './components/react-hook-form/utils/functions';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.37.0",
+    "version": "0.39.0",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": ">=9",