| commit | 6511b4b016accbac5b221b8f8f46db6a89255a57 | [log] [tgz] |
|---|---|---|
| author | miriame <miriam.eini@amdocs.com> | Sun Oct 22 15:14:44 2017 +0300 |
| committer | miriame <miriam.eini@amdocs.com> | Sun Oct 22 15:14:44 2017 +0300 |
| tree | e5b8ca16dfb238dc4057f657816bc384f1815edd | |
| parent | a287b5148248fb02dd72c816b3a7fea73a4ce918 [diff] |
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 --- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js +++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
@@ -112,7 +112,10 @@ <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 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
@@ -114,7 +114,7 @@ } } } - return str; + return str.replace(/\n$/, ''); } function parseUploadErrorMsg(error) { @@ -124,7 +124,7 @@ message += objToString(error[key]) + '\n'; } } - return message; + return message.replace(/\n$/, ''); } function fetchSoftwareProductCategories(dispatch) {