X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fsparky-fe.git;a=blobdiff_plain;f=src%2Fapp%2Fnetworking%2FNetworkCalls.js;h=e391391cb42d109e7f949de711be7863c66b8356;hp=b6c96b7f3dbc23bfedacf6e80b13b62447bb10b9;hb=96319fec0d2af2be5802a56d6b05a3ada939c8df;hpb=a38f3d6bb17a478d08016e49d6c2a667ac483d4a diff --git a/src/app/networking/NetworkCalls.js b/src/app/networking/NetworkCalls.js index b6c96b7..e391391 100644 --- a/src/app/networking/NetworkCalls.js +++ b/src/app/networking/NetworkCalls.js @@ -2,8 +2,8 @@ * ============LICENSE_START======================================================= * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,13 +17,10 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -function EmptyResponseException(){ - this.name = 'EmptyResponseException'; -} +import {BASE_URL} from 'app/networking/NetworkConstants.js'; + function fetchRequest(URL, POST, POST_HEADER, BODY) { return fetch(URL, { credentials: 'same-origin', @@ -35,6 +32,16 @@ function fetchRequest(URL, POST, POST_HEADER, BODY) { ); } +const fetchConfigurableViewRequest = (queryData) => { + const URL = `${BASE_URL}${queryData.api}`; + return fetch(URL, { + credentials: 'same-origin', + method: queryData.method, + headers: queryData.headers, + body: JSON.stringify(queryData.componentDataDescriptor) + }); +}; + function fetchRequestObj(URL, POST, POST_HEADER, BODY) { return fetch(URL, { credentials: 'same-origin', @@ -44,49 +51,37 @@ function fetchRequestObj(URL, POST, POST_HEADER, BODY) { }); } -function processResponse(response){ - if(response.status === 204){ - throw new EmptyResponseException(); - } - return response.json(); -} function getRequest(URL, GET) { return fetch(URL, { credentials: 'same-origin', method: GET }).then( - (response) => { - try{ - response.json(); - } catch (e){ - response.isValidJson = false; - } - return processResponse(response); - } + (response) => response.json() ); } + +const genericRequest = (url, relativeURL, httpMethodType) => { + let URL; + if(relativeURL){ + URL = BASE_URL.concat(url); + } else { + URL = url; + } + switch(httpMethodType){ + case 'GET': + return fetch(URL, { + credentials: 'same-origin', + method: 'GET' + }).then( + (response) => response.json() + ); + } +}; + module.exports = { fetchRequest: fetchRequest, fetchRequestObj: fetchRequestObj, - getRequest: getRequest + getRequest: getRequest, + fetchConfigurableViewRequest: fetchConfigurableViewRequest, + genericRequest: genericRequest }; - - - - - - - - - - - - - - - - - - - -