X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fapp%2FMainScreenWrapperActionHelper.js;h=3477b039a6bbef599fea18056f2f81c8068af072;hb=27fe29a076553c26e2c56dccaf52d2af789eae3a;hp=6278f29e8e802826c56b469052ce43c15a391d50;hpb=1580adb8ab521e55a129afc32693071620d85c02;p=aai%2Fsparky-fe.git diff --git a/src/app/MainScreenWrapperActionHelper.js b/src/app/MainScreenWrapperActionHelper.js index 6278f29..3477b03 100644 --- a/src/app/MainScreenWrapperActionHelper.js +++ b/src/app/MainScreenWrapperActionHelper.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,10 +17,7 @@ * 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. */ -import {aaiActionTypes} from './MainScreenWrapperConstants.js'; import { POST, POST_HEADER, @@ -36,6 +33,7 @@ import { getSetGlobalMessageEvent, getClearGlobalMessageEvent } from 'app/globalInlineMessageBar/GlobalInlineMessageBarActions.js'; +import {aaiActionTypes} from 'app/MainScreenWrapperConstants.js'; function createWindowSizeChangeEvent() { return { @@ -64,6 +62,43 @@ export function showMainMenu(show) { }; } +function createOverlayDataFoundEvent(overlayData, paramName, curData, responseEventKey) { + return { + type: responseEventKey, + data: { + paramName: paramName, + overlayData: overlayData, + curData: curData + } + }; +} + +function overlayViewData(dataFetchRequest, paramName, curData, responseEventKey) { + return dispatch => dataFetchRequest().then( + (response) => { + return response.json(); + } + ).then( + (responseJson) => { + dispatch(createOverlayDataFoundEvent(responseJson, paramName, curData, responseEventKey)); + }).catch( + () => { + dispatch(getSetGlobalMessageEvent(ERROR_RETRIEVING_DATA, MESSAGE_LEVEL_DANGER)); + dispatch(createOverlayDataFoundEvent({}, paramName, curData, responseEventKey)); + }); +}; + +export function overlayNetworkCallback(urlApi, postBody, paramName, curData, responseEventKey) { + let dataFetchRequest = + () => fetchRequestObj(BASE_URL + urlApi, POST, + POST_HEADER, JSON.stringify(postBody)); + + + return dispatch => { + dispatch(overlayViewData(dataFetchRequest, paramName, curData, responseEventKey)); + }; +} + function createViewDataFoundEvent(viewData, paramName, curViewData) { var obj = {}; obj['data'] = {}; @@ -76,8 +111,7 @@ function createViewDataFoundEvent(viewData, paramName, curViewData) { } function extensibleViewData(dataFetchRequest, paramName, curViewData) { - return dispatch => { - return dataFetchRequest().then( + return dispatch => dataFetchRequest().then( (response) => { return response.json(); } @@ -90,7 +124,6 @@ function extensibleViewData(dataFetchRequest, paramName, curViewData) { dispatch(createViewDataFoundEvent({}, paramName, curViewData)); //To-do: If need to send a flag later on to the view, add a function to have the flag }); - }; } export function extensibleViewNetworkCallback(urlApi, postBody, paramName, curViewData) { @@ -99,10 +132,7 @@ export function extensibleViewNetworkCallback(urlApi, postBody, paramName, curVi () => fetchRequestObj(BASE_URL + urlApi, POST, POST_HEADER, postBody); - - return dispatch => { - dispatch(extensibleViewData(dataFetchRequest, paramName, curViewData)); - }; + return dispatch => dispatch(extensibleViewData(dataFetchRequest, paramName, curViewData)); } export function extensibleViewMessageCallback(msgText, msgSeverity) {