aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-ui/src/nfvo-utils/RestAPIUtil.js
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-ui/src/nfvo-utils/RestAPIUtil.js')
-rw-r--r--openecomp-ui/src/nfvo-utils/RestAPIUtil.js74
1 files changed, 44 insertions, 30 deletions
diff --git a/openecomp-ui/src/nfvo-utils/RestAPIUtil.js b/openecomp-ui/src/nfvo-utils/RestAPIUtil.js
index 03908d8203..97d3847350 100644
--- a/openecomp-ui/src/nfvo-utils/RestAPIUtil.js
+++ b/openecomp-ui/src/nfvo-utils/RestAPIUtil.js
@@ -77,55 +77,69 @@ class RestAPIUtil {
handleRequest(url, type, options = {}, data = {}) {
applySecurity(options, data);
- let config = {
+ const config = {
method: type,
url: url,
headers: options.headers,
data: data
};
- store.dispatch({ type: LoaderConstants.SEND_REQUEST, url: url });
+ if (options.validateStatus) {
+ config.validateStatus = options.validateStatus;
+ }
+
+ if (options.onUploadProgress) {
+ config.onUploadProgress = options.onUploadProgress;
+ }
+
+ if (!options.noLoading) {
+ store.dispatch({ type: LoaderConstants.SEND_REQUEST, url: url });
+ }
if (options.dataType === BINARY) {
config.responseType = 'arraybuffer';
return axios(config)
.then(result => {
- store.dispatch({
- type: LoaderConstants.RECEIVE_RESPONSE,
- url: result.config.url
- });
+ if (!options.noLoading) {
+ store.dispatch({
+ type: LoaderConstants.RECEIVE_RESPONSE,
+ url: result.config.url
+ });
+ }
+
return {
blob: new Blob([result.data]),
headers: result.headers
};
})
.catch(error => {
- store.dispatch({
- type: LoaderConstants.RECEIVE_RESPONSE,
- url: error.config.url
- });
- errorResponseHandler(error.response);
- });
- } else {
- return axios(config)
- .then(result => {
- store.dispatch({
- type: LoaderConstants.RECEIVE_RESPONSE,
- url: result.config.url
- });
- handleSuccess(result.headers, result.config.headers);
- return result.data;
- })
- .catch(error => {
- store.dispatch({
- type: LoaderConstants.RECEIVE_RESPONSE,
- url: error.config.url
- });
+ if (!options.noLoading) {
+ store.dispatch({
+ type: LoaderConstants.RECEIVE_RESPONSE,
+ url: error.config.url
+ });
+ }
errorResponseHandler(error.response);
- return Promise.reject({
- responseJSON: error.response.data
- });
});
}
+ return axios(config)
+ .then(result => {
+ store.dispatch({
+ type: LoaderConstants.RECEIVE_RESPONSE,
+ url: result.config.url
+ });
+ handleSuccess(result.headers, result.config.headers);
+ return result.data;
+ })
+ .catch(error => {
+ store.dispatch({
+ type: LoaderConstants.RECEIVE_RESPONSE,
+ url: error.config.url
+ });
+ errorResponseHandler(error.response);
+ return Promise.reject({
+ responseJSON: error.response.data
+ });
+ });
}
fetch(url, options) {