1 files changed, 98 insertions, 86 deletions

diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js b/openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js
index 9535147a46..a1e0018114 100644
--- a/openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js
+++ b/openecomp-ui/src/sdc-app/onboarding/onboard/Onboard.js
@@ -14,109 +14,121 @@
  * limitations under the License.
  */
 
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
 import OnboardView from './OnboardView.jsx';
 import OnboardingCatalogActionHelper from './onboardingCatalog/OnboardingCatalogActionHelper.js';
 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 {tabsMapping} from './onboardingCatalog/OnboardingCatalogConstants.js';
-import {itemsType} from './filter/FilterConstants.js';
+import { tabsMapping } from './onboardingCatalog/OnboardingCatalogConstants.js';
+import { itemsType } from './filter/FilterConstants.js';
 
 export const mapStateToProps = ({
-	onboard: {
-		onboardingCatalog,
-		activeTab,
-		searchValue,
-		filter
-	},
-	licenseModelList,
-	users,
-	archivedLicenseModelList,
-	archivedSoftwareProductList,
-	finalizedLicenseModelList,
-	softwareProductList,
-	finalizedSoftwareProductList
+    onboard: { onboardingCatalog, activeTab, searchValue, filter },
+    licenseModelList,
+    users,
+    archivedLicenseModelList,
+    archivedSoftwareProductList,
+    finalizedLicenseModelList,
+    softwareProductList,
+    finalizedSoftwareProductList
 }) => {
+    const fullSoftwareProducts = softwareProductList
+        .filter(
+            vsp =>
+                !finalizedSoftwareProductList.find(fvsp => fvsp.id === vsp.id)
+        )
+        .concat(finalizedSoftwareProductList);
 
-	const fullSoftwareProducts = softwareProductList.filter(vsp =>
-		!finalizedSoftwareProductList
-			.find(fvsp => fvsp.id === vsp.id)
-	).concat(finalizedSoftwareProductList);
+    const reduceLicenseModelList = (accum, vlm) => {
+        let currentSoftwareProductList = sortByStringProperty(
+            fullSoftwareProducts.filter(vsp => vsp.vendorId === vlm.id),
+            'name'
+        );
+        accum.push({ ...vlm, softwareProductList: currentSoftwareProductList });
+        return accum;
+    };
 
-	const reduceLicenseModelList = (accum, vlm) => {
-		let currentSoftwareProductList = sortByStringProperty(
-			fullSoftwareProducts
-				.filter(vsp => vsp.vendorId === vlm.id),
-			'name'
-		);
-		accum.push({...vlm, softwareProductList: currentSoftwareProductList});
-		return accum;
-	};
+    licenseModelList = sortByStringProperty(
+        licenseModelList.reduce(reduceLicenseModelList, []),
+        'name'
+    );
 
-	licenseModelList = sortByStringProperty(
-		licenseModelList
-			.reduce(reduceLicenseModelList, []),
-		'name'
-	);
+    finalizedLicenseModelList = sortByStringProperty(
+        finalizedLicenseModelList.reduce(reduceLicenseModelList, []),
+        'name'
+    );
 
-	finalizedLicenseModelList = sortByStringProperty(
-		finalizedLicenseModelList
-			.reduce(reduceLicenseModelList, []),
-		'name'
-	);
+    const fullLicenseModelList = licenseModelList
+        .filter(
+            vlm => !finalizedLicenseModelList.find(fvlm => fvlm.id === vlm.id)
+        )
+        .concat(finalizedLicenseModelList);
 
-	const fullLicenseModelList = licenseModelList.filter(vlm =>
-		!finalizedLicenseModelList
-			.find(fvlm => fvlm.id === vlm.id)
-	).concat(finalizedLicenseModelList);
-
-	let {activeTab: catalogActiveTab, vendorCatalog: {vspOverlay, selectedVendor}} = onboardingCatalog;
-	if (filter.byVendorView) {
-		catalogActiveTab = tabsMapping.BY_VENDOR;
-	} 
-	else if (filter.itemsType && filter.itemsType === itemsType.ARCHIVED) {
-		catalogActiveTab = tabsMapping.ARCHIVE;
-	}
-
-	return {
-		finalizedLicenseModelList,
-		finalizedSoftwareProductList,
-		licenseModelList,
-		softwareProductList,
-		archivedLicenseModelList,
-		archivedSoftwareProductList,
-		fullLicenseModelList,
-		activeTab,
-		catalogActiveTab,
-		searchValue,
-		vspOverlay,
-		selectedVendor,
-		users: users.usersList
-	};
+    let {
+        activeTab: catalogActiveTab,
+        vendorCatalog: { vspOverlay, selectedVendor }
+    } = onboardingCatalog;
+    if (filter.byVendorView) {
+        catalogActiveTab = tabsMapping.BY_VENDOR;
+    } else if (filter.itemsType && filter.itemsType === itemsType.ARCHIVED) {
+        catalogActiveTab = tabsMapping.ARCHIVE;
+    }
 
+    return {
+        finalizedLicenseModelList,
+        finalizedSoftwareProductList,
+        licenseModelList,
+        softwareProductList,
+        archivedLicenseModelList,
+        archivedSoftwareProductList,
+        fullLicenseModelList,
+        activeTab,
+        catalogActiveTab,
+        searchValue,
+        vspOverlay,
+        selectedVendor,
+        users: users.usersList
+    };
 };
 
-const mapActionsToProps = (dispatch) => {
-
-	return {
-		onSelectLicenseModel({id: licenseModelId, name}, users, tab) {
-			OnboardActionHelper.loadVLMScreen(dispatch, {id: licenseModelId, name}, users, tab);
-		},
-		onSelectSoftwareProduct(softwareProduct, users, tab) {
-			OnboardActionHelper.loadVSPScreen(dispatch, softwareProduct, users, tab);
-		},
-		onAddSoftwareProductClick: (vendorId) => SoftwareProductCreationActionHelper.open(dispatch, vendorId),
-		onAddLicenseModelClick: () => LicenseModelCreationActionHelper.open(dispatch),
-		onVspOverlayChange: (vendor) => OnboardingCatalogActionHelper.changeVspOverlay(dispatch, vendor),
-		closeVspOverlay: () => OnboardingCatalogActionHelper.closeVspOverlay(dispatch),
-		onCatalogTabClick: (tab) => OnboardingCatalogActionHelper.changeActiveTab(dispatch, tab),
-		onTabClick: (tab) => OnboardActionHelper.changeActiveTab(dispatch, tab),
-		onSearch: (searchValue) => OnboardActionHelper.changeSearchValue(dispatch, searchValue),
-		onVendorSelect: (vendor) => OnboardingCatalogActionHelper.onVendorSelect(dispatch, {vendor}),
-		onMigrate: ({softwareProduct}) => OnboardingCatalogActionHelper.onMigrate(dispatch, softwareProduct)
-	};
+const mapActionsToProps = dispatch => {
+    return {
+        onSelectLicenseModel({ id: licenseModelId, name }, users, tab) {
+            OnboardActionHelper.loadVLMScreen(
+                dispatch,
+                { id: licenseModelId, name },
+                users,
+                tab
+            );
+        },
+        onSelectSoftwareProduct(softwareProduct, users, tab) {
+            OnboardActionHelper.loadVSPScreen(
+                dispatch,
+                softwareProduct,
+                users,
+                tab
+            );
+        },
+        onAddSoftwareProductClick: vendorId =>
+            SoftwareProductCreationActionHelper.open(dispatch, vendorId),
+        onAddLicenseModelClick: () =>
+            LicenseModelCreationActionHelper.open(dispatch),
+        onVspOverlayChange: vendor =>
+            OnboardingCatalogActionHelper.changeVspOverlay(dispatch, vendor),
+        closeVspOverlay: () =>
+            OnboardingCatalogActionHelper.closeVspOverlay(dispatch),
+        onCatalogTabClick: tab =>
+            OnboardingCatalogActionHelper.changeActiveTab(dispatch, tab),
+        onTabClick: tab => OnboardActionHelper.changeActiveTab(dispatch, tab),
+        onSearch: searchValue =>
+            OnboardActionHelper.changeSearchValue(dispatch, searchValue),
+        onVendorSelect: vendor =>
+            OnboardingCatalogActionHelper.onVendorSelect(dispatch, { vendor }),
+        onMigrate: ({ softwareProduct }) =>
+            OnboardingCatalogActionHelper.onMigrate(dispatch, softwareProduct)
+    };
 };
 
 export default connect(mapStateToProps, mapActionsToProps)(OnboardView);