summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Gaffa <avi.gaffa@amdocs.com>2017-10-22 13:50:50 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-22 13:50:50 +0000
commit6ebd9c581142c2ca033c7bfba73b69ab6b378fee (patch)
tree6f4d022597844233716a683fa629b01a6345e29f
parentc7026576d55cce40fb9928616ab63f5a73663238 (diff)
parent6511b4b016accbac5b221b8f8f46db6a89255a57 (diff)
Merge "parse multilple error messages in separate lines"
-rw-r--r--openecomp-ui/src/nfvo-components/modal/GlobalModal.js5
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js4
2 files changed, 6 insertions, 3 deletions
diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
index e05c2ac616..f282046125 100644
--- 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 41306a1c1a..db7afd27d9 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 @@ 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) {