From 8e9c0653dd6c6862123c9609ae34e1206d86456e Mon Sep 17 00:00:00 2001
From: talig <talig@amdocs.com>
Date: Wed, 20 Dec 2017 14:30:43 +0200
Subject: Add collaboration feature

Issue-ID: SDC-767
Change-Id: I14fb4c1f54086ed03a56a7ff7fab9ecd40381795
Signed-off-by: talig <talig@amdocs.com>
---
 .../src/nfvo-components/modal/GlobalModal.js       | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'openecomp-ui/src/nfvo-components/modal/GlobalModal.js')

diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
index 4e7a1a16a4..a47c42a1fb 100644
--- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
+++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
@@ -15,6 +15,7 @@
  */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 
 import Modal from 'nfvo-components/modal/Modal.jsx';
@@ -25,7 +26,7 @@ import {actionTypes, typeEnum} from './GlobalModalConstants.js';
 
 
 const typeClass = {
-	'default': 'default',
+	'default': 'primary',
 	error: 'negative',
 	warning: 'warning',
 	success: 'positive'
@@ -47,11 +48,11 @@ const ModalFooter = ({type, onConfirmed, onDeclined, onClose, confirmationButton
 	return (
 		<Modal.Footer>
 			<div className='sdc-modal-footer'>
-				{onConfirmed && <Button color={typeClass[type]} onClick={() => {
+				{onConfirmed && <Button data-test-id='sdc-modal-confirm-button' color={typeClass[type]} onClick={() => {
 					onConfirmed();
 					onClose();
 				}}>{confirmationButtonText}</Button>}
-				<Button {...myPropsForNoConfirmed} color={typeClass[type]} onClick={onDeclined ? () => {
+				<Button {...myPropsForNoConfirmed} data-test-id='sdc-modal-cancel-button' btnType='outline' color={typeClass[type]} onClick={onDeclined ? () => {
 					onDeclined();
 					onClose();} : () => onClose()}>
 					{cancelButtonText}
@@ -85,15 +86,15 @@ export const mapActionToProps = (dispatch) => {
 export class  GlobalModalView extends React.Component {
 
 	static propTypes = {
-		show: React.PropTypes.bool,
-		type: React.PropTypes.oneOf(['default', 'error', 'warning', 'success']),
-		title: React.PropTypes.string,
-		modalComponentProps: React.PropTypes.object,
-		modalComponentName: React.PropTypes.string,
-		onConfirmed: React.PropTypes.func,
-		onDeclined: React.PropTypes.func,
-		confirmationButtonText: React.PropTypes.string,
-		cancelButtonText: React.PropTypes.string
+		show: PropTypes.bool,
+		type: PropTypes.oneOf(['default', 'error', 'warning', 'success']),
+		title: PropTypes.string,
+		modalComponentProps: PropTypes.object,
+		modalComponentName: PropTypes.string,
+		onConfirmed: PropTypes.func,
+		onDeclined: PropTypes.func,
+		confirmationButtonText: PropTypes.string,
+		cancelButtonText: PropTypes.string
 	};
 
 	static defaultProps = {
@@ -115,7 +116,7 @@ export class  GlobalModalView extends React.Component {
 					{ComponentToRender ?
 						<ComponentToRender {...modalComponentProps}/> :
 						msg && typeof msg === 'string' ?
-							<div> {msg.split('\n').map(txt => <span> {txt} <br/> </span>)} </div> :
+							<div> {msg.split('\n').map((txt, i) => <span key={i}> {txt} <br/> </span>)} </div> :
 							msg
 					}
 				</Modal.Body>
-- 
cgit 1.2.3-korg