From cb1d48383b166c9b3fa8f9034b28fb3e662c1d80 Mon Sep 17 00:00:00 2001 From: ilanap Date: Wed, 27 Sep 2017 11:41:19 +0300 Subject: Fix orphan list for VLMs Fix the orphan list where feature groups stayed orphans after a license agreement that contains them was created. Issue-ID: SDC-407 Change-Id: I80b20e46fb4077ba0632e897437cfd795f134ad1 Signed-off-by: ilanap --- .../licenseAgreement/LicenseAgreementActionHelper.js | 16 ++++------------ .../licenseAgreement/LicenseAgreementConstants.js | 2 -- .../licenseAgreement/LicenseAgreementListReducer.js | 5 ----- 3 files changed, 4 insertions(+), 19 deletions(-) (limited to 'openecomp-ui/src/sdc-app/onboarding/licenseModel') 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: -- cgit 1.2.3-korg