[SDC-29] rebase continue work to align source

Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentEditorReducer.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentEditorReducer.js
index 2ae9ad0bae..41e7556749 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentEditorReducer.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentEditorReducer.js
@@ -20,6 +20,7 @@ export default (state = {}, action) => {
 		case actionTypes.COMPONENT_LOAD:
 			return {
 				...state,
+				data: action.component,
 				formReady: null,
 				formName: forms.ALL_SPC_FORMS,
 				genericFieldInfo: {
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentsActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentsActionHelper.js
index 9b3c9eaa73..4e526d3b56 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentsActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentsActionHelper.js
@@ -16,7 +16,7 @@
 import RestAPIUtil from 'nfvo-utils/RestAPIUtil.js';
 import Configuration from 'sdc-app/config/Configuration.js';
 
-import {actionTypes, COMPONENTS_QUESTIONNAIRE, forms} from './SoftwareProductComponentsConstants.js';
+import {actionTypes, COMPONENTS_QUESTIONNAIRE} from './SoftwareProductComponentsConstants.js';
 import ValidationHelper from 'sdc-app/common/helpers/ValidationHelper.js';
 
 function baseUrl(softwareProductId, version) {
@@ -89,12 +89,12 @@ const SoftwareProductComponentsActionHelper = {
 	},
 
 	fetchSoftwareProductComponent(dispatch, {softwareProductId, version, vspComponentId}) {
-		dispatch({
-			type: actionTypes.COMPONENT_LOAD
-		});
 		return Promise.all([
 			fetchSoftwareProductComponent(softwareProductId, version, vspComponentId).then(response => {
-				ValidationHelper.dataChanged(dispatch,{deltaData: response.data, formName: forms.ALL_SPC_FORMS});
+				dispatch({
+					type: actionTypes.COMPONENT_LOAD,
+					component: response.data
+				});
 				return response;
 			}),
 			fetchSoftwareProductComponentQuestionnaire(softwareProductId, version, vspComponentId).then(response => {