|
- {{ host.name }}
+ {{ host.name }}
|
{{ host.ok }}
@@ -480,8 +482,6 @@
-
-
diff --git a/awx/ui/client/src/job-detail/job-detail.service.js b/awx/ui/client/src/job-detail/job-detail.service.js
index 8597fff9f1..381ff56c18 100644
--- a/awx/ui/client/src/job-detail/job-detail.service.js
+++ b/awx/ui/client/src/job-detail/job-detail.service.js
@@ -2,13 +2,85 @@ export default
['$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', function($rootScope, Rest, GetBasePath, ProcessErrors){
return {
- /*
+ /*
For ES6
it might be useful to set some default params here, e.g.
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
+ // we need to massage away the verbose and redundant properties
+
+ processJson: function(data){
+ // a deep copy
+ var result = $.extend(true, {}, data);
+ // configure fields to ignore
+ var ignored = [
+ 'event_data',
+ 'related',
+ 'summary_fields',
+ 'url',
+ 'ansible_facts',
+ ];
+
+ // remove ignored properties
+ Object.keys(result).forEach(function(key, index){
+ if (ignored.indexOf(key) > -1) {
+ delete result[key]
+ }
+ });
+
+ // flatten Ansible's passed-through response
+ try{
+ result.event_data = {};
+ Object.keys(data.event_data.res).forEach(function(key, index){
+ if (ignored.indexOf(key) > -1) {
+ return
+ }
+ else{
+ result.event_data[key] = data.event_data.res[key];
+ }
+ });
+ }
+ catch(err){result.event_data = null;}
+
+ return result
+ },
+
+ processEventStatus: function(event){
+ // Generate a helper class for job_event statuses
+ // the stack for which status to display is
+ // unreachable > failed > changed > ok
+ // uses the API's runner events and convenience properties .failed .changed to determine status.
+ // see: job_event_callback.py
+ if (event.event == 'runner_on_unreachable'){
+ event.status = 'Unreachable';
+ return 'HostEvents-status--unreachable'
+ }
+ // equiv to 'runner_on_error' && 'runner on failed'
+ if (event.failed){
+ event.status = 'Failed';
+ return 'HostEvents-status--failed'
+ }
+ // catch the changed case before ok, because both can be true
+ if (event.changed){
+ event.status = 'Changed';
+ return 'HostEvents-status--changed'
+ }
+ if (event.event == 'runner_on_ok'){
+ event.status = 'OK';
+ return 'HostEvents-status--ok'
+ }
+ if (event.event == 'runner_on_skipped'){
+ event.status = 'Skipped';
+ return 'HostEvents-status--skipped'
+ }
+ else{
+ // study a case where none of these apply
+ }
+ },
// GET events related to a job run
// e.g.
diff --git a/awx/ui/client/src/job-detail/main.js b/awx/ui/client/src/job-detail/main.js
index 8a9fc30aff..f497b76677 100644
--- a/awx/ui/client/src/job-detail/main.js
+++ b/awx/ui/client/src/job-detail/main.js
@@ -8,10 +8,12 @@ import route from './job-detail.route';
import controller from './job-detail.controller';
import service from './job-detail.service';
import hostEvents from './host-events/main';
+import hostEvent from './host-event/main';
export default
angular.module('jobDetail', [
- hostEvents.name
+ hostEvents.name,
+ hostEvent.name
])
.controller('JobDetailController', controller)
.service('JobDetailService', service)
diff --git a/awx/ui/client/src/job-templates/copy/job-templates-copy.service.js b/awx/ui/client/src/job-templates/copy/job-templates-copy.service.js
index d43fbff3b0..f949d142ad 100644
--- a/awx/ui/client/src/job-templates/copy/job-templates-copy.service.js
+++ b/awx/ui/client/src/job-templates/copy/job-templates-copy.service.js
@@ -23,7 +23,8 @@
set: function(data){
var defaultUrl = GetBasePath('job_templates');
Rest.setUrl(defaultUrl);
- data.results[0].name = data.results[0].name + ' ' + moment().format('h:mm:ss a'); // 2:49:11 pm
+ var name = this.buildName(data.results[0].name)
+ data.results[0].name = name + ' @ ' + moment().format('h:mm:ss a'); // 2:49:11 pm
return Rest.post(data.results[0])
.success(function(res){
return res
@@ -32,6 +33,10 @@
ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
});
+ },
+ buildName: function(name){
+ var result = name.split('@')[0];
+ return result
}
}
}
diff --git a/awx/ui/client/src/partials/eventviewer.html b/awx/ui/client/src/partials/eventviewer.html
deleted file mode 100644
index 941e9d80d6..0000000000
--- a/awx/ui/client/src/partials/eventviewer.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
diff --git a/awx/ui/client/src/shared/layouts/one-plus-two.less b/awx/ui/client/src/shared/layouts/one-plus-two.less
index 87c44fe056..a296af7127 100644
--- a/awx/ui/client/src/shared/layouts/one-plus-two.less
+++ b/awx/ui/client/src/shared/layouts/one-plus-two.less
@@ -61,7 +61,8 @@
}
.OnePlusTwo-left--detailsLabel {
- width: 140px;
+ word-wrap: break-word;
+ width: 170px;
display: inline-block;
color: @default-interface-txt;
text-transform: uppercase;
|