diff options
| author |   Avi Gaffa <avi.gaffa@amdocs.com> | 2017-09-27 09:57:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-27 09:57:41 +0000 |
| commit | d2acdcaa8e7d43b92f2955a84bc679c31a46d9c8 (patch) | |
| tree | 475684b9d4f8b42730a8026e2baa999414d53227 /openecomp-ui/src/sdc-app/onboarding | |
| parent | 18b81c30d2ea81b3e768839008860d1ffb77f2c8 (diff) | |
| parent | cb1d48383b166c9b3fa8f9034b28fb3e662c1d80 (diff) | |
Merge "Fix orphan list for VLMs"
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding')
3 files changed, 4 insertions, 19 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementActionHelper.js index efc4fb758f..e9d922c212 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementActionHelper.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementActionHelper.js @@ -83,21 +83,13 @@ export default { saveLicenseAgreement(dispatch, {licenseModelId, previousLicenseAgreement, licenseAgreement, version}) { if (previousLicenseAgreement) { return putLicenseAgreement(licenseModelId, previousLicenseAgreement, licenseAgreement, version).then(() => { - dispatch({ - type: licenseAgreementActionTypes.EDIT_LICENSE_AGREEMENT, - licenseAgreement - }); + this.fetchLicenseAgreementList(dispatch, {licenseModelId, version}); }); } else { - return postLicenseAgreement(licenseModelId, licenseAgreement, version).then(response => { - dispatch({ - type: licenseAgreementActionTypes.ADD_LICENSE_AGREEMENT, - licenseAgreement: { - ...licenseAgreement, - id: response.value - } - }); + return postLicenseAgreement(licenseModelId, licenseAgreement, version).then(() => { + this.fetchLicenseAgreementList(dispatch, {licenseModelId, version}); + FeatureGroupsActionHelper.fetchFeatureGroupsList(dispatch, {licenseModelId, version}); }); } }, diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementConstants.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementConstants.js index 40bef2c181..181171d4cd 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementConstants.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementConstants.js @@ -19,8 +19,6 @@ import InputOptions, {other as optionInputOther} from 'nfvo-components/input/val export const actionTypes = keyMirror({ LICENSE_AGREEMENT_LIST_LOADED: null, - ADD_LICENSE_AGREEMENT: null, - EDIT_LICENSE_AGREEMENT: null, DELETE_LICENSE_AGREEMENT: null, licenseAgreementEditor: { diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementListReducer.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementListReducer.js index e6a8f34b58..7d1a5ef8ee 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementListReducer.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementListReducer.js @@ -19,11 +19,6 @@ export default (state = [], action) => { switch (action.type) { case licenseAgreementActionTypes.LICENSE_AGREEMENT_LIST_LOADED: return [...action.response.results]; - case licenseAgreementActionTypes.ADD_LICENSE_AGREEMENT: - return [...state, action.licenseAgreement]; - case licenseAgreementActionTypes.EDIT_LICENSE_AGREEMENT: - const indexForEdit = state.findIndex(licenseAgreement => licenseAgreement.id === action.licenseAgreement.id); - return [...state.slice(0, indexForEdit), action.licenseAgreement, ...state.slice(indexForEdit + 1)]; case licenseAgreementActionTypes.DELETE_LICENSE_AGREEMENT: return state.filter(licenseAgreement => licenseAgreement.id !== action.licenseAgreementId); default: |