diff options
Diffstat (limited to 'openecomp-ui/src/nfvo-utils')
| -rw-r--r-- | openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js | 6 | ||||
| -rw-r--r-- | openecomp-ui/src/nfvo-utils/RestAPIUtil.js | 4 | ||||
| -rw-r--r-- | openecomp-ui/src/nfvo-utils/i18n/en.json | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js b/openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js index e7f37e3768..13dfb1f0ab 100644 --- a/openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js +++ b/openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2018 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,13 +62,13 @@ var errorResponseHandler = (error) => { else { errorData = { title: error.statusText, - msg: error.responseText, + msg: error.responseText ? error.responseText : i18n('GENERIC_ERROR'), }; } store.dispatch({ type: modalActionTypes.GLOBAL_MODAL_ERROR, data: { - ...errorData + ...errorData } }); }; diff --git a/openecomp-ui/src/nfvo-utils/RestAPIUtil.js b/openecomp-ui/src/nfvo-utils/RestAPIUtil.js index bd08cbb676..5b07986390 100644 --- a/openecomp-ui/src/nfvo-utils/RestAPIUtil.js +++ b/openecomp-ui/src/nfvo-utils/RestAPIUtil.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 European Support Limited + * Copyright © 2016-2018 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -125,7 +125,7 @@ class RestAPIUtil { }).catch(error => { store.dispatch({type: LoaderConstants.RECEIVE_RESPONSE, url : error.config.url}); errorResponseHandler(error.response); - throw {responseJSON: error.response.data}; + return Promise.reject({responseJSON: error.response.data}); }); } diff --git a/openecomp-ui/src/nfvo-utils/i18n/en.json b/openecomp-ui/src/nfvo-utils/i18n/en.json index 9cfaf6a569..ed165f5418 100644 --- a/openecomp-ui/src/nfvo-utils/i18n/en.json +++ b/openecomp-ui/src/nfvo-utils/i18n/en.json @@ -586,5 +586,7 @@ "VSPQuestionnaire/general/storageDataReplication/storageReplicationSize" : "Storage Replication Size", "VSPQuestionnaire/general/storageDataReplication/storageReplicationSource": "Storage Replication Source", "VSPQuestionnaire/general/storageDataReplication/storageReplicationFrequency" : "Storage Replication Frequency", - "VSPQuestionnaire/general/storageDataReplication/storageReplicationDestination" : "Storage Replication Destination" + "VSPQuestionnaire/general/storageDataReplication/storageReplicationDestination" : "Storage Replication Destination", + + "GENERIC_ERROR": "An error has occurred. Please contact your System Administrator for further assistance." } |