Adding Prettier and fixing up eslint version

Issue-ID: SDC-1094
Change-Id: Ie83ad95a03899345dd90235daf0323cbe3bc6afd
Signed-off-by: Einav Weiss Keidar <einavw@amdocs.com>

4 files changed, 233 insertions, 163 deletions

diff --git a/openecomp-ui/src/sdc-app/heatvalidation/Attachments.js b/openecomp-ui/src/sdc-app/heatvalidation/Attachments.js
index d3e30b0df8..4532c0a7d2 100644
--- a/openecomp-ui/src/sdc-app/heatvalidation/Attachments.js
+++ b/openecomp-ui/src/sdc-app/heatvalidation/Attachments.js
@@ -13,32 +13,53 @@
  * 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 SoftwareProductActionHelper from 'sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js';
-import {mapStateToProps as attachmentsMapStateToProps, mapActionsToProps as attachmentsMapActionsToProps} from 'sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachments.js';
+import {
+    mapStateToProps as attachmentsMapStateToProps,
+    mapActionsToProps as attachmentsMapActionsToProps
+} from 'sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachments.js';
 // import AttachmentsView from './AttachmentsView.jsx';
 import AttachmentsView from 'sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx';
 import UploadScreenActionHelper from './UploadScreenActionHelper.js';
 import HeatSetup from './HeatSetup';
 
-export const mapStateToProps = (state) => {
-	let original = attachmentsMapStateToProps(state);
-	return {
-		...original,
-		HeatSetupComponent: HeatSetup,
-		isReadOnlyMode: false
-	};
+export const mapStateToProps = state => {
+    let original = attachmentsMapStateToProps(state);
+    return {
+        ...original,
+        HeatSetupComponent: HeatSetup,
+        isReadOnlyMode: false
+    };
 };
 
-const mapActionsToProps = (dispatch, {softwareProductId}) => {
-	let original = attachmentsMapActionsToProps(dispatch, {softwareProductId});
-	return {
-		...original,
-		onDownload: heatCandidate => UploadScreenActionHelper.downloadHeatFile(dispatch, heatCandidate),
-		onUpload: formData => UploadScreenActionHelper.uploadFile(dispatch, formData),
-		onSave: (heatCandidate) => SoftwareProductActionHelper.updateSoftwareProductHeatCandidate(dispatch, {softwareProductId, heatCandidate}),
-		onProcessAndValidate: (heatData, heatDataCache) => UploadScreenActionHelper.processAndValidateHeat(dispatch, heatData, heatDataCache)
-	};
+const mapActionsToProps = (dispatch, { softwareProductId }) => {
+    let original = attachmentsMapActionsToProps(dispatch, {
+        softwareProductId
+    });
+    return {
+        ...original,
+        onDownload: heatCandidate =>
+            UploadScreenActionHelper.downloadHeatFile(dispatch, heatCandidate),
+        onUpload: formData =>
+            UploadScreenActionHelper.uploadFile(dispatch, formData),
+        onSave: heatCandidate =>
+            SoftwareProductActionHelper.updateSoftwareProductHeatCandidate(
+                dispatch,
+                {
+                    softwareProductId,
+                    heatCandidate
+                }
+            ),
+        onProcessAndValidate: (heatData, heatDataCache) =>
+            UploadScreenActionHelper.processAndValidateHeat(
+                dispatch,
+                heatData,
+                heatDataCache
+            )
+    };
 };
 
-export default connect(mapStateToProps, mapActionsToProps, null, {withRef: true})(AttachmentsView);
+export default connect(mapStateToProps, mapActionsToProps, null, {
+    withRef: true
+})(AttachmentsView);
diff --git a/openecomp-ui/src/sdc-app/heatvalidation/HeatSetup.js b/openecomp-ui/src/sdc-app/heatvalidation/HeatSetup.js
index 925b0095ba..a94cfd9f81 100644
--- a/openecomp-ui/src/sdc-app/heatvalidation/HeatSetup.js
+++ b/openecomp-ui/src/sdc-app/heatvalidation/HeatSetup.js
@@ -13,16 +13,26 @@
  * or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-import {connect} from 'react-redux';
-import HeatSetupView  from '../onboarding/softwareProduct/attachments/setup/HeatSetupView.jsx';
+import { connect } from 'react-redux';
+import HeatSetupView from '../onboarding/softwareProduct/attachments/setup/HeatSetupView.jsx';
 import UploadScreenActionHelper from './UploadScreenActionHelper.js';
-import {mapStateToProps, mapActionsToProps} from '../onboarding/softwareProduct/attachments/setup/HeatSetup.js';
+import {
+    mapStateToProps,
+    mapActionsToProps
+} from '../onboarding/softwareProduct/attachments/setup/HeatSetup.js';
 
-const mapActionsToPropsExt = (dispatch) => {
-	return {
-		...mapActionsToProps(dispatch,{}),
-		onProcessAndValidate: (heatData, heatDataCache) => UploadScreenActionHelper.processAndValidateHeat(dispatch, heatData, heatDataCache)
-	};
+const mapActionsToPropsExt = dispatch => {
+    return {
+        ...mapActionsToProps(dispatch, {}),
+        onProcessAndValidate: (heatData, heatDataCache) =>
+            UploadScreenActionHelper.processAndValidateHeat(
+                dispatch,
+                heatData,
+                heatDataCache
+            )
+    };
 };
 
-export default connect(mapStateToProps, mapActionsToPropsExt, null, {withRef: true})(HeatSetupView);
+export default connect(mapStateToProps, mapActionsToPropsExt, null, {
+    withRef: true
+})(HeatSetupView);
diff --git a/openecomp-ui/src/sdc-app/heatvalidation/UploadScreen.jsx b/openecomp-ui/src/sdc-app/heatvalidation/UploadScreen.jsx
index 2d99c0f497..6d3d54b5cb 100644
--- a/openecomp-ui/src/sdc-app/heatvalidation/UploadScreen.jsx
+++ b/openecomp-ui/src/sdc-app/heatvalidation/UploadScreen.jsx
@@ -16,17 +16,14 @@
 import React from 'react';
 import SoftwareProductAttachmentsView from './Attachments.js';
 
-
-
 class UploadScreen extends React.Component {
-
-	render() {
-		return(
-			<div className='heat-validation-stand-alone'>
-				<SoftwareProductAttachmentsView />
-			</div>
-		);
-	}
+    render() {
+        return (
+            <div className="heat-validation-stand-alone">
+                <SoftwareProductAttachmentsView />
+            </div>
+        );
+    }
 }
 
-export default  UploadScreen;
+export default UploadScreen;
diff --git a/openecomp-ui/src/sdc-app/heatvalidation/UploadScreenActionHelper.js b/openecomp-ui/src/sdc-app/heatvalidation/UploadScreenActionHelper.js
index fa2d4695ae..f5d9abd6d2 100644
--- a/openecomp-ui/src/sdc-app/heatvalidation/UploadScreenActionHelper.js
+++ b/openecomp-ui/src/sdc-app/heatvalidation/UploadScreenActionHelper.js
@@ -18,155 +18,197 @@ import showFileSaveDialog from 'nfvo-utils/ShowFileSaveDialog.js';
 import i18n from 'nfvo-utils/i18n/i18n.js';
 import isEqual from 'lodash/isEqual.js';
 import cloneDeep from 'lodash/cloneDeep.js';
-import {actionTypes as modalActionTypes} from 'nfvo-components/modal/GlobalModalConstants.js';
-import {modalContentMapper} from 'sdc-app/common/modal/ModalContentMapper.js';
-import {actionTypes as softwareProductsActionTypes} from '../onboarding/softwareProduct/SoftwareProductConstants.js';
-import {actionTypes as HeatSetupActions} from '../onboarding/softwareProduct/attachments/setup/HeatSetupConstants.js';
-
-
+import { actionTypes as modalActionTypes } from 'nfvo-components/modal/GlobalModalConstants.js';
+import { modalContentMapper } from 'sdc-app/common/modal/ModalContentMapper.js';
+import { actionTypes as softwareProductsActionTypes } from '../onboarding/softwareProduct/SoftwareProductConstants.js';
+import { actionTypes as HeatSetupActions } from '../onboarding/softwareProduct/attachments/setup/HeatSetupConstants.js';
 
 const options = {
-	headers: {
-		USER_ID: 'validationOnlyVspUser'
-	}
+    headers: {
+        USER_ID: 'validationOnlyVspUser'
+    }
 };
 
 function fetchVspIdAndVersion() {
-
-	let vspId = sessionStorage.getItem('validationAppVspId');
-	let versionId = sessionStorage.getItem('validationAppVersionId');
-	if (vspId) {
-		return  Promise.resolve({value: vspId, versionId});
-	}else {
-		return RestAPIUtil.fetch('/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/validation-vsp', options)
-			.then(response => {
-				sessionStorage.setItem('validationAppVspId', response.itemId);
-				sessionStorage.setItem('validationAppVersionId', response.version.id);
-				return Promise.resolve({value: response.itemId, versionId: response.version.id});
-			});
-	}
-
+    let vspId = sessionStorage.getItem('validationAppVspId');
+    let versionId = sessionStorage.getItem('validationAppVersionId');
+    if (vspId) {
+        return Promise.resolve({ value: vspId, versionId });
+    } else {
+        return RestAPIUtil.fetch(
+            '/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/validation-vsp',
+            options
+        ).then(response => {
+            sessionStorage.setItem('validationAppVspId', response.itemId);
+            sessionStorage.setItem(
+                'validationAppVersionId',
+                response.version.id
+            );
+            return Promise.resolve({
+                value: response.itemId,
+                versionId: response.version.id
+            });
+        });
+    }
 }
 
-
 function uploadFile(formData) {
-	return fetchVspIdAndVersion()
-		.then(response => {
-			return RestAPIUtil.post(`/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${response.value}/versions/${response.versionId}/orchestration-template-candidate`, formData, options);
-		});
+    return fetchVspIdAndVersion().then(response => {
+        return RestAPIUtil.post(
+            `/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${
+                response.value
+            }/versions/${response.versionId}/orchestration-template-candidate`,
+            formData,
+            options
+        );
+    });
 }
 
-function loadSoftwareProductHeatCandidate(dispatch){
-	return fetchVspIdAndVersion()
-		.then(response => {
-			return RestAPIUtil.fetch(`/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${response.value}/versions/${response.versionId}/orchestration-template-candidate/manifest`, options)
-				.then(response => dispatch({
-					type: HeatSetupActions.MANIFEST_LOADED,
-					response
-				}));
-		});
+function loadSoftwareProductHeatCandidate(dispatch) {
+    return fetchVspIdAndVersion().then(response => {
+        return RestAPIUtil.fetch(
+            `/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${
+                response.value
+            }/versions/${
+                response.versionId
+            }/orchestration-template-candidate/manifest`,
+            options
+        ).then(response =>
+            dispatch({
+                type: HeatSetupActions.MANIFEST_LOADED,
+                response
+            })
+        );
+    });
 }
 
 function updateHeatCandidate(dispatch, heatCandidate) {
-	return fetchVspIdAndVersion()
-		.then(response => {
-			return RestAPIUtil.put(`/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${response.value}/versions/${response.versionId}/orchestration-template-candidate/manifest`,
-				heatCandidate.heatData, options)
-				.then(null, error => {
-					dispatch({
-						type: modalActionTypes.GLOBAL_MODAL_ERROR,
-						data: {
-							title: i18n('Save Failed'), 
-							modalComponentName: modalContentMapper.SUMBIT_ERROR_RESPONSE,							
-							modalComponentProps: {
-								validationResponse: error.responseJSON
-							},					
-							cancelButtonText: i18n('Ok')
-						}
-					});
-					return Promise.reject(error);
-				});
-		});
+    return fetchVspIdAndVersion().then(response => {
+        return RestAPIUtil.put(
+            `/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${
+                response.value
+            }/versions/${
+                response.versionId
+            }/orchestration-template-candidate/manifest`,
+            heatCandidate.heatData,
+            options
+        ).then(null, error => {
+            dispatch({
+                type: modalActionTypes.GLOBAL_MODAL_ERROR,
+                data: {
+                    title: i18n('Save Failed'),
+                    modalComponentName:
+                        modalContentMapper.SUMBIT_ERROR_RESPONSE,
+                    modalComponentProps: {
+                        validationResponse: error.responseJSON
+                    },
+                    cancelButtonText: i18n('Ok')
+                }
+            });
+            return Promise.reject(error);
+        });
+    });
 }
 
 function fetchSoftwareProduct() {
-	return fetchVspIdAndVersion()
-		.then(response => {
-			return RestAPIUtil.fetch(`/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${response.value}/versions/${response.versionId}`, options);
-		});
+    return fetchVspIdAndVersion().then(response => {
+        return RestAPIUtil.fetch(
+            `/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${
+                response.value
+            }/versions/${response.versionId}`,
+            options
+        );
+    });
 }
 
 function downloadHeatFile() {
-	return fetchVspIdAndVersion()
-		.then(response => {
-			RestAPIUtil.fetch(`/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${response.value}/versions/${response.versionId}/orchestration-template-candidate`, {
-				...options,
-				dataType: 'binary'
-			})
-				.done((response) => showFileSaveDialog({
-					blob: response.blob,
-					headers: response.headers,
-					defaultFilename: 'HEAT_file.zip',
-					addTimestamp: true
-				}));
-		});
+    return fetchVspIdAndVersion().then(response => {
+        RestAPIUtil.fetch(
+            `/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${
+                response.value
+            }/versions/${response.versionId}/orchestration-template-candidate`,
+            {
+                ...options,
+                dataType: 'binary'
+            }
+        ).done(response =>
+            showFileSaveDialog({
+                blob: response.blob,
+                headers: response.headers,
+                defaultFilename: 'HEAT_file.zip',
+                addTimestamp: true
+            })
+        );
+    });
 }
 
 function processAndValidateHeatCandidate(dispatch) {
-	return fetchVspIdAndVersion()
-		.then(response => {
-			return RestAPIUtil.put(`/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${response.value}/versions/${response.versionId}/orchestration-template-candidate/process`, {}, options)
-				.then(response => {
-					if (response.status === 'Success') {
-						fetchSoftwareProduct().then(response => {
-							dispatch({
-								type: softwareProductsActionTypes.SOFTWARE_PRODUCT_LOADED,
-								response
-							});
-						});
-					}
-				});
-		});
+    return fetchVspIdAndVersion().then(response => {
+        return RestAPIUtil.put(
+            `/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/${
+                response.value
+            }/versions/${
+                response.versionId
+            }/orchestration-template-candidate/process`,
+            {},
+            options
+        ).then(response => {
+            if (response.status === 'Success') {
+                fetchSoftwareProduct().then(response => {
+                    dispatch({
+                        type:
+                            softwareProductsActionTypes.SOFTWARE_PRODUCT_LOADED,
+                        response
+                    });
+                });
+            }
+        });
+    });
 }
 
 const UploadScreenActionHelper = {
-	uploadFile(dispatch, formData) {
-
-		return Promise.resolve()
-			.then(() => uploadFile(formData))
-			.then(response => {
-				dispatch({
-					type: softwareProductsActionTypes.SOFTWARE_PRODUCT_LOADED,
-					response
-				});
-				dispatch({
-					type: HeatSetupActions.FILL_HEAT_SETUP_CACHE,
-					payload:{}
-				});
-				loadSoftwareProductHeatCandidate(dispatch);
-			})
-			.catch(error => {
-				dispatch({					
-					type: modalActionTypes.GLOBAL_MODAL_ERROR,
-					data: {
-						title: i18n('File Upload Failed'), 													
-						msg: error.responseJSON.message,					
-						cancelButtonText: i18n('Ok')
-					}
-				});
-			});
-	},
-
-	processAndValidateHeat(dispatch, heatData, heatDataCache){
-		return isEqual(heatData, heatDataCache) ? Promise.resolve() :
-			updateHeatCandidate(dispatch, heatData)
-				.then(() => processAndValidateHeatCandidate(dispatch))
-				.then(() => dispatch({type: HeatSetupActions.FILL_HEAT_SETUP_CACHE, payload: cloneDeep(heatData)}));
-	},
-
-	downloadHeatFile(){
-		return downloadHeatFile();
-	},
+    uploadFile(dispatch, formData) {
+        return Promise.resolve()
+            .then(() => uploadFile(formData))
+            .then(response => {
+                dispatch({
+                    type: softwareProductsActionTypes.SOFTWARE_PRODUCT_LOADED,
+                    response
+                });
+                dispatch({
+                    type: HeatSetupActions.FILL_HEAT_SETUP_CACHE,
+                    payload: {}
+                });
+                loadSoftwareProductHeatCandidate(dispatch);
+            })
+            .catch(error => {
+                dispatch({
+                    type: modalActionTypes.GLOBAL_MODAL_ERROR,
+                    data: {
+                        title: i18n('File Upload Failed'),
+                        msg: error.responseJSON.message,
+                        cancelButtonText: i18n('Ok')
+                    }
+                });
+            });
+    },
+
+    processAndValidateHeat(dispatch, heatData, heatDataCache) {
+        return isEqual(heatData, heatDataCache)
+            ? Promise.resolve()
+            : updateHeatCandidate(dispatch, heatData)
+                  .then(() => processAndValidateHeatCandidate(dispatch))
+                  .then(() =>
+                      dispatch({
+                          type: HeatSetupActions.FILL_HEAT_SETUP_CACHE,
+                          payload: cloneDeep(heatData)
+                      })
+                  );
+    },
+
+    downloadHeatFile() {
+        return downloadHeatFile();
+    }
 };
 
 export default UploadScreenActionHelper;