X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Fsources%2FCatalogPackageManagerSource.js;h=00d36008ebff2a2d30692cc7e64b82dbd0c238c8;hb=refs%2Ftags%2Fv3.0.0rc2;hp=290d715189d3f311a7114cb4ac8c49eb7f0fd889;hpb=fc0265f43d6ca5d7d7b0240e0bd0c6f6f313d6f8;p=osm%2FUI.git

diff --git a/skyquake/plugins/composer/src/src/sources/CatalogPackageManagerSource.js b/skyquake/plugins/composer/src/src/sources/CatalogPackageManagerSource.js
index 290d71518..00d36008e 100644
--- a/skyquake/plugins/composer/src/src/sources/CatalogPackageManagerSource.js
+++ b/skyquake/plugins/composer/src/src/sources/CatalogPackageManagerSource.js
@@ -23,10 +23,15 @@ import catalogUtils from '../libraries/utils'
 import CatalogPackageManagerActions from '../actions/CatalogPackageManagerActions'
 import Utils from 'utils/utils.js';
 
+let API_SERVER = catalogUtils.getSearchParams(window.location).api_server;
+const FILE_SERVER = window.location.hostname === 'localhost' 
+	? API_SERVER : window.location.protocol + '//' + window.location.hostname;
+
+
 const getAuthorization = () => 'Basic ' + window.sessionStorage.getItem("auth");
 
 const getStateApiPath = (operation, id) => 
-	catalogUtils.getSearchParams(window.location).upload_server + ':4567/api/' + operation + '/' + id + '/state';
+	FILE_SERVER + ':8008/mano/' + operation + '/' + id + '/state';
 
 const getComposerApiPath = (api) =>
 	window.location.origin + '/composer/api/' + api + '?api_server=' + catalogUtils.getSearchParams(window.location).api_server;
@@ -158,9 +163,9 @@ const CatalogPackageManagerSource = {
 						reject(operation);
 					};
 					const data = {
-						"package-type": operationInfo.packageType,
-						"package-id": operationInfo.id,
-						"package-name": operationInfo.name
+						"package-type": operationInfo.args.packageType,
+						"package-id": operationInfo.args.id,
+						"package-name": operationInfo.args.name
 					}
 					const path = getComposerApiPath('package-copy');
 					ajaxFetch(path, operationInfo, successHandler, failHandler, 'POST', data, true);
@@ -176,17 +181,16 @@ const CatalogPackageManagerSource = {
 			remote: function(state, operation) {
 				return new Promise(function(resolve, reject) {
 					const successHandler = (response) => {
-						const status = response.data[0].status;
+						const status = response.data.status;
 						const state = status === "COMPLETED" ? SUCCESS : status === "FAILED" ? FAILED : PENDING;
 						state.progress = state.pending ? operation.progress + ((100 - operation.progress) / 2) : 100;
 						let newOp = Object.assign({}, operation, state);
 						resolve(newOp);
 					};
 					const failHandler = (response) => {
-						let operation = Object.assign({}, this, FAILED);
-						reject(operation);
+						reject(Object.assign({}, operation, FAILED));
 					};
-					const path = getComposerApiPath('package-manager/jobs/' + operation.transactionId);
+					const path = getComposerApiPath('package-copy/jobs/' + operation.transactionId);
 					ajaxFetch(path, operation, successHandler, failHandler);
 				});
 			},
@@ -200,8 +204,8 @@ const CatalogPackageManagerSource = {
 			remote: function (state, upload) {
 				const transactionId = upload.transactionId;
 				return new Promise(function (resolve, reject) {
-					const action = upload.riftAction === 'onboard' ? 'upload' : 'update';
-					const path = getStateApiPath(action, transactionId);
+					const action = upload.riftAction === 'onboard' ? 'import' : 'update';
+					const path = getComposerApiPath('package-'+action+'/jobs/' + transactionId);
 					ajaxFetch(path, upload, resolve, reject);
 				});
 			},