return new Promise(function(resolve, reject) {
//If socket connection already exists, eat the request.
if(state.socket) {
+ console.log('connection already exists')
return resolve(false);
}
$.ajax({
- url: '//' + window.location.hostname + ':' + NODE_PORT + '/socket-polling?api_server=' + API_SERVER ,
+ url: '/socket-polling',
type: 'POST',
beforeSend: Utils.addAuthorizationStub,
data: {
- url:window.location.protocol + '//' + window.location.host + '/accounts/all?api_server=' + API_SERVER
+ url: 'accounts/all?api_server=' + API_SERVER
},
success: function(data, textStatus, jqXHR) {
Utils.checkAndResolveSocketRequest(data, resolve, reject);
}).fail(function(xhr){
//Authentication and the handling of fail states should be wrapped up into a connection class.
Utils.checkAuthentication(xhr.status);
+ reject(xhr.responseText || 'An error occurred. Check your logs for more information');
});;
});
},
}
function refreshStatus(type, name) {
- let url = type + '/' + name + '/refresh?api_server=' + API_SERVER;
+ let url = type + '/' + encodeURIComponent(name) + '/refresh?api_server=' + API_SERVER;
setTimeout(function(){
Refreshing.next();
},100);
remote: function(state, name, type) {
return new Promise(function(resolve, reject) {
$.ajax({
- url: type + '/' + name + '/refresh?api_server=' + API_SERVER,
+ url: type + '/' + encodeURIComponent(name) + '/refresh?api_server=' + API_SERVER,
type: 'POST',
beforeSend: Utils.addAuthorizationStub,
success: function(account) {
create: {
remote: function(state, account, type, cb) {
delete account['connection-status'];
+ var payload = account;
+ var accountKey = payload.hasOwnProperty('account-type') ? 'account-type' : 'ro-account-type';
+ var payloadKeys = Object.keys(payload[payload[accountKey]]);
+ var accountData = payload[payload[accountKey]];
+ payloadKeys.map(function(k) {
+ if (!accountData[k] || accountData[k].trim() == '') {
+ delete payload[payload[accountKey]][k];
+ }
+ });
return new Promise(function(resolve, reject) {
$.ajax({
url: type + '?api_server=' + API_SERVER,
type:'POST',
beforeSend: Utils.addAuthorizationStub,
- data: JSON.stringify(account),
+ data: JSON.stringify(payload),
contentType: "application/json",
success: function(data) {
resolve({data, cb});
}).fail(function(xhr){
//Authentication and the handling of fail states should be wrapped up into a connection class.
Utils.checkAuthentication(xhr.status);
- reject();
+ reject(xhr.responseText || 'An error occurred. Check your logs for more information');
});
});
update: {
remote: function(state, account, type, cb) {
var payload = Object.assign({}, account);
+ delete payload["instance-ref-count"]
delete payload['connection-status'];
delete payload['params'];
delete payload['pools'];
+ delete payload['datacenters'];
+ delete payload['config-data'];
(
(payload.nestedParams == null) &&
delete payload.nestedParams
delete payload.nestedParams
);
+ var payloadKeys = Object.keys(payload[payload['account-type']]);
+ var accountData = payload[payload['account-type']];
+ payloadKeys.map(function(k) {
+ if (!accountData[k] || (accountData[k].trim && accountData[k].trim() == '')) {
+ delete payload[payload['account-type']][k];
+ }
+ });
return new Promise(function(resolve, reject) {
$.ajax({
- url: type + '/' + account.name + '?api_server=' + API_SERVER,
+ url: type + '/' + encodeURIComponent(account.name) + '?api_server=' + API_SERVER,
type:'PUT',
beforeSend: Utils.addAuthorizationStub,
data: JSON.stringify(payload),
},
error: function(error) {
console.log("There was an error updating the account: ", arguments);
-
}
}).fail(function(xhr){
//Authentication and the handling of fail states should be wrapped up into a connection class.
Utils.checkAuthentication(xhr.status);
- reject('error');
+ reject(xhr.responseText || 'An error occurred. Check your logs for more information');
});
});
}),
success: Alt.actions.global.createAccountSuccess,
loading: Alt.actions.global.createAccountLoading,
- error: Alt.actions.global.showNotification
+ error: Alt.actions.global.createAccountFail
},
delete: {
remote: function(state, type, name, cb) {
return new Promise(function(resolve, reject) {
$.ajax({
- url: type + '/' + name + '/?api_server=' + API_SERVER,
+ url: type + '/' + encodeURIComponent(name) + '/?api_server=' + API_SERVER,
type:'DELETE',
dataType : 'html',
beforeSend: Utils.addAuthorizationStub,
}).fail(function(xhr){
//Authentication and the handling of fail states should be wrapped up into a connection class.
Utils.checkAuthentication(xhr.status);
- reject('error');
+ reject(xhr.responseText || 'An error occurred. Check your logs for more information');
});
})
},
'error': 'Something went wrong while trying to delete the account. Check the error logs for more information' }),
success: Alt.actions.global.deleteAccountSuccess,
loading: Alt.actions.global.deleteAccountLoading,
- error: Alt.actions.global.showNotification
- },
- getResourceOrchestrator: {
- remote: function() {
- return new Promise(function(resolve, reject) {
- $.ajax({
- url: 'passthrough/data/api/running/resource-orchestrator' + '?api_server=' + API_SERVER,
- type: 'GET',
- beforeSend: Utils.addAuthorizationStub,
- contentType: "application/json",
- success: function(data) {
- resolve(data["rw-launchpad:resource-orchestrator"]);
- },
- error: function(error) {
- console.log("There was an error updating the account: ", arguments);
-
- }
- }).fail(function(xhr){
- //Authentication and the handling of fail states should be wrapped up into a connection class.
- Utils.checkAuthentication(xhr.status);
- return reject('error');
- });
- });
- },
- interceptResponse: interceptResponse({
- 'error': 'There was an error retrieving the resource orchestrator information.'
- }),
- success: Alt.actions.global.getResourceOrchestratorSuccess,
- loading: Alt.actions.global.showScreenLoader,
- error: Alt.actions.global.showNotification
- },
+ error: Alt.actions.global.deleteAccountFail
+ }
}
}