From d411d156ac1960f059eb94ec5d7da8fa1a9edb86 Mon Sep 17 00:00:00 2001 From: miriame Date: Tue, 2 Jan 2018 15:35:55 +0200 Subject: select item from workspace- skipping versions page Change-Id: Iebd3bb33703c2d47265ba133f7b74ec961ba8b2f Issue-ID: SDC-864 Signed-off-by: miriame --- openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js') diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js b/openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js index 3422920b3a..a308e1ec5e 100644 --- a/openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js +++ b/openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js @@ -21,8 +21,6 @@ import OnboardActionHelper from './OnboardActionHelper.js'; import LicenseModelCreationActionHelper from '../licenseModel/creation/LicenseModelCreationActionHelper.js'; import SoftwareProductCreationActionHelper from '../softwareProduct/creation/SoftwareProductCreationActionHelper.js'; import sortByStringProperty from 'nfvo-utils/sortByStringProperty.js'; -import ScreensHelper from 'sdc-app/common/helpers/ScreensHelper.js'; -import {enums, screenTypes} from 'sdc-app/onboarding/OnboardingConstants.js'; export const mapStateToProps = ({ @@ -91,18 +89,11 @@ export const mapStateToProps = ({ const mapActionsToProps = (dispatch) => { return { - onSelectLicenseModel({id: licenseModelId, name}, users) { - ScreensHelper.loadScreen(dispatch, { - screen: enums.SCREEN.VERSIONS_PAGE, screenType: screenTypes.LICENSE_MODEL, - props: {licenseModelId, licenseModel: {name}, usersList: users} - }); + onSelectLicenseModel({id: licenseModelId, name}, users, tab) { + OnboardActionHelper.loadVLMScreen(dispatch, {id: licenseModelId, name}, users, tab); }, - onSelectSoftwareProduct(softwareProduct, users) { - let {id: softwareProductId, vendorId: licenseModelId, licensingVersion, name} = softwareProduct; - ScreensHelper.loadScreen(dispatch, { - screen: enums.SCREEN.SOFTWARE_PRODUCT_VERSIONS_PAGE, screenType: screenTypes.SOFTWARE_PRODUCT, - props: {softwareProductId, softwareProduct: {name, vendorId: licenseModelId, licensingVersion}, usersList: users} - }); + onSelectSoftwareProduct(softwareProduct, users, tab) { + OnboardActionHelper.loadVSPScreen(dispatch, softwareProduct, users, tab); }, onAddSoftwareProductClick: (vendorId) => SoftwareProductCreationActionHelper.open(dispatch, vendorId), onAddLicenseModelClick: () => LicenseModelCreationActionHelper.open(dispatch), -- cgit 1.2.3-korg