1 files changed, 79 insertions, 47 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreation.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreation.js
index 569b33f999..41584d94e2 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreation.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreation.js
@@ -13,64 +13,96 @@
  * or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
 
 import SoftwareProductCreationActionHelper from './SoftwareProductCreationActionHelper.js';
 import SoftwareProductCreationView from './SoftwareProductCreationView.jsx';
 import ValidationHelper from 'sdc-app/common/helpers/ValidationHelper.js';
-import SoftwareProductActionHelper  from '../SoftwareProductActionHelper.js';
+import SoftwareProductActionHelper from '../SoftwareProductActionHelper.js';
 import VersionsPageActionHelper from 'sdc-app/onboarding/versionsPage/VersionsPageActionHelper.js';
-import {itemTypes as versionItemTypes} from 'sdc-app/onboarding/versionsPage/VersionsPageConstants.js';
+import { itemTypes as versionItemTypes } from 'sdc-app/onboarding/versionsPage/VersionsPageConstants.js';
 import ScreensHelper from 'sdc-app/common/helpers/ScreensHelper.js';
-import {enums, screenTypes} from 'sdc-app/onboarding/OnboardingConstants.js';
+import { enums, screenTypes } from 'sdc-app/onboarding/OnboardingConstants.js';
 import PermissionsActionHelper from 'sdc-app/onboarding/permissions/PermissionsActionHelper.js';
 
-export const mapStateToProps = ({finalizedLicenseModelList, users: {usersList}, archivedSoftwareProductList, 
-		softwareProductList, finalizedSoftwareProductList, softwareProduct: {softwareProductCreation, softwareProductCategories} }) => {
-	let {genericFieldInfo} = softwareProductCreation;
-	let isFormValid = ValidationHelper.checkFormValid(genericFieldInfo);
+export const mapStateToProps = ({
+    finalizedLicenseModelList,
+    users: { usersList },
+    archivedSoftwareProductList,
+    softwareProductList,
+    finalizedSoftwareProductList,
+    softwareProduct: { softwareProductCreation, softwareProductCategories }
+}) => {
+    let { genericFieldInfo } = softwareProductCreation;
+    let isFormValid = ValidationHelper.checkFormValid(genericFieldInfo);
 
-	let VSPNames = {};
-	const allVspList = [...softwareProductList, ...finalizedSoftwareProductList, ...archivedSoftwareProductList];
-	allVspList.map(item => {
-		VSPNames[item.name.toLowerCase()] = item.id;
-	});
-	
+    let VSPNames = {};
+    const allVspList = [
+        ...softwareProductList,
+        ...finalizedSoftwareProductList,
+        ...archivedSoftwareProductList
+    ];
+    allVspList.map(item => {
+        VSPNames[item.name.toLowerCase()] = item.id;
+    });
 
-	return {
-		data: softwareProductCreation.data,
-		selectedVendorId: softwareProductCreation.selectedVendorId,
-		disableVendor: softwareProductCreation.disableVendor,
-		softwareProductCategories,
-		finalizedLicenseModelList,
-		isFormValid,
-		formReady: softwareProductCreation.formReady,
-		genericFieldInfo,
-		VSPNames,
-		usersList
-	};
+    return {
+        data: softwareProductCreation.data,
+        selectedVendorId: softwareProductCreation.selectedVendorId,
+        disableVendor: softwareProductCreation.disableVendor,
+        softwareProductCategories,
+        finalizedLicenseModelList,
+        isFormValid,
+        formReady: softwareProductCreation.formReady,
+        genericFieldInfo,
+        VSPNames,
+        usersList
+    };
 };
 
-export const mapActionsToProps = (dispatch) => {
-	return {
-		onDataChanged: (deltaData, formName, customValidations) => ValidationHelper.dataChanged(dispatch, {deltaData, formName, customValidations}),
-		onCancel: () => SoftwareProductCreationActionHelper.resetData(dispatch),
-		onSubmit: (softwareProduct, usersList) => {
-			SoftwareProductCreationActionHelper.resetData(dispatch);
-			SoftwareProductCreationActionHelper.createSoftwareProduct(dispatch, {softwareProduct}).then(response => {
-				let {itemId, version} = response;
-				SoftwareProductActionHelper.fetchSoftwareProductList(dispatch).then(() =>
-					PermissionsActionHelper.fetchItemUsers(dispatch, {itemId, allUsers: usersList}).then(() =>
-						VersionsPageActionHelper.fetchVersions(dispatch, {itemType: versionItemTypes.SOFTWARE_PRODUCT, itemId}).then(() =>
-							ScreensHelper.loadScreen(dispatch, {screen: enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE, screenType: screenTypes.SOFTWARE_PRODUCT,
-								props: {softwareProductId: itemId, version}})
-						)
-					)
-				);
-			});
-		},
-		onValidateForm: (formName) => ValidationHelper.validateForm(dispatch, formName)
-	};
+export const mapActionsToProps = dispatch => {
+    return {
+        onDataChanged: (deltaData, formName, customValidations) =>
+            ValidationHelper.dataChanged(dispatch, {
+                deltaData,
+                formName,
+                customValidations
+            }),
+        onCancel: () => SoftwareProductCreationActionHelper.resetData(dispatch),
+        onSubmit: (softwareProduct, usersList) => {
+            SoftwareProductCreationActionHelper.resetData(dispatch);
+            SoftwareProductCreationActionHelper.createSoftwareProduct(
+                dispatch,
+                { softwareProduct }
+            ).then(response => {
+                let { itemId, version } = response;
+                SoftwareProductActionHelper.fetchSoftwareProductList(
+                    dispatch
+                ).then(() =>
+                    PermissionsActionHelper.fetchItemUsers(dispatch, {
+                        itemId,
+                        allUsers: usersList
+                    }).then(() =>
+                        VersionsPageActionHelper.fetchVersions(dispatch, {
+                            itemType: versionItemTypes.SOFTWARE_PRODUCT,
+                            itemId
+                        }).then(() =>
+                            ScreensHelper.loadScreen(dispatch, {
+                                screen:
+                                    enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE,
+                                screenType: screenTypes.SOFTWARE_PRODUCT,
+                                props: { softwareProductId: itemId, version }
+                            })
+                        )
+                    )
+                );
+            });
+        },
+        onValidateForm: formName =>
+            ValidationHelper.validateForm(dispatch, formName)
+    };
 };
 
-export default connect(mapStateToProps, mapActionsToProps, null, {withRef: true})(SoftwareProductCreationView);
+export default connect(mapStateToProps, mapActionsToProps, null, {
+    withRef: true
+})(SoftwareProductCreationView);