External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-21 06:28:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Add websocket connection info for remaining job types

Browse Source
This commit is contained in:
gconsidine 2018-02-19 13:33:40 -05:00 committed by Jake McDermott
parent e143698484
commit 83897d43a7
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/features/output/index.controller.js
View File

@ -119,6 +119,7 @@ function clear () {
function processWebSocketEvents (scope, data) {
meta.scroll.inProgress = true;
console.log(data);
append([data])
.then(() => {
container[0].scrollTop = container[0].scrollHeight;

38
awx/ui/client/features/output/index.js
View File

@ -47,33 +47,45 @@ function resolveResource (Job, ProjectUpdate, AdHocCommand, SystemJob, WorkflowJ
page_size: 100,
order_by: 'start_line'
}
}))
.catch(err => {
console.error(err);
});
}));
}
function resolveWebSocket (SocketService, $stateParams) {
const { type, id } = $stateParams;
const prefix = 'ws';
const { id } = $stateParams;
const { type } = $stateParams;
let name;
let events;
switch (type) {
case 'playbook':
name = 'job_events';
case 'system':
name = 'system_jobs';
events = 'system_job_events';
break;
case 'project':
name = 'project_updates';
events = 'project_update_events';
break;
case 'command':
name = 'ad_hoc_commands';
events = 'ad_hoc_command_events';
break;
case 'inventory':
name = 'inventory_updates';
events = 'inventory_update_events';
break;
case 'playbook':
name = 'jobs';
events = 'job_events';
break;
default:
name = 'events';
}
const state = {
data: {
socket: {
groups: {
jobs: ['status_changed', 'summary'],
[name]: []
[name]: ['status_changed', 'summary'],
[events]: []
}
}
}
@ -81,7 +93,7 @@ function resolveWebSocket (SocketService, $stateParams) {
SocketService.addStateResolve(state, id);
return `${prefix}-${name}-${id}`;
return `${prefix}-${events}-${id}`;
}
function resolveBreadcrumb (strings) {

12
awx/ui/client/src/shared/socket/socket.service.js
View File

@ -90,12 +90,18 @@ export default
// ex: 'ws-jobs-<jobId>'
str = `ws-${data.group_name}-${data.job}`;
}
else if(data.group_name==="project_update_events"){
str = `ws-${data.group_name}-${data.project_update}`;
}
else if(data.group_name==="ad_hoc_command_events"){
// The naming scheme is "ws" then a
// dash (-) and the group_name, then the job ID
// ex: 'ws-jobs-<jobId>'
str = `ws-${data.group_name}-${data.ad_hoc_command}`;
}
else if(data.group_name==="system_job_events"){
str = `ws-${data.group_name}-${data.system_job}`;
}
else if(data.group_name==="inventory_update_events"){
str = `ws-${data.group_name}-${data.inventory_update}`;
}
else if(data.group_name==="control"){
// As of v. 3.1.0, there is only 1 "control"
// message, which is for expiring the session if the