ui support for archive items

Issue-ID: SDC-1088
Change-Id: I836e4896a8ec6bb065f9d2571f514916ccf6759f
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>

3 files changed, 143 insertions, 176 deletions

diff --git a/openecomp-ui/src/sdc-app/common/helpers/ItemsHelper.js b/openecomp-ui/src/sdc-app/common/helpers/ItemsHelper.js
index b82bc92017..05affe981f 100644
--- a/openecomp-ui/src/sdc-app/common/helpers/ItemsHelper.js
+++ b/openecomp-ui/src/sdc-app/common/helpers/ItemsHelper.js
@@ -18,6 +18,19 @@ import Configuration from 'sdc-app/config/Configuration.js';
 import {permissionTypes} from 'sdc-app/onboarding/permissions/PermissionsConstants.js';
 import {actionsEnum as VersionControllerActionsEnum} from 'nfvo-components/panel/versionController/VersionControllerConstants.js';
 import {actionTypes as onboardingActionTypes} from 'sdc-app/onboarding/OnboardingConstants.js';
+import restToggle from 'sdc-app/features/restToggle.js';
+import {featureToggleNames} from 'sdc-app/features/FeaturesConstants.js';
+export const archiveActions = {
+	ARCHIVE: 'ARCHIVE',
+	RESTORE: 'RESTORE'
+};
+
+export const itemStatus = {
+	ARCHIVED: 'ARCHIVED',
+	DRAFT: 'Draft',
+	CERTIFIED: 'Certified'
+};
+
 
 function baseUrl() {
 	const restPrefix = Configuration.get('restPrefix');
@@ -58,21 +71,36 @@ const ItemsHelper = {
 		return RestAPIUtil.put(`${baseUrl()}/${itemId}/permissions/${permissionTypes.OWNER}`, {removedUsersIds: [], addedUsersIds: [ownerId]});
 	},
 
-	checkItemStatus(dispatch, {itemId, versionId}) {
-		return ItemsHelper.fetchVersion({itemId, versionId}).then(response => {
-			let state = response && response.state || {};
-			const {baseId, description, id, name, status} = response;
-
-			dispatch({
-				type: onboardingActionTypes.UPDATE_ITEM_STATUS,
-				itemState: state,
-				itemStatus: response.status,
-				updatedVersion: {baseId, description, id, name, status}
-			});
-			return Promise.resolve(response);
+	async checkItemStatus(dispatch, {itemId, versionId}) {
+		const response = await ItemsHelper.fetchVersion({itemId, versionId});
+		let state = response && response.state || {};
+		const {baseId, description, id, name, status} = response;
+		const item = await ItemsHelper.fetchItem(itemId);
+		dispatch({
+			type: onboardingActionTypes.UPDATE_ITEM_STATUS,
+			itemState: state,
+			itemStatus: response.status,
+			archivedStatus: item.status,
+			updatedVersion: {baseId, description, id, name, status}
 		});
 
+		return Promise.resolve({...response, archivedStatus: item.status});
 	},
+
+	fetchItem(itemId) {
+		return restToggle({restFunction: () => RestAPIUtil.fetch(`${baseUrl()}/${itemId}`), featureName: featureToggleNames.ARCHIVE_ITEM, mockResult: {}});
+	},
+
+	archiveItem(itemId) {
+		return RestAPIUtil.put(`${baseUrl()}/${itemId}/actions`, {
+			action: archiveActions.ARCHIVE
+		});
+	},
+	restoreItem(itemId) {
+		return RestAPIUtil.put(`${baseUrl()}/${itemId}/actions`, {
+			action: archiveActions.RESTORE
+		});
+	}
 };
 
 export default ItemsHelper;
diff --git a/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js b/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js
index ecee47d8b0..7c05f8456b 100644
--- a/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js
+++ b/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js
@@ -8,16 +8,17 @@ import i18n from 'nfvo-utils/i18n/i18n.js';
 import {actionTypes as modalActionTypes} from 'nfvo-components/modal/GlobalModalConstants.js';
 
 const ScreensHelper = {
-	loadScreen(dispatch, {screen, screenType, props}) {
+	async loadScreen(dispatch, {screen, screenType, props}) {
 		if(screen === enums.SCREEN.ONBOARDING_CATALOG) {
 			OnboardingActionHelper.navigateToOnboardingCatalog(dispatch);
 			return;
 		}
-
+		
 		screenType = !screenType ? this.getScreenType(screen) : screenType;
 
 		if(screenType === screenTypes.LICENSE_MODEL) {
 			const {licenseModelId, version, licenseModel, usersList} = props;
+			const item = await ItemsHelper.fetchItem(licenseModelId);
 			let itemStatusPromise = version && screen ?
 				ItemsHelper.checkItemStatus(dispatch, {itemId: licenseModelId, versionId: version.id}) :
 				Promise.resolve();
@@ -34,24 +35,25 @@ const ScreensHelper = {
 					versionPageActionHelper.fetchVersions(dispatch, {itemType: itemTypes.LICENSE_MODEL, itemId: licenseModelId});
 				}
 				let newVersion = updatedVersion ? updatedVersion : version;
+				const screenProps = {licenseModelId, version: newVersion, status: item.status};
 				switch (screen) {
 					case enums.SCREEN.LICENSE_MODEL_OVERVIEW:
-						OnboardingActionHelper.navigateToLicenseModelOverview(dispatch, {licenseModelId, version: newVersion});
+						OnboardingActionHelper.navigateToLicenseModelOverview(dispatch, screenProps);
 						break;
 					case enums.SCREEN.LICENSE_AGREEMENTS:
-						OnboardingActionHelper.navigateToLicenseAgreements(dispatch, {licenseModelId, version: newVersion});
+						OnboardingActionHelper.navigateToLicenseAgreements(dispatch, screenProps);
 						break;
 					case enums.SCREEN.FEATURE_GROUPS:
-						OnboardingActionHelper.navigateToFeatureGroups(dispatch, {licenseModelId, version: newVersion});
+						OnboardingActionHelper.navigateToFeatureGroups(dispatch, screenProps);
 						break;
 					case enums.SCREEN.ENTITLEMENT_POOLS:
-						OnboardingActionHelper.navigateToEntitlementPools(dispatch, {licenseModelId, version: newVersion});
+						OnboardingActionHelper.navigateToEntitlementPools(dispatch, screenProps);
 						break;
 					case enums.SCREEN.LICENSE_KEY_GROUPS:
-						OnboardingActionHelper.navigateToLicenseKeyGroups(dispatch, {licenseModelId, version: newVersion});
+						OnboardingActionHelper.navigateToLicenseKeyGroups(dispatch, screenProps);
 						break;
 					case enums.SCREEN.ACTIVITY_LOG:
-						OnboardingActionHelper.navigateToLicenseModelActivityLog(dispatch, {licenseModelId, version: newVersion});
+						OnboardingActionHelper.navigateToLicenseModelActivityLog(dispatch, screenProps);
 						break;
 					case enums.SCREEN.VERSIONS_PAGE:
 					default:
@@ -68,6 +70,7 @@ const ScreensHelper = {
 
 		else if(screenType === screenTypes.SOFTWARE_PRODUCT) {
 			const {softwareProductId, componentId, version, softwareProduct, usersList} = props;
+			const item = await ItemsHelper.fetchItem(softwareProductId);
 			let itemStatusPromise = version && screen ?
 				ItemsHelper.checkItemStatus(dispatch, {itemId: softwareProductId, versionId: version.id}) :
 				Promise.resolve();
@@ -85,162 +88,94 @@ const ScreensHelper = {
 				}
 
 				let newVersion = updatedVersion ? updatedVersion : version;
+				
+				const props = {
+					softwareProductId,
+					componentId,
+					version: newVersion,
+					status: item.status
+				};
 				if (screen === screenTypes.SOFTWARE_PRODUCT_COMPONENT_DEFAULT_GENERAL) {
-					OnboardingActionHelper.navigateToSoftwareProductComponentGeneralAndUpdateLeftPanel(dispatch, {
-						softwareProductId,
-						componentId,
-						version: newVersion
-					});
+					OnboardingActionHelper.navigateToSoftwareProductComponentGeneralAndUpdateLeftPanel(dispatch, props);
 				}
-				if (componentId) {
-					switch (screen) {
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS:
-							OnboardingActionHelper.navigateToSoftwareProductComponentGeneralAndUpdateLeftPanel(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_GENERAL:
-							OnboardingActionHelper.navigateToSoftwareProductComponentGeneral(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_COMPUTE:
-							OnboardingActionHelper.navigateToComponentCompute(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_LOAD_BALANCING:
-							OnboardingActionHelper.navigateToComponentLoadBalancing(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_NETWORK:
-							OnboardingActionHelper.navigateToComponentNetwork(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_STORAGE:
-							OnboardingActionHelper.navigateToComponentStorage(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_PROCESSES:
-							OnboardingActionHelper.navigateToSoftwareProductComponentProcesses(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_MONITORING:
-							OnboardingActionHelper.navigateToSoftwareProductComponentMonitoring(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_IMAGES:
-							OnboardingActionHelper.navigateToComponentImages(dispatch, {
-								softwareProductId,
-								componentId,
-								version: newVersion
-							});
-							break;
-					}
-				}
-				else {
-					switch (screen) {
-						case enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE:
-							OnboardingActionHelper.navigateToSoftwareProductLandingPage(dispatch, {
-								softwareProductId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_DETAILS:
-							OnboardingActionHelper.navigateToSoftwareProductDetails(dispatch, {
-								softwareProductId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS_SETUP:
-							OnboardingActionHelper.navigateToSoftwareProductAttachmentsSetupTab(dispatch, {
-								softwareProductId,
-								version
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS_VALIDATION:
-							OnboardingActionHelper.navigateToSoftwareProductAttachmentsValidationTab(dispatch, {
-								softwareProductId,
-								version
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_PROCESSES:
-							OnboardingActionHelper.navigateToSoftwareProductProcesses(dispatch, {
-								softwareProductId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_DEPLOYMENT:
-							OnboardingActionHelper.navigateToSoftwareProductDeployment(dispatch, {
-								softwareProductId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_NETWORKS:
-							OnboardingActionHelper.navigateToSoftwareProductNetworks(dispatch, {
-								softwareProductId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_DEPENDENCIES:
-							OnboardingActionHelper.navigateToSoftwareProductDependencies(dispatch, {
-								softwareProductId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_ACTIVITY_LOG:
-							OnboardingActionHelper.navigateToSoftwareProductActivityLog(dispatch, {
-								softwareProductId,
-								version: newVersion
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS:
-							OnboardingActionHelper.navigateToSoftwareProductComponents(dispatch, {
-								softwareProductId,
-								version: newVersion
-							});
-							dispatch({
-								type: SoftwareProductActionTypes.TOGGLE_NAVIGATION_ITEM,
-								mapOfExpandedIds: {
-									[enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS]: true
-								}
-							});
-							break;
-						case enums.SCREEN.SOFTWARE_PRODUCT_VERSIONS_PAGE:
-						default:
-							OnboardingActionHelper.navigateToVersionsPage(dispatch, {
-								itemId: softwareProductId,
-								itemType: itemTypes.SOFTWARE_PRODUCT,
-								itemName: softwareProduct.name,
-								users: usersList,
-								additionalProps: {
-									licenseModelId: softwareProduct.vendorId,
-									licensingVersion: softwareProduct.licensingVersion
-								}
-							});
-							break;
-					}
+				
+				switch (screen) {
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS:
+						OnboardingActionHelper.navigateToSoftwareProductComponentGeneralAndUpdateLeftPanel(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_GENERAL:
+						OnboardingActionHelper.navigateToSoftwareProductComponentGeneral(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_COMPUTE:
+						OnboardingActionHelper.navigateToComponentCompute(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_LOAD_BALANCING:
+						OnboardingActionHelper.navigateToComponentLoadBalancing(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_NETWORK:
+						OnboardingActionHelper.navigateToComponentNetwork(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_STORAGE:
+						OnboardingActionHelper.navigateToComponentStorage(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_PROCESSES:
+						OnboardingActionHelper.navigateToSoftwareProductComponentProcesses(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_MONITORING:
+						OnboardingActionHelper.navigateToSoftwareProductComponentMonitoring(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_IMAGES:
+						OnboardingActionHelper.navigateToComponentImages(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE:
+						OnboardingActionHelper.navigateToSoftwareProductLandingPage(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_DETAILS:
+						OnboardingActionHelper.navigateToSoftwareProductDetails(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS_SETUP:
+						OnboardingActionHelper.navigateToSoftwareProductAttachmentsSetupTab(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS_VALIDATION:
+						OnboardingActionHelper.navigateToSoftwareProductAttachmentsValidationTab(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_PROCESSES:
+						OnboardingActionHelper.navigateToSoftwareProductProcesses(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_DEPLOYMENT:
+						OnboardingActionHelper.navigateToSoftwareProductDeployment(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_NETWORKS:
+						OnboardingActionHelper.navigateToSoftwareProductNetworks(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_DEPENDENCIES:
+						OnboardingActionHelper.navigateToSoftwareProductDependencies(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_ACTIVITY_LOG:
+						OnboardingActionHelper.navigateToSoftwareProductActivityLog(dispatch, props);
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS:
+						OnboardingActionHelper.navigateToSoftwareProductComponents(dispatch, props);
+						dispatch({
+							type: SoftwareProductActionTypes.TOGGLE_NAVIGATION_ITEM,
+							mapOfExpandedIds: {
+								[enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS]: true
+							}
+						});
+						break;
+					case enums.SCREEN.SOFTWARE_PRODUCT_VERSIONS_PAGE:
+					default:
+						OnboardingActionHelper.navigateToVersionsPage(dispatch, {
+							itemId: softwareProductId,
+							itemType: itemTypes.SOFTWARE_PRODUCT,
+							itemName: softwareProduct.name,
+							users: usersList,
+							additionalProps: {
+								licenseModelId: softwareProduct.vendorId,
+								licensingVersion: softwareProduct.licensingVersion
+							}
+						});
+						break;	
 				}
 			});
 		}
diff --git a/openecomp-ui/src/sdc-app/common/modal/ModalContentMapper.js b/openecomp-ui/src/sdc-app/common/modal/ModalContentMapper.js
index 487ada0d88..b17536f446 100644
--- a/openecomp-ui/src/sdc-app/common/modal/ModalContentMapper.js
+++ b/openecomp-ui/src/sdc-app/common/modal/ModalContentMapper.js
@@ -29,6 +29,7 @@ import CommitCommentModal from 'nfvo-components/panel/versionController/componen
 import Tree from 'nfvo-components/tree/Tree.jsx';
 import MergeEditor from 'sdc-app/common/merge/MergeEditor.js';
 import Revisions from 'sdc-app/onboarding/revisions/Revisions.js';
+import VendorSelector from 'sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsVendorSelector.jsx';
 
 export const modalContentMapper = {
 	SOFTWARE_PRODUCT_CREATION: 'SOFTWARE_PRODUCT_CREATION',
@@ -45,7 +46,9 @@ export const modalContentMapper = {
 	COMMIT_COMMENT: 'COMMIT_COMMENT',
 	VERSION_TREE: 'VERSION_TREE',
 	MERGE_EDITOR: 'MERGE_EDITOR',
-	REVISIONS_LIST: 'REVISIONS_LIST'
+	REVISIONS_LIST: 'REVISIONS_LIST',
+	VENDOR_SELECTOR: 'VENDOR_SELECTOR'
+
 };
 
 export const modalContentComponents = {
@@ -63,5 +66,6 @@ export const modalContentComponents = {
 	COMMIT_COMMENT: CommitCommentModal,
 	VERSION_TREE: Tree,
 	MERGE_EDITOR: MergeEditor,
-	REVISIONS_LIST: Revisions
+	REVISIONS_LIST: Revisions,
+	VENDOR_SELECTOR: VendorSelector
 };