aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Gaffa <avi.gaffa@amdocs.com>2017-09-27 09:57:41 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-27 09:57:41 +0000
commitd2acdcaa8e7d43b92f2955a84bc679c31a46d9c8 (patch)
tree475684b9d4f8b42730a8026e2baa999414d53227
parent18b81c30d2ea81b3e768839008860d1ffb77f2c8 (diff)
parentcb1d48383b166c9b3fa8f9034b28fb3e662c1d80 (diff)
Merge "Fix orphan list for VLMs"
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementActionHelper.js16
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementConstants.js2
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementListReducer.js5
-rw-r--r--openecomp-ui/test/licenseModel/licenseAgreement/test.js28
4 files changed, 30 insertions, 21 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:
diff --git a/openecomp-ui/test/licenseModel/licenseAgreement/test.js b/openecomp-ui/test/licenseModel/licenseAgreement/test.js
index 442f7bf91f..40b60da77f 100644
--- a/openecomp-ui/test/licenseModel/licenseAgreement/test.js
+++ b/openecomp-ui/test/licenseModel/licenseAgreement/test.js
@@ -93,7 +93,9 @@ describe('License Agreement Module Tests', () => {
id: licenseAgreementIdFromResponse
});
deepFreeze(licenseAgreementAfterAdd);
+ const licenseAgreementList = [licenseAgreementAfterAdd];
+ const featureGroupsList = licenseAgreementList.featureGroupsIds;
const expectedStore = cloneAndSet(store.getState(), 'licenseModel.licenseAgreement.licenseAgreementList', [licenseAgreementAfterAdd]);
mockRest.addHandler('post', ({options, data, baseUrl}) => {
@@ -104,7 +106,18 @@ describe('License Agreement Module Tests', () => {
value: licenseAgreementIdFromResponse
};
});
-
+ mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+ expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-license-models/${LICENSE_MODEL_ID}/versions/${version.id}/license-agreements`);
+ expect(data).toEqual(undefined);
+ expect(options).toEqual(undefined);
+ return {results: licenseAgreementList};
+ });
+ mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+ expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-license-models/${LICENSE_MODEL_ID}/versions/${version.id}/feature-groups`);
+ expect(data).toEqual(undefined);
+ expect(options).toEqual(undefined);
+ return {results: featureGroupsList};
+ });
return LicenseAgreementActionHelper.saveLicenseAgreement(store.dispatch, {
licenseAgreement: licenseAgreementToAdd,
licenseModelId: LICENSE_MODEL_ID,
@@ -151,7 +164,18 @@ describe('License Agreement Module Tests', () => {
expect(data).toEqual(LicenseAgreementPutFactoryRequest);
expect(options).toEqual(undefined);
});
-
+ mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+ expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-license-models/${LICENSE_MODEL_ID}/versions/${version.id}/license-agreements`);
+ expect(data).toEqual(undefined);
+ expect(options).toEqual(undefined);
+ return {results: [licenseAgreementUpdateData]};
+ });
+ mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+ expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-license-models/${LICENSE_MODEL_ID}/versions/${version.id}/feature-groups`);
+ expect(data).toEqual(undefined);
+ expect(options).toEqual(undefined);
+ return {results: newFeatureGroupsIds};
+ });
return LicenseAgreementActionHelper.saveLicenseAgreement(store.dispatch, {
licenseModelId: LICENSE_MODEL_ID,
version,