diff options
author | svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com> | 2018-08-06 23:08:39 +0300 |
---|---|---|
committer | Einav Keidar <einavw@amdocs.com> | 2018-08-07 07:55:38 +0000 |
commit | 8f13330349a9a78b4cd2e32218237955f86fb4d8 (patch) | |
tree | fdf41c5cf34419c5d6e67bdabed877017e2c2656 /openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups | |
parent | a53629a4c022f8cbfca7d7ead1c13ae7d30042e9 (diff) |
ui user feedback 1810
Enhance LKG & EP to include MRN
Enhance EP & LKG UI to display Invariant UUID & UUID
Remove MRN from FG
Issue-ID: SDC-1524
Change-Id: Id6259f746ba4b4dcd5684d58d66f0df769107589
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups')
3 files changed, 7 insertions, 53 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditorView.jsx index fc8269332a..d80eb9a0ab 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditorView.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. @@ -46,10 +46,10 @@ const GeneralTab = ({ genericFieldInfo, validateName }) => { - let { name, description, partNumber, manufacturerReferenceNumber } = data; + let { name, description, partNumber } = data; return ( <GridSection hasLastColSet> - <GridItem colSpan={2}> + <GridItem colSpan={4}> <Input groupClassName="field-section" onChange={name => @@ -67,7 +67,7 @@ const GeneralTab = ({ errorText={genericFieldInfo.name.errorText} /> </GridItem> - <GridItem colSpan={2} lastColInRow> + <GridItem colSpan={4} lastColInRow strech> <Input groupClassName="field-section" className="description-field" @@ -83,7 +83,7 @@ const GeneralTab = ({ errorText={genericFieldInfo.description.errorText} /> </GridItem> - <GridItem colSpan={2}> + <GridItem colSpan={4}> <Input groupClassName="field-section" onChange={partNumber => @@ -98,28 +98,6 @@ const GeneralTab = ({ errorText={genericFieldInfo.partNumber.errorText} /> </GridItem> - <GridItem colSpan={2} lastColInRow> - <Input - groupClassName="field-section" - onChange={manufacturerReferenceNumber => - onDataChanged( - { manufacturerReferenceNumber }, - FG_EDITOR_FORM - ) - } - label={i18n('Manufacturer Reference Number')} - data-test-id="create-fg-reference-number" - value={manufacturerReferenceNumber} - isRequired={true} - type="text" - isValid={ - genericFieldInfo.manufacturerReferenceNumber.isValid - } - errorText={ - genericFieldInfo.manufacturerReferenceNumber.errorText - } - /> - </GridItem> </GridSection> ); }; diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupListEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupListEditorView.jsx index 91f77b3111..92468a3b86 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupListEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupListEditorView.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. @@ -107,7 +107,6 @@ class FeatureGroupListEditorView extends React.Component { let { name, description, - manufacturerReferenceNumber, entitlementPoolsIds = [], licenseKeyGroupsIds = [] } = listItem; @@ -139,18 +138,6 @@ class FeatureGroupListEditorView extends React.Component { </div> </div> </div> - - <div className="list-editor-item-view-field"> - <div className="feature-groups-count-field"> - <div className="title title-no-wrap"> - {i18n('Manufacturer Reference Number')} - </div> - <div className="feature-groups-mrn-ep"> - {manufacturerReferenceNumber} - </div> - </div> - </div> - <div className="list-editor-item-view-field"> <div className="title">{i18n('Description')}</div> <div className="text description">{description}</div> diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupsEditorReducer.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupsEditorReducer.js index aa1081ed20..f6b9a86f7a 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupsEditorReducer.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupsEditorReducer.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. @@ -45,17 +45,6 @@ export default (state = {}, action) => { FeatureGroupStateConstants .SELECTED_FEATURE_GROUP_TAB.GENERAL }, - manufacturerReferenceNumber: { - isValid: true, - errorText: '', - validations: [ - { type: 'required', data: true }, - { type: 'maxLength', data: 100 } - ], - tabId: - FeatureGroupStateConstants - .SELECTED_FEATURE_GROUP_TAB.GENERAL - }, name: { isValid: true, errorText: '', |