diff options
Diffstat (limited to 'openecomp-ui/src/sdc-app')
4 files changed, 24 insertions, 24 deletions
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')} </Button> : - <div></div> // Render empty div to not break tabs + <div key='empty_ep_tab_key'></div> // Render empty div to not break tabs } </Tabs> <GridSection className='license-model-modal-buttons entitlement-pools-editor-buttons'> 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 { </Tab> <Tab tabId={tabIds.SP_LIMITS} disabled={isTabsDisabled} data-test-id='general-tab' title={i18n('SP Limits')}> {selectedTab === tabIds.SP_LIMITS && - <LicenseKeyGroupsLimits - limitType={limitType.SERVICE_PROVIDER} + <LicenseKeyGroupsLimits + limitType={limitType.SERVICE_PROVIDER} limitsList={limitsList.filter(item => item.type === limitType.SERVICE_PROVIDER)} selectedLimit={this.state.selectedLimit} onCloseLimitEditor={() => this.onCloseLimitEditor()} @@ -275,16 +275,16 @@ class LicenseKeyGroupsEditorView extends React.Component { isReadOnlyMode={isReadOnlyMode} />} </Tab> <Tab tabId={tabIds.VENDOR_LIMITS} disabled={isTabsDisabled} data-test-id='general-tab' title={i18n('Vendor Limits')}> - {selectedTab === tabIds.VENDOR_LIMITS && - <LicenseKeyGroupsLimits - limitType={limitType.VENDOR} + {selectedTab === tabIds.VENDOR_LIMITS && + <LicenseKeyGroupsLimits + limitType={limitType.VENDOR} limitsList={limitsList.filter(item => item.type === limitType.VENDOR)} selectedLimit={this.state.selectedLimit} onCloseLimitEditor={() => this.onCloseLimitEditor()} onSelectLimit={limit => this.onSelectLimit(limit)} isReadOnlyMode={isReadOnlyMode} />} </Tab> - {selectedTab !== tabIds.GENERAL ? + {selectedTab !== tabIds.GENERAL ? <Button className='add-limit-button' tabId={tabIds.ADD_LIMIT_BUTTON} @@ -294,7 +294,7 @@ class LicenseKeyGroupsEditorView extends React.Component { {i18n('Add Limit')} </Button> : - <div></div> // Render empty div to not break tabs + <div key='empty_lm_tab_key'></div> // Render empty div to not break tabs } </Tabs> diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx index 70c04f01a3..a73a849a08 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx @@ -1,17 +1,17 @@ -/*! +/* * 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. * 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'; @@ -28,7 +28,7 @@ import SoftwareProductComponentsList from 'sdc-app/onboarding/softwareProduct/co const SoftwareProductPropType = PropTypes.shape({ name: PropTypes.string, description: PropTypes.string, - version: PropTypes.object, + version: PropTypes.string, id: PropTypes.string, categoryId: PropTypes.string, vendorId: PropTypes.string, @@ -57,7 +57,7 @@ class SoftwareProductLandingPageView extends React.Component { currentSoftwareProduct: SoftwareProductPropType, isReadOnlyMode: PropTypes.bool, componentsList: PropTypes.arrayOf(ComponentPropType), - version: PropTypes.string, + version: PropTypes.object, onDetailsSelect: PropTypes.func, onUpload: PropTypes.func, onUploadConfirmation: PropTypes.func, @@ -66,7 +66,7 @@ class SoftwareProductLandingPageView extends React.Component { onAddComponent: PropTypes.func }; componentDidMount() { - const {onCandidateInProcess, currentSoftwareProduct} = this.props; + const {onCandidateInProcess, currentSoftwareProduct} = this.props; if (currentSoftwareProduct.candidateOnboardingOrigin) { onCandidateInProcess(currentSoftwareProduct.id); } |