diff options
| author |   ilanap <ilanap@amdocs.com> | 2017-11-07 11:54:10 +0200 |
|---|---|---|
| committer | ilanap <ilanap@amdocs.com> | 2017-11-07 11:59:26 +0200 |
| commit | c6a41de2f5a2e3217c8364dcd27f297069fc005f (patch) | |
| tree | 5e83c950a7ff6c384973ef44e6c4246a9d618505 /openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/LicenseModelOverview.js | |
| parent | d5fdfc4e67ba9839e680fa685134660659356c68 (diff) | |
Update VLM Overview tab behavior
Issue-ID: SDC-637
Change-Id: I30211422b9af72a8e2dc4fd58713145878881555
Signed-off-by: ilanap <ilanap@amdocs.com>
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/LicenseModelOverview.js')
| -rw-r--r-- | openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/LicenseModelOverview.js | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/LicenseModelOverview.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/LicenseModelOverview.js index 1ca4f37988..9d714ec62d 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/LicenseModelOverview.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/LicenseModelOverview.js @@ -128,17 +128,18 @@ export const mapStateToProps = ({licenseModel: {licenseModelEditor, entitlementP modalHeader = overviewEditorHeaders.LICENSE_KEY_GROUP; isDisplayModal = true; } - - if (licenseModelOverview.selectedTab === selectedButton.NOT_IN_USE) { - licensingDataList = [ - ...featureGroup.featureGroupsList.reduce(checkFG, []), - ...entitlementPool.entitlementPoolsList.reduce(checkEP, []), - ...licenseKeyGroup.licenseKeyGroupsList.reduce(checkLG, []) - ]; - }else { - licensingDataList = licenseAgreement.licenseAgreementList && licenseAgreement.licenseAgreementList.length ? licenseAgreement.licenseAgreementList.map(mapLicenseAgreementData) : []; + let orphanDataList = [ + ...featureGroup.featureGroupsList.reduce(checkFG, []), + ...entitlementPool.entitlementPoolsList.reduce(checkEP, []), + ...licenseKeyGroup.licenseKeyGroupsList.reduce(checkLG, []) + ]; + + licensingDataList = licenseAgreement.licenseAgreementList && licenseAgreement.licenseAgreementList.length ? licenseAgreement.licenseAgreementList.map(mapLicenseAgreementData) : []; + let selectedTab = licenseModelOverview.selectedTab; + // on first entry, we will decide what tab to open depending on data. if there are no connections, we will open the orphans + if (selectedTab === null) { + selectedTab = (licensingDataList.length) ? selectedButton.VLM_LIST_VIEW : selectedButton.NOT_IN_USE; } - return { isReadOnlyMode: VersionControllerUtils.isReadOnly(licenseModelEditor.data), isDisplayModal, @@ -146,8 +147,8 @@ export const mapStateToProps = ({licenseModel: {licenseModelEditor, entitlementP licenseModelId: licenseModelEditor.data.id, version: licenseModelEditor.data.version, licensingDataList, - selectedTab: licenseModelOverview.selectedTab - + orphanDataList, + selectedTab }; }; |