parse multilple error messages in separate lines

Change-Id: I7e17ea7b4fdd31fe3b9607f9896b077bb8d9f451
Issue-ID: SDC-488
Signed-off-by: miriame <miriam.eini@amdocs.com>

diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
index e05c2ac..f282046 100644 (file)
--- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
+++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
@@ -112,7 +112,10 @@ export class  GlobalModalView extends React.Component {
                                        <Modal.Title>{title}</Modal.Title>
                                </Modal.Header>
                                <Modal.Body>
-                                       {ComponentToRender ? <ComponentToRender {...modalComponentProps}/> :  msg}
+                                       {ComponentToRender ?
+                                               <ComponentToRender {...modalComponentProps}/> :
+                                               <div> {msg && msg.split('\n').map(txt => <span> {txt} <br/> </span>)} </div>
+                                       }
                                </Modal.Body>
                                {(onConfirmed || onDeclined || type !== typeEnum.DEFAULT) &&
                                                <ModalFooter

diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
index 41306a1..db7afd2 100644 (file)
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
@@ -114,7 +114,7 @@ function objToString(obj) {
                        }
                }
        }
-       return str;
+       return str.replace(/\n$/, '');
 }
 
 function parseUploadErrorMsg(error) {
@@ -124,7 +124,7 @@ function parseUploadErrorMsg(error) {
                        message += objToString(error[key]) + '\n';
                }
        }
-       return message;
+       return message.replace(/\n$/, '');
 }
 
 function fetchSoftwareProductCategories(dispatch) {