From d2f5794e8565764e71e171e77ff0a548ad206b05 Mon Sep 17 00:00:00 2001 From: Einav Weiss Keidar Date: Wed, 14 Feb 2018 14:00:07 +0200 Subject: upgrade react framework Issue-ID: SDC-894 Change-Id: Iab219b465333d88c2679b01639e8bad6232750d9 Signed-off-by: einavk --- openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js | 6 +++--- openecomp-ui/src/nfvo-utils/RestAPIUtil.js | 4 ++-- openecomp-ui/src/nfvo-utils/i18n/en.json | 4 +++- .../src/sdc-app/features/FeaturesActionHelper.js | 8 ++++---- .../entitlementPools/EntitlementPoolsEditorView.jsx | 8 ++++---- .../licenseKeyGroups/LicenseKeyGroupsEditorView.jsx | 16 ++++++++-------- .../landingPage/SoftwareProductLandingPageView.jsx | 16 ++++++++-------- 7 files changed, 32 insertions(+), 30 deletions(-) (limited to 'openecomp-ui/src') 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." } diff --git a/openecomp-ui/src/sdc-app/features/FeaturesActionHelper.js b/openecomp-ui/src/sdc-app/features/FeaturesActionHelper.js index 5ae182018a..5bb911d090 100644 --- a/openecomp-ui/src/sdc-app/features/FeaturesActionHelper.js +++ b/openecomp-ui/src/sdc-app/features/FeaturesActionHelper.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. @@ -16,10 +16,10 @@ import RestAPIUtil from 'nfvo-utils/RestAPIUtil.js'; import Configuration from 'sdc-app/config/Configuration.js'; import {actionTypes} from './FeaturesConstants.js'; - + function baseUrl() { - const restPrefix = Configuration.get('restPrefix'); + const restPrefix = Configuration.get('restPrefix'); return `${restPrefix}/v1.0/togglz`; } @@ -34,7 +34,7 @@ export default { type: actionTypes.FEATURES_LIST_LOADED, features: response.features }); - }); + }).catch(() => console.error('An exception occured while trying to fetch the toggleZ features.') ); } }; diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx index 154174cf6c..efae7f3ad2 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx @@ -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. @@ -195,8 +195,8 @@ class EntitlementPoolsEditorView extends React.Component { this.submit(); } } - - state = { + + state = { selectedTab: tabIds.GENERAL, selectedLimit: '' }; @@ -273,7 +273,7 @@ class EntitlementPoolsEditorView extends React.Component { {i18n('Add Limit')} : -
// Render empty div to not break tabs +
// Render empty div to not break tabs } diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx index 87c947eb02..7cbab61a8a 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseKeyGroups/LicenseKeyGroupsEditorView.jsx @@ -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. @@ -266,8 +266,8 @@ class LicenseKeyGroupsEditorView extends React.Component { {selectedTab === tabIds.SP_LIMITS && - item.type === limitType.SERVICE_PROVIDER)} selectedLimit={this.state.selectedLimit} onCloseLimitEditor={() => this.onCloseLimitEditor()} @@ -275,16 +275,16 @@ class LicenseKeyGroupsEditorView extends React.Component { isReadOnlyMode={isReadOnlyMode} />} - {selectedTab === tabIds.VENDOR_LIMITS && - item.type === limitType.VENDOR)} selectedLimit={this.state.selectedLimit} onCloseLimitEditor={() => this.onCloseLimitEditor()} onSelectLimit={limit => this.onSelectLimit(limit)} isReadOnlyMode={isReadOnlyMode} />} - {selectedTab !== tabIds.GENERAL ? + {selectedTab !== tabIds.GENERAL ?