From 042f4cd9491e69177607a9e2993986a827ca956c Mon Sep 17 00:00:00 2001 From: Yarin Dekel Date: Mon, 11 Feb 2019 16:36:19 +0200 Subject: Support modal dataTestId from SDCUI Issue-ID: SDC-2120 Change-Id: I5104d029896a33552d0a9ce64146a47ecf468235 Signed-off-by: Yarin Dekel --- .../src/nfvo-components/modal/GlobalModal.js | 24 +++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'openecomp-ui/src/nfvo-components/modal') diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js index 0c924304cc..118740498d 100644 --- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js +++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js @@ -34,7 +34,9 @@ const GlobalModalFooter = ({ onDeclined, onClose, confirmationButtonText, - cancelButtonText + cancelButtonText, + confirmDataTestId, + cancelDataTestId }) => { let actionButtonClick; if (onConfirmed) { @@ -57,18 +59,24 @@ const GlobalModalFooter = ({ : () => onClose() } withButtons + confirmDataTestId={confirmDataTestId} + cancelDataTestId={cancelDataTestId} /> ); }; GlobalModalFooter.defaultProps = { confirmationButtonText: i18n('OK'), - cancelButtonText: i18n('Cancel') + cancelButtonText: i18n('Cancel'), + cancelDataTestId: 'sdc-modal-cancel-button', + confirmDataTestId: 'sdc-modal-confirm-button' }; GlobalModalFooter.propTypes = { confirmationButtonText: PropTypes.string, - cancelButtonText: PropTypes.string + cancelButtonText: PropTypes.string, + confirmDataTestId: PropTypes.string, + cancelDataTestId: PropTypes.string }; export const mapStateToProps = ({ modal }) => { @@ -96,7 +104,9 @@ export class GlobalModalView extends React.Component { onDeclined: PropTypes.func, confirmationButtonText: PropTypes.string, cancelButtonText: PropTypes.string, - bodyClassName: PropTypes.string + bodyClassName: PropTypes.string, + cancelDataTestId: PropTypes.string, + confirmDataTestId: PropTypes.string }; static defaultProps = { @@ -118,7 +128,9 @@ export class GlobalModalView extends React.Component { confirmationButtonText, cancelButtonText, onClose, - bodyClassName + bodyClassName, + confirmDataTestId, + cancelDataTestId } = this.props; const ComponentToRender = modalContentComponents[modalComponentName]; return ( @@ -153,6 +165,8 @@ export class GlobalModalView extends React.Component { onClose={onClose} confirmationButtonText={confirmationButtonText} cancelButtonText={cancelButtonText} + confirmDataTestId={confirmDataTestId} + cancelDataTestId={cancelDataTestId} /> )} -- cgit 1.2.3-korg