mirror of
https://github.com/ansible/awx.git
synced 2026-05-16 05:47:38 -02:30
Add websocket connection info for remaining job types
This commit is contained in:
committed by
Jake McDermott
parent
e143698484
commit
83897d43a7
@@ -119,6 +119,7 @@ function clear () {
|
|||||||
function processWebSocketEvents (scope, data) {
|
function processWebSocketEvents (scope, data) {
|
||||||
meta.scroll.inProgress = true;
|
meta.scroll.inProgress = true;
|
||||||
|
|
||||||
|
console.log(data);
|
||||||
append([data])
|
append([data])
|
||||||
.then(() => {
|
.then(() => {
|
||||||
container[0].scrollTop = container[0].scrollHeight;
|
container[0].scrollTop = container[0].scrollHeight;
|
||||||
|
|||||||
@@ -47,33 +47,45 @@ function resolveResource (Job, ProjectUpdate, AdHocCommand, SystemJob, WorkflowJ
|
|||||||
page_size: 100,
|
page_size: 100,
|
||||||
order_by: 'start_line'
|
order_by: 'start_line'
|
||||||
}
|
}
|
||||||
}))
|
}));
|
||||||
.catch(err => {
|
|
||||||
console.error(err);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function resolveWebSocket (SocketService, $stateParams) {
|
function resolveWebSocket (SocketService, $stateParams) {
|
||||||
|
const { type, id } = $stateParams;
|
||||||
const prefix = 'ws';
|
const prefix = 'ws';
|
||||||
const { id } = $stateParams;
|
|
||||||
const { type } = $stateParams;
|
|
||||||
|
|
||||||
let name;
|
let name;
|
||||||
|
let events;
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'playbook':
|
case 'system':
|
||||||
name = 'job_events';
|
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;
|
break;
|
||||||
default:
|
|
||||||
name = 'events';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const state = {
|
const state = {
|
||||||
data: {
|
data: {
|
||||||
socket: {
|
socket: {
|
||||||
groups: {
|
groups: {
|
||||||
jobs: ['status_changed', 'summary'],
|
[name]: ['status_changed', 'summary'],
|
||||||
[name]: []
|
[events]: []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -81,7 +93,7 @@ function resolveWebSocket (SocketService, $stateParams) {
|
|||||||
|
|
||||||
SocketService.addStateResolve(state, id);
|
SocketService.addStateResolve(state, id);
|
||||||
|
|
||||||
return `${prefix}-${name}-${id}`;
|
return `${prefix}-${events}-${id}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function resolveBreadcrumb (strings) {
|
function resolveBreadcrumb (strings) {
|
||||||
|
|||||||
@@ -90,12 +90,18 @@ export default
|
|||||||
// ex: 'ws-jobs-<jobId>'
|
// ex: 'ws-jobs-<jobId>'
|
||||||
str = `ws-${data.group_name}-${data.job}`;
|
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"){
|
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}`;
|
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"){
|
else if(data.group_name==="control"){
|
||||||
// As of v. 3.1.0, there is only 1 "control"
|
// As of v. 3.1.0, there is only 1 "control"
|
||||||
// message, which is for expiring the session if the
|
// message, which is for expiring the session if the
|
||||||
|
|||||||
Reference in New Issue
Block a user