From 1965d1663135b880b9774bca2630260e6f28d198 Mon Sep 17 00:00:00 2001 From: ilanap Date: Thu, 4 Jan 2018 11:34:59 +0200 Subject: Replace restful-js with Axios Change-Id: If47c5b7708885e84d632255557543d292f3ccd69 Issue-ID: SDC-869 Signed-off-by: ilanap --- openecomp-ui/src/nfvo-components/loader/Loader.jsx | 18 ++++++---- .../src/nfvo-components/loader/LoaderConstants.js | 17 +++++---- .../src/nfvo-components/loader/LoaderReducer.js | 42 ++++++++++++++++++---- 3 files changed, 56 insertions(+), 21 deletions(-) (limited to 'openecomp-ui/src/nfvo-components') diff --git a/openecomp-ui/src/nfvo-components/loader/Loader.jsx b/openecomp-ui/src/nfvo-components/loader/Loader.jsx index cbfed1b214..9ebe52dcfc 100644 --- a/openecomp-ui/src/nfvo-components/loader/Loader.jsx +++ b/openecomp-ui/src/nfvo-components/loader/Loader.jsx @@ -1,18 +1,19 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 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. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + import React from 'react'; import PropTypes from 'prop-types'; import {connect} from 'react-redux'; @@ -33,9 +34,12 @@ class Loader extends React.Component { isLoading: false }; + shouldComponentUpdate(nextProps) { + return (nextProps.isLoading !== this.props.isLoading); + } + render() { let {isLoading} = this.props; - return (
{ diff --git a/openecomp-ui/src/nfvo-components/loader/LoaderConstants.js b/openecomp-ui/src/nfvo-components/loader/LoaderConstants.js index 7c0c0e2b08..2b531b08fa 100644 --- a/openecomp-ui/src/nfvo-components/loader/LoaderConstants.js +++ b/openecomp-ui/src/nfvo-components/loader/LoaderConstants.js @@ -1,21 +1,24 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 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. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import keyMirror from 'nfvo-utils/KeyMirror.js'; export const actionTypes = keyMirror({ SHOW: null, - HIDE: null + HIDE: null, + + SEND_REQUEST: null, + RECEIVE_RESPONSE: null }); diff --git a/openecomp-ui/src/nfvo-components/loader/LoaderReducer.js b/openecomp-ui/src/nfvo-components/loader/LoaderReducer.js index 2eff70a617..3afdad0573 100644 --- a/openecomp-ui/src/nfvo-components/loader/LoaderReducer.js +++ b/openecomp-ui/src/nfvo-components/loader/LoaderReducer.js @@ -1,22 +1,50 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 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. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import {actionTypes} from './LoaderConstants.js'; -export default (state = {}, action) => { +export default (state = {fetchingRequests : 0, currentlyFetching : [], isLoading : false}, action) => { + let fetchingRequests = state.fetchingRequests; + let newArray; switch (action.type) { + case actionTypes.SEND_REQUEST: + fetchingRequests++; + newArray = state.currentlyFetching.slice(); + newArray.splice(0, 0, action.url); + if (DEBUG) { + console.log('Loader SEND REQUEST url: ' + action.url); + console.log('Loader SEND REQUEST number of fetching requests: ' + fetchingRequests); + } + return { + fetchingRequests: fetchingRequests, + currentlyFetching : newArray, + isLoading: true + }; + case actionTypes.RECEIVE_RESPONSE: + fetchingRequests--; + + newArray = state.currentlyFetching.filter((item) => {return item !== action.url;}); + if (DEBUG) { + console.log('Loader RECEIVE_RESPONSE url: ' + action.url); + console.log('Loader RECEIVE_RESPONSE: number of fetching requests: ' + fetchingRequests); + } + return { + currentlyFetching : newArray, + fetchingRequests: fetchingRequests, + isLoading: (fetchingRequests !== 0) + }; case actionTypes.SHOW: return {isLoading: true}; case actionTypes.HIDE: -- cgit 1.2.3-korg