External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-03 18:48:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

reduce duplication in JobDetailService, use strict equiv checks where possible

Browse Source
This commit is contained in:
Leigh Johnson
2016-04-20 09:57:22 -04:00
parent 78907a59f8
commit 1f2ecf4e0c
2 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/job-detail/host-summary/host-summary.partial.html
View File

@@ -14,9 +14,9 @@
<div class="btn-group" > <div class="btn-group" >
<button <button
ng-click="setFilter('all')" ng-click="setFilter('all')"
class="JobDetail-tableToggle btn btn-xs" ng-class="{'btn-default': filter == 'failed', 'btn-primary': filter == 'all'}">All</button> class="JobDetail-tableToggle btn btn-xs" ng-class="{'btn-default': filter === 'failed', 'btn-primary': filter === 'all'}">All</button>
<button ng-click="setFilter('failed')" <button ng-click="setFilter('failed')"
ng-class="{'btn-default': filter == 'all', 'btn-primary': filter == 'failed'}" ng-disabled='count.failures == 0' class="JobDetail-tableToggle btn btn-xs">Failed</button> ng-class="{'btn-default': filter === 'all', 'btn-primary': filter === 'failed'}" ng-disabled='count.failures == 0' class="JobDetail-tableToggle btn btn-xs">Failed</button>
</div> </div>
</div> </div>
</div> </div>

36
awx/ui/client/src/job-detail/job-detail.service.js
View File

@@ -2,13 +2,10 @@ export default
['$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', function($rootScope, Rest, GetBasePath, ProcessErrors){ ['$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', function($rootScope, Rest, GetBasePath, ProcessErrors){
return { return {
/* stringifyParams: function(params){
* For ES6 return _.reduce(params, (result, value, key) => {
* it might be useful to set some default params here, e.g. return result + key + '=' + value + '&'}, '');
* getJobHostSummaries: function(id, page_size=200, order='host_name'){} },
* without ES6, we'd have to supply defaults like this:
* this.page_size = params.page_size ? params.page_size : 200;
*/
// the the API passes through Ansible's event_data response // the the API passes through Ansible's event_data response
// we need to massage away the verbose and redundant properties // we need to massage away the verbose and redundant properties
@@ -129,10 +126,7 @@ export default
// ?parent=206&event__startswith=runner&page_size=200&order=host_name,counter // ?parent=206&event__startswith=runner&page_size=200&order=host_name,counter
getRelatedJobEvents: function(id, params){ getRelatedJobEvents: function(id, params){
var url = GetBasePath('jobs'); var url = GetBasePath('jobs');
url = url + id + '/job_events/?' + url = url + id + '/job_events/?' + this.stringifyParams(params);
_.reduce(params, (result, value, key) => {
return result + key + '=' + value + '&'
}, '');
Rest.setUrl(url); Rest.setUrl(url);
return Rest.get() return Rest.get()
.success(function(data){ .success(function(data){
@@ -160,10 +154,7 @@ export default
// e.g. ?page_size=200&order=host_name // e.g. ?page_size=200&order=host_name
getJobHostSummaries: function(id, params){ getJobHostSummaries: function(id, params){
var url = GetBasePath('jobs'); var url = GetBasePath('jobs');
url = url + id + '/job_host_summaries/?' + url = url + id + '/job_host_summaries/?' + this.stringifyParams(params);
_.reduce(params, (result, value, key) => {
return result + key + '=' + value + '&'
}, '');
Rest.setUrl(url); Rest.setUrl(url);
return Rest.get() return Rest.get()
.success(function(data){ .success(function(data){
@@ -178,10 +169,7 @@ export default
// e.g. ?page_size=200 // e.g. ?page_size=200
getJobPlays: function(id, params){ getJobPlays: function(id, params){
var url = GetBasePath('jobs'); var url = GetBasePath('jobs');
url = url + id + '/job_plays/?' + url = url + id + '/job_plays/?' + this.stringifyParams(params);
_.reduce(params, (result, value, key) => {
return result + key + '=' + value + '&'
}, '');
Rest.setUrl(url); Rest.setUrl(url);
return Rest.get() return Rest.get()
.success(function(data){ .success(function(data){
@@ -194,10 +182,7 @@ export default
}, },
getJobTasks: function(id, params){ getJobTasks: function(id, params){
var url = GetBasePath('jobs'); var url = GetBasePath('jobs');
url = url + id + '/job_tasks/?' + url = url + id + '/job_tasks/?' + this.stringifyParams(params);
_.reduce(params, (result, value, key) => {
return result + key + '=' + value + '&'
}, '');
Rest.setUrl(url); Rest.setUrl(url);
return Rest.get() return Rest.get()
.success(function(data){ .success(function(data){
@@ -209,10 +194,7 @@ export default
}); });
}, },
getJob: function(params){ getJob: function(params){
var url = GetBasePath('unified_jobs') + '?'; + var url = GetBasePath('unified_jobs') + '?' + this.stringifyParams(params);
_.reduce(params, (result, value, key) => {
return result + key + '=' + value + '&'
}, '');
Rest.setUrl(url); Rest.setUrl(url);
return Rest.get() return Rest.get()
.success(function(data){ .success(function(data){