From: KIRAN KASHALKAR Date: Wed, 7 Dec 2016 14:28:13 +0000 (-0500) Subject: Bad merge fix X-Git-Tag: v1.1.0~25 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=ffd1c54fdfc195209848dec95ea192c42ed21273;p=osm%2FUI.git Bad merge fix Signed-off-by: KIRAN KASHALKAR --- diff --git a/skyquake/.gitignore b/skyquake/.gitignore index 111d0cd3c..07b0361d4 100644 --- a/skyquake/.gitignore +++ b/skyquake/.gitignore @@ -3,3 +3,5 @@ npm-debug.log node_modules public dist +yarn.lock +upload/ diff --git a/skyquake/framework/core/api_utils/constants.js b/skyquake/framework/core/api_utils/constants.js index dccadb713..0aac7d2d0 100644 --- a/skyquake/framework/core/api_utils/constants.js +++ b/skyquake/framework/core/api_utils/constants.js @@ -74,4 +74,10 @@ constants.SOCKET_POOL_LENGTH = 20; constants.SERVER_PORT = process.env.SERVER_PORT || 8000; constants.SECURE_SERVER_PORT = process.env.SECURE_SERVER_PORT || 8443; +constants.BASE_PACKAGE_UPLOAD_DESTINATION = 'upload/packages/'; +constants.PACKAGE_MANAGER_SERVER_PORT = 4567; +constants.PACKAGE_FILE_DELETE_DELAY_MILLISECONDS = 3 * 1000 * 60; //5 minutes +constants.PACKAGE_FILE_ONBOARD_TRANSACTION_STATUS_CHECK_DELAY_MILLISECONDS = 2 * 1000; //2 seconds + + module.exports = constants; \ No newline at end of file diff --git a/skyquake/framework/core/modules/routes/inactivity.js b/skyquake/framework/core/modules/routes/inactivity.js index 7c3c4408b..a90258d63 100644 --- a/skyquake/framework/core/modules/routes/inactivity.js +++ b/skyquake/framework/core/modules/routes/inactivity.js @@ -1,6 +1,6 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js b/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js index 87afb6afa..690118d54 100644 --- a/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js +++ b/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js @@ -49,7 +49,7 @@ function initializeDropZone(element = '#dropzone', button = false, action = ACTI if (action === ACTIONS.update) { return getCatalogPackageManagerServerOrigin() + '/api/update'; } - return getCatalogPackageManagerServerOrigin() + '/composer/upload?api_server=' + Utils.getSearchParams(window.location).api_server + '&upload_server=' + Utils.getSearchParams(window.location).upload_server + ( dev_download_server ? '&dev_download_server=' + dev_download_server : ''); + return getCatalogPackageManagerServerOrigin() + '/composer/upload?api_server=' + Utils.getSearchParams(window.location).api_server + '&upload_server=' + Utils.getSearchParams(window.location).upload_server + '&dev_download_server=' + Utils.getSearchParams(window.location).dev_download_server; }, headers: { 'Authorization': Auth