mirror of
https://github.com/ansible/awx.git
synced 2026-01-11 10:00:01 -03:30
jshint fixes
This commit is contained in:
parent
4134857794
commit
6dbfba7f69
@ -17,11 +17,11 @@ if ($basePath) {
|
||||
urlPrefix = $basePath;
|
||||
}
|
||||
|
||||
import * as Helpers from 'tower/helpers';
|
||||
import * as Forms from 'tower/forms';
|
||||
import * as Lists from 'tower/lists';
|
||||
import * as Widgets from 'tower/widgets';
|
||||
import * as Help from 'tower/help';
|
||||
import 'tower/helpers';
|
||||
import 'tower/forms';
|
||||
import 'tower/lists';
|
||||
import 'tower/widgets';
|
||||
import 'tower/help';
|
||||
import {Home, HomeGroups, HomeHosts} from 'tower/controllers/Home';
|
||||
import {SocketsController} from 'tower/controllers/Sockets';
|
||||
import {Authenticate} from 'tower/controllers/Authentication';
|
||||
@ -56,7 +56,7 @@ var tower = angular.module('Tower', [
|
||||
dashboardGraphs.name,
|
||||
'AuthService',
|
||||
'Utilities',
|
||||
Helpers.License.name,
|
||||
'License',
|
||||
'OrganizationFormDefinition',
|
||||
'UserFormDefinition',
|
||||
'FormGenerator',
|
||||
|
||||
@ -55,4 +55,4 @@ export
|
||||
SurveyQuestion,
|
||||
Teams,
|
||||
Users
|
||||
}
|
||||
};
|
||||
|
||||
@ -8,4 +8,4 @@ export
|
||||
FirefoxSocketHelp,
|
||||
InventoryGroups,
|
||||
SafariSocketHelp
|
||||
}
|
||||
};
|
||||
|
||||
@ -79,4 +79,4 @@ export
|
||||
RelatedSearch,
|
||||
Search,
|
||||
Teams
|
||||
}
|
||||
};
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
*
|
||||
*/
|
||||
/**
|
||||
* @ngdoc function
|
||||
* @name helpers.function:JobTemplatesHelper
|
||||
* @description Routines shared by job related controllers
|
||||
*/
|
||||
* @ngdoc function
|
||||
* @name helpers.function:JobTemplatesHelper
|
||||
* @description Routines shared by job related controllers
|
||||
*/
|
||||
|
||||
export default
|
||||
angular.module('JobTemplatesHelper', ['Utilities'])
|
||||
|
||||
@ -58,4 +58,4 @@ export
|
||||
Streams,
|
||||
Teams,
|
||||
Users
|
||||
}
|
||||
};
|
||||
|
||||
@ -86,4 +86,4 @@ export default function() {
|
||||
|
||||
chartModel.update();
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,48 +1,47 @@
|
||||
HostCountGraphData.$inject =
|
||||
export default
|
||||
[ "Rest",
|
||||
"GetBasePath",
|
||||
"ProcessErrors",
|
||||
"$q"
|
||||
]
|
||||
"$q",
|
||||
HostCountGraphData
|
||||
];
|
||||
|
||||
export default
|
||||
function HostCountGraphData(Rest, getBasePath, processErrors, $q) {
|
||||
function HostCountGraphData(Rest, getBasePath, processErrors, $q) {
|
||||
|
||||
function pluck(property, promise) {
|
||||
return promise.then(function(value) {
|
||||
return value[property];
|
||||
});
|
||||
}
|
||||
|
||||
function getLicenseData() {
|
||||
var url = getBasePath('config');
|
||||
Rest.setUrl(url);
|
||||
return Rest.get()
|
||||
.then(function (data){
|
||||
var license = data.data.license_info.instance_count;
|
||||
return license;
|
||||
});
|
||||
}
|
||||
|
||||
function getHostData() {
|
||||
var url = getBasePath('dashboard')+'graphs/inventory/';
|
||||
Rest.setUrl(url);
|
||||
return pluck('data', Rest.get());
|
||||
}
|
||||
|
||||
return {
|
||||
get: function() {
|
||||
return $q.all({
|
||||
license: getLicenseData(),
|
||||
hosts: getHostData()
|
||||
}).catch(function (response) {
|
||||
var errorMessage = 'Failed to get: ' + response.url + ' GET returned: ' + response.status;
|
||||
processErrors(null, response.data, response.status, null, { hdr: 'Error!',
|
||||
msg: errorMessage
|
||||
});
|
||||
return response;
|
||||
return $q.reject(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
function pluck(property, promise) {
|
||||
return promise.then(function(value) {
|
||||
return value[property];
|
||||
});
|
||||
}
|
||||
|
||||
function getLicenseData() {
|
||||
var url = getBasePath('config');
|
||||
Rest.setUrl(url);
|
||||
return Rest.get()
|
||||
.then(function (data){
|
||||
var license = data.data.license_info.instance_count;
|
||||
return license;
|
||||
});
|
||||
}
|
||||
|
||||
function getHostData() {
|
||||
var url = getBasePath('dashboard')+'graphs/inventory/';
|
||||
Rest.setUrl(url);
|
||||
return pluck('data', Rest.get());
|
||||
}
|
||||
|
||||
return {
|
||||
get: function() {
|
||||
return $q.all({
|
||||
license: getLicenseData(),
|
||||
hosts: getHostData()
|
||||
}).catch(function (response) {
|
||||
var errorMessage = 'Failed to get: ' + response.url + ' GET returned: ' + response.status;
|
||||
processErrors(null, response.data, response.status, null, { hdr: 'Error!',
|
||||
msg: errorMessage
|
||||
});
|
||||
return $q.reject(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,54 +6,54 @@ export default
|
||||
"$q",
|
||||
JobStatusGraphData];
|
||||
|
||||
function JobStatusGraphData(Rest, getBasePath, processErrors, $rootScope, $q) {
|
||||
function JobStatusGraphData(Rest, getBasePath, processErrors, $rootScope, $q) {
|
||||
|
||||
function pluck(property, promise) {
|
||||
return promise.then(function(value) {
|
||||
return value[property];
|
||||
});
|
||||
}
|
||||
|
||||
function getData(period, jobType) {
|
||||
var url = getBasePath('dashboard')+'graphs/jobs/?period='+period+'&job_type='+jobType;
|
||||
Rest.setUrl(url);
|
||||
var result = Rest.get()
|
||||
.catch(function(response) {
|
||||
var errorMessage = 'Failed to get: ' + response.url + ' GET returned: ' + response.status;
|
||||
|
||||
processErrors(null,
|
||||
response.data,
|
||||
response.status,
|
||||
null, {
|
||||
hdr: 'Error!',
|
||||
msg: errorMessage
|
||||
});
|
||||
return $q.reject(response);
|
||||
});
|
||||
|
||||
return pluck('data', result);
|
||||
}
|
||||
|
||||
return {
|
||||
destroyWatcher: angular.noop,
|
||||
setupWatcher: function(period, jobType) {
|
||||
this.destroyWatcher =
|
||||
$rootScope.$on('JobStatusChange', function() {
|
||||
getData(period, jobType).then(function(result) {
|
||||
$rootScope.
|
||||
$broadcast('DataReceived:JobStatusGraph',
|
||||
result);
|
||||
return result;
|
||||
});
|
||||
});
|
||||
},
|
||||
get: function(period, jobType) {
|
||||
|
||||
this.destroyWatcher();
|
||||
this.setupWatcher(period, jobType);
|
||||
|
||||
return getData(period, jobType);
|
||||
|
||||
}
|
||||
};
|
||||
function pluck(property, promise) {
|
||||
return promise.then(function(value) {
|
||||
return value[property];
|
||||
});
|
||||
}
|
||||
|
||||
function getData(period, jobType) {
|
||||
var url = getBasePath('dashboard')+'graphs/jobs/?period='+period+'&job_type='+jobType;
|
||||
Rest.setUrl(url);
|
||||
var result = Rest.get()
|
||||
.catch(function(response) {
|
||||
var errorMessage = 'Failed to get: ' + response.url + ' GET returned: ' + response.status;
|
||||
|
||||
processErrors(null,
|
||||
response.data,
|
||||
response.status,
|
||||
null, {
|
||||
hdr: 'Error!',
|
||||
msg: errorMessage
|
||||
});
|
||||
return $q.reject(response);
|
||||
});
|
||||
|
||||
return pluck('data', result);
|
||||
}
|
||||
|
||||
return {
|
||||
destroyWatcher: angular.noop,
|
||||
setupWatcher: function(period, jobType) {
|
||||
this.destroyWatcher =
|
||||
$rootScope.$on('JobStatusChange', function() {
|
||||
getData(period, jobType).then(function(result) {
|
||||
$rootScope.
|
||||
$broadcast('DataReceived:JobStatusGraph',
|
||||
result);
|
||||
return result;
|
||||
});
|
||||
});
|
||||
},
|
||||
get: function(period, jobType) {
|
||||
|
||||
this.destroyWatcher();
|
||||
this.setupWatcher(period, jobType);
|
||||
|
||||
return getData(period, jobType);
|
||||
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,4 +22,4 @@ export
|
||||
PortalJobs,
|
||||
SCMSyncStatus,
|
||||
Stream
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user