1 files changed, 51 insertions, 27 deletions

diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/LicenseModel.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/LicenseModel.js
index ad91a0da65..e21b0a81b0 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/LicenseModel.js
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/LicenseModel.js
@@ -1,30 +1,24 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-
 import {connect} from 'react-redux';
 
 import i18n from 'nfvo-utils/i18n/i18n.js';
-import {statusEnum as versionStatusEnum} from 'nfvo-components/panel/versionController/VersionControllerConstants.js';
 import VersionControllerUtils from 'nfvo-components/panel/versionController/VersionControllerUtils.js';
 import TabulatedEditor from 'src/nfvo-components/editor/TabulatedEditor.jsx';
-
+import ActivityLogActionHelper from 'nfvo-components/activity-log/ActivityLogActionHelper.js';
 import {enums} from 'sdc-app/onboarding/OnboardingConstants.js';
 import OnboardingActionHelper from 'sdc-app/onboarding/OnboardingActionHelper.js';
 
@@ -45,6 +39,11 @@ const buildNavigationBarProps = (licenseModel, screen) => {
 		name: vendorName,
 		items: [
 			{
+				id: navigationItems.LICENSE_MODEL_OVERVIEW,
+				name: i18n('Overview'),
+				meta
+			},
+			{
 				id: navigationItems.LICENSE_AGREEMENTS,
 				name: i18n('License Agreements'),
 				meta
@@ -63,15 +62,22 @@ const buildNavigationBarProps = (licenseModel, screen) => {
 				id: navigationItems.LICENSE_KEY_GROUPS,
 				name: i18n('License Key Groups'),
 				meta
+			},
+			{
+				id: navigationItems.ACTIVITY_LOG,
+				name: i18n('Activity Log'),
+				meta
 			}
 		]
 	}];
 
 	const activeItemId = ({
+		[enums.SCREEN.LICENSE_MODEL_OVERVIEW]: navigationItems.LICENSE_MODEL_OVERVIEW,
 		[enums.SCREEN.LICENSE_AGREEMENTS]: navigationItems.LICENSE_AGREEMENTS,
 		[enums.SCREEN.FEATURE_GROUPS]: navigationItems.FEATURE_GROUPS,
 		[enums.SCREEN.ENTITLEMENT_POOLS]: navigationItems.ENTITLEMENT_POOLS,
-		[enums.SCREEN.LICENSE_KEY_GROUPS]: navigationItems.LICENSE_KEY_GROUPS
+		[enums.SCREEN.LICENSE_KEY_GROUPS]: navigationItems.LICENSE_KEY_GROUPS,
+		[enums.SCREEN.ACTIVITY_LOG]: navigationItems.ACTIVITY_LOG
 	})[screen];
 
 	return {
@@ -82,9 +88,7 @@ const buildNavigationBarProps = (licenseModel, screen) => {
 
 const buildVersionControllerProps = (licenseModel) => {
 	let {version, viewableVersions, status: currentStatus, lockingUser} = licenseModel;
-	let {status, isCheckedOut} = (currentStatus === versionStatusEnum.CHECK_OUT_STATUS) ?
-		VersionControllerUtils.getCheckOutStatusKindByUserID(currentStatus, lockingUser) :
-		{status: currentStatus, isCheckedOut: false};
+	let {status, isCheckedOut} = VersionControllerUtils.getCheckOutStatusKindByUserID(currentStatus, lockingUser);
 
 	return {
 		version,
@@ -104,29 +108,46 @@ const mapStateToProps = ({licenseModel: {licenseModelEditor}}, {currentScreen: {
 
 
 const mapActionsToProps = (dispatch, {currentScreen: {screen, props: {licenseModelId}}}) => {
+
 	return {
-		onVersionControllerAction: action =>
-			LicenseModelActionHelper.performVCAction(dispatch, {licenseModelId, action}).then(() => {
+		onVersionControllerAction: (action, version) =>
+			LicenseModelActionHelper.performVCAction(dispatch, {licenseModelId, action, version}).then((newVersion) => {
 				switch(screen) {
+					case enums.SCREEN.LICENSE_MODEL_OVERVIEW:
+						/**
+						 * TODO change to specific rest
+						 */
+						LicenseAgreementActionHelper.fetchLicenseAgreementList(dispatch, {licenseModelId, version: newVersion});
+						break;
 					case enums.SCREEN.LICENSE_AGREEMENTS:
-						LicenseAgreementActionHelper.fetchLicenseAgreementList(dispatch, {licenseModelId});
+						LicenseAgreementActionHelper.fetchLicenseAgreementList(dispatch, {licenseModelId, version: newVersion});
 						break;
 					case enums.SCREEN.FEATURE_GROUPS:
-						FeatureGroupsActionHelper.fetchFeatureGroupsList(dispatch, {licenseModelId});
+						FeatureGroupsActionHelper.fetchFeatureGroupsList(dispatch, {licenseModelId, version: newVersion});
 						break;
 					case enums.SCREEN.ENTITLEMENT_POOLS:
-						EntitlementPoolsActionHelper.fetchEntitlementPoolsList(dispatch, {licenseModelId});
+						EntitlementPoolsActionHelper.fetchEntitlementPoolsList(dispatch, {licenseModelId, version: newVersion});
 						break;
 					case enums.SCREEN.LICENSE_KEY_GROUPS:
-						LicenseKeyGroupsActionHelper.fetchLicenseKeyGroupsList(dispatch, {licenseModelId});
+						LicenseKeyGroupsActionHelper.fetchLicenseKeyGroupsList(dispatch, {licenseModelId, version: newVersion});
+						break;
+					case enums.SCREEN.ACTIVITY_LOG:
+						ActivityLogActionHelper.fetchActivityLog(dispatch, {itemId: licenseModelId, versionId: newVersion.id});
 						break;
 				}
 			}),
-		onVersionSwitching: version => LicenseAgreementActionHelper.switchVersion(dispatch, {licenseModelId, version}),
-		onClose: () => OnboardingActionHelper.navigateToOnboardingCatalog(dispatch),
+		onVersionSwitching: version => {
+			LicenseModelActionHelper.switchVersion(dispatch, {licenseModelId, version});
+			if(screen === enums.SCREEN.ACTIVITY_LOG) {
+				ActivityLogActionHelper.fetchActivityLog(dispatch, {itemId: licenseModelId, versionId: version.id});
+			}
+		},
 
 		onNavigate: ({id, meta: {version}}) => {
 			switch(id) {
+				case navigationItems.LICENSE_MODEL_OVERVIEW:
+					OnboardingActionHelper.navigateToLicenseModelOverview(dispatch, {licenseModelId, version});
+					break;
 				case navigationItems.LICENSE_AGREEMENTS:
 					OnboardingActionHelper.navigateToLicenseAgreements(dispatch, {licenseModelId, version});
 					break;
@@ -139,6 +160,9 @@ const mapActionsToProps = (dispatch, {currentScreen: {screen, props: {licenseMod
 				case navigationItems.LICENSE_KEY_GROUPS:
 					OnboardingActionHelper.navigateToLicenseKeyGroups(dispatch, {licenseModelId, version});
 					break;
+				case navigationItems.ACTIVITY_LOG:
+					OnboardingActionHelper.navigateToLicenseModelActivityLog(dispatch, {licenseModelId, version});
+					break;
 			}
 		}
 	};