summaryrefslogtreecommitdiffstats
path: root/openecomp-ui/src/sdc-app/onboarding/softwareProduct
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding/softwareProduct')
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachments.js4
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx2
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentEditorReducer.js1
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/SoftwareProductComponentsActionHelper.js10
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependencies.js2
5 files changed, 10 insertions, 9 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachments.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachments.js
index 8f2506abdd..945de4fc36 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachments.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachments.js
@@ -77,8 +77,8 @@ export const mapActionsToProps = (dispatch, {softwareProductId}) => {
}
}),
onSave: (heatCandidate, version) => SoftwareProductActionHelper.updateSoftwareProductHeatCandidate(dispatch, {softwareProductId, heatCandidate, version}),
- onGoToOverview: () => {
- OnboardingActionHelper.navigateToSoftwareProductLandingPage(dispatch, {softwareProductId});
+ onGoToOverview: ({version}) => {
+ OnboardingActionHelper.navigateToSoftwareProductLandingPage(dispatch, {softwareProductId, version});
},
onProcessAndValidate: ({heatData, heatDataCache, isReadOnlyMode, version}) => {
return HeatSetupActionHelper.processAndValidateHeat(dispatch,
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
index 66fb2f8356..ef4aecf568 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
@@ -50,7 +50,7 @@ class HeatScreenView extends Component {
iconClassName={this.props.goToOverview ? '' : 'disabled'}
className={`go-to-overview-icon ${this.props.goToOverview ? '' : 'disabled'}`}
labelClassName='go-to-overview-label'
- onClick={this.props.goToOverview ? onGoToOverview : undefined}
+ onClick={this.props.goToOverview ? () => onGoToOverview({version}) : undefined}
image='go-to-overview'
label={i18n('Go to Overview')}
data-test-id='go-to-overview'/>}
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 => {
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependencies.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependencies.js
index 9540d3f869..05a1fc7797 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependencies.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/dependencies/SoftwareProductDependencies.js
@@ -25,7 +25,7 @@ export const mapStateToProps = ({softwareProduct}) => {
return {
isReadOnlyMode,
softwareProductDependencies: softwareProductDependencies.length ? softwareProductDependencies : [{sourceId: '', targetId: '', relationType: 'dependsOn', id: 'fake'}],
- componentsOptions: componentsList.map(component => ({value: component.id, label: component.name}))
+ componentsOptions: componentsList.map(component => ({value: component.id, label: component.displayName}))
};
};