zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12868 from keithjgrant/12853-ws-event-duplication

Browse Source 
Don't add ws events twice to job output
This commit is contained in:
Jessica Steurer
2022-09-14 16:02:07 -03:00
committed by GitHub
parent 3f4d0bc15d 2d39b81e12
commit a227fea5ef
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 batchedEvents = [];
connectJobSocket(job, (data) => {
const addBatchedEvents = () => {
let min;
let max;
@@ -244,7 +243,13 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
};
});
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;
return updated.sort((a, b) => a.counter - b.counter);
});
@@ -258,6 +263,7 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
batchedEvents = [];
};
connectJobSocket(job, (data) => {
if (data.group_name === `${job.type}_events`) {
batchedEvents.push(data);
clearTimeout(batchTimeout);