ui support for archive items
Issue-ID: SDC-1088
Change-Id: I836e4896a8ec6bb065f9d2571f514916ccf6759f
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
diff --git a/openecomp-ui/test/softwareProduct/details/detailsView.test.js b/openecomp-ui/test/softwareProduct/details/detailsView.test.js
index 33cc36e..46983f5 100644
--- a/openecomp-ui/test/softwareProduct/details/detailsView.test.js
+++ b/openecomp-ui/test/softwareProduct/details/detailsView.test.js
@@ -1,7 +1,7 @@
/*
* Copyright © 2016-2018 European Support Limited
*
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the 'License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
@@ -25,7 +25,6 @@
import {SchemaGenericFieldInfoFactory} from 'test-utils/factories/softwareProduct/SoftwareProductQSchemaFactory.js';
import {default as VspQdataFactory, VspDataMapFactory} from 'test-utils/factories/softwareProduct/VspQdataFactory.js';
import {FinalizedLicenseModelFactory} from 'test-utils/factories/licenseModel/LicenseModelFactories.js';
-import VersionFactory from 'test-utils/factories/common/VersionFactory.js';
import CurrentScreenFactory from 'test-utils/factories/common/CurrentScreenFactory.js';
describe('Software Product Details: ', function () {
@@ -46,9 +45,14 @@
licenseAgreementList = LicenseAgreementStoreFactory.buildList(2);
licensingVersionsList = [
{
- "id":"0127b419e9574a11aab8e031a78fc534",
- "name":"1.0","description":"Initial version",
- "baseId":"","status":"Certified","creationTime":1506409288390,"modificationTime":1506409288390,"additionalInfo":{"OptionalCreationMethods":["minor"]}},{"id":"ea159ffedd9a4f9a8a56d53ba66b7314","name":"2.0","description":"ggggg","baseId":"0127b419e9574a11aab8e031a78fc534","status":"Draft","creationTime":1508839019802,"modificationTime":1508839019802,"additionalInfo":{"OptionalCreationMethods":[]}}
+ 'id':'0127b419e9574a11aab8e031a78fc534',
+ 'name':'1.0','description':'Initial version',
+ 'baseId':'','status':'Certified','creationTime':1506409288390,
+ 'modificationTime':1506409288390,'additionalInfo':{'OptionalCreationMethods':['minor']}},
+ {'id':'ea159ffedd9a4f9a8a56d53ba66b7314','name':'2.0','description':'ggggg',
+ 'baseId':'0127b419e9574a11aab8e031a78fc534','status':'Draft','creationTime':1508839019802,
+ 'modificationTime':1508839019802,'additionalInfo':{'OptionalCreationMethods':[]}
+ }
];
featureGroupsList = FeatureGroupStoreFactory.buildList(2, {referencingLicenseAgreements: [licenseAgreementList[0].id]});
qdata = VspQdataFactory.build();
@@ -109,7 +113,9 @@
featureGroup: {
featureGroupsList: []
}
- }
+ },
+ archivedLicenseModelList: [],
+ archivedSoftwareProductList: []
};
var result = mapStateToProps(obj);
@@ -145,7 +151,9 @@
dataMap
}
},
- finalizedLicenseModelList: finalizedLicenseModelList,
+ finalizedLicenseModelList: finalizedLicenseModelList,
+ archivedLicenseModelList: [],
+ archivedSoftwareProductList: [],
licenseModel: {
licenseAgreement: {
licenseAgreementList: licenseAgreementList
diff --git a/openecomp-ui/test/softwareProduct/details/test.js b/openecomp-ui/test/softwareProduct/details/test.js
index 27cbaa4..6050624 100644
--- a/openecomp-ui/test/softwareProduct/details/test.js
+++ b/openecomp-ui/test/softwareProduct/details/test.js
@@ -1,17 +1,17 @@
-/*!
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+/*
+ * Copyright © 2016-2018 European Support Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import deepFreeze from 'deep-freeze';
import mockRest from 'test-utils/MockRest.js';
@@ -35,7 +35,7 @@
import {InitializedCurrentScreenFactory} from 'test-utils/factories/common/CurrentScreenFactory.js';
describe('Software Product Details Module Tests', function () {
- it('Get Software Products List', () => {
+ it('Get Software Products List', async () => {
const store = storeCreator();
deepFreeze(store.getState());
const softwareProductList = VSPEditorFactory.buildList(2);
@@ -57,11 +57,18 @@
return {results: []};
});
- return SoftwareProductActionHelper.fetchSoftwareProductList(store.dispatch).then(() => {
- return SoftwareProductActionHelper.fetchFinalizedSoftwareProductList(store.dispatch);
- }).then(() => {
- expect(store.getState()).toEqual(expectedStore);
+ mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+ expect(baseUrl).toEqual('/onboarding-api/v1.0/vendor-software-products/?Status=ARCHIVED');
+ expect(data).toEqual(undefined);
+ expect(options).toEqual(undefined);
+ return {results: []};
});
+
+ await SoftwareProductActionHelper.fetchSoftwareProductList(store.dispatch);
+ await SoftwareProductActionHelper.fetchFinalizedSoftwareProductList(store.dispatch);
+ await SoftwareProductActionHelper.fetchArchivedSoftwareProductList(store.dispatch);
+
+ expect(store.getState()).toEqual(expectedStore);
});
it('Add Software Product', () => {