External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-11 19:37:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

don't add ws events twice to job output

Browse Source
This commit is contained in:
Keith J. Grant
2022-09-08 16:07:41 -07:00
parent 63567fcc52
commit 2d39b81e12
1 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/src/screens/Job/JobOutput/JobOutput.js
View File

@@ -225,7 +225,6 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
} }
let batchTimeout; let batchTimeout;
let batchedEvents = []; let batchedEvents = [];
connectJobSocket(job, (data) => {
const addBatchedEvents = () => { const addBatchedEvents = () => {
let min; let min;
let max; let max;
@@ -244,7 +243,13 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
}; };
}); });
setWsEvents((oldWsEvents) => { setWsEvents((oldWsEvents) => {
const updated = oldWsEvents.concat(batchedEvents); const newEvents = [];
batchedEvents.forEach((event) => {
if (!oldWsEvents.find((e) => e.id === event.id)) {
newEvents.push(event);
}
});
const updated = oldWsEvents.concat(newEvents);
jobSocketCounter.current = updated.length; jobSocketCounter.current = updated.length;
return updated.sort((a, b) => a.counter - b.counter); return updated.sort((a, b) => a.counter - b.counter);
}); });
@@ -258,6 +263,7 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
batchedEvents = []; batchedEvents = [];
}; };
connectJobSocket(job, (data) => {
if (data.group_name === `${job.type}_events`) { if (data.group_name === `${job.type}_events`) {
batchedEvents.push(data); batchedEvents.push(data);
clearTimeout(batchTimeout); clearTimeout(batchTimeout);