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/common/helpers/ScreensHelper.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js') diff --git a/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js b/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js index d8fa02664f..ecee47d8b0 100644 --- a/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js +++ b/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js @@ -277,13 +277,13 @@ const ScreensHelper = { } }, - loadLandingScreen(dispatch, {previousScreenName, props: {licenseModelId, softwareProductId, version}}) { - const screenType = this.getScreenType(previousScreenName); - let screen = screenType === screenTypes.SOFTWARE_PRODUCT ? + loadLandingScreen(dispatch, {previousScreenName, screenType, props: {licenseModelId, softwareProductId, version}}) { + let selectedScreenType = screenType ? screenType : this.getScreenType(previousScreenName); + let screen = selectedScreenType === screenTypes.SOFTWARE_PRODUCT ? enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE : enums.SCREEN.LICENSE_MODEL_OVERVIEW; let props = {licenseModelId, softwareProductId, version}; - return this.loadScreen(dispatch, {screen, screenType, props}); + return this.loadScreen(dispatch, {screen, screenType: selectedScreenType, props}); } }; -- cgit 1.2.3-korg