diff options
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems')
3 files changed, 29 insertions, 23 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/EntitlementPool.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/EntitlementPool.jsx index 60eba401c7..ec5c76bd79 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/EntitlementPool.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/EntitlementPool.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. @@ -27,7 +27,13 @@ import { class EntitlementPool extends Component { render() { let { - epData: { name, description, thresholdValue, thresholdUnits }, + epData: { + name, + description, + thresholdValue, + thresholdUnits, + manufacturerReferenceNumber + }, isOrphan } = this.props; return ( @@ -49,6 +55,13 @@ class EntitlementPool extends Component { )}`} /> )} + {manufacturerReferenceNumber && ( + <AdditionalDataElement + className="vlm-list-item-entitlement-metric" + name={i18n('Manufacturer Reference Number')} + value={manufacturerReferenceNumber} + /> + )} </AdditionalDataCol> </div> ); diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/FeatureGroup.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/FeatureGroup.jsx index df1d813408..7ef5b2a746 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/FeatureGroup.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/FeatureGroup.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. @@ -19,20 +19,10 @@ import ArrowCol from './listItemsComponents/ArrowCol.jsx'; import ItemInfo from './listItemsComponents/ItemInfo.jsx'; import IconCol from './listItemsComponents/IconCol.jsx'; import i18n from 'nfvo-utils/i18n/i18n.js'; -import { - AdditionalDataCol, - AdditionalDataElement -} from './listItemsComponents/AdditionalDataCol.jsx'; - class FeatureGroup extends Component { render() { let { - fgData: { - name, - manufacturerReferenceNumber, - description, - children = [] - }, + fgData: { name, description, children = [] }, isCollapsed, onClick, isOrphan @@ -80,13 +70,6 @@ class FeatureGroup extends Component { </span> </div> </ItemInfo> - <AdditionalDataCol> - <AdditionalDataElement - name={i18n('Manufacturer Reference Number')} - value={manufacturerReferenceNumber} - className="vlm-list-item-sku" - /> - </AdditionalDataCol> </div> ); } diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/LicenseKeyGroup.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/LicenseKeyGroup.jsx index 79f0eb28d2..8343c231b5 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/LicenseKeyGroup.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/listItems/LicenseKeyGroup.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. @@ -26,7 +26,10 @@ import { class LicenseKeyGroup extends Component { render() { - let { lkgData: { name, description, type }, isOrphan } = this.props; + let { + lkgData: { name, description, type, manufacturerReferenceNumber }, + isOrphan + } = this.props; return ( <div className={`vlm-list-item vlm-list-item-lkg ${ @@ -42,6 +45,13 @@ class LicenseKeyGroup extends Component { name={i18n('Type')} value={extractValue(type)} /> + {manufacturerReferenceNumber && ( + <AdditionalDataElement + className="vlm-list-item-entitlement-metric" + name={i18n('Manufacturer Reference Number')} + value={manufacturerReferenceNumber} + /> + )} </AdditionalDataCol> </div> ); |