From 2d39b81e12f2afaf57a302d6ccbba04ca4f7519d Mon Sep 17 00:00:00 2001
From: "Keith J. Grant" <barkeep@keithjgrant.com>
Date: Thu, 8 Sep 2022 16:07:41 -0700
Subject: [PATCH] don't add ws events twice to job output

---
 awx/ui/src/screens/Job/JobOutput/JobOutput.js | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/awx/ui/src/screens/Job/JobOutput/JobOutput.js b/awx/ui/src/screens/Job/JobOutput/JobOutput.js
index 9813d61cd7..c4949d1ffe 100644
--- a/awx/ui/src/screens/Job/JobOutput/JobOutput.js
+++ b/awx/ui/src/screens/Job/JobOutput/JobOutput.js
@@ -225,39 +225,45 @@ function JobOutput({ job, eventRelatedSearchableKeys, eventSearchableKeys }) {
     }
     let batchTimeout;
     let batchedEvents = [];
-    connectJobSocket(job, (data) => {
-      const addBatchedEvents = () => {
-        let min;
-        let max;
-        let newCssMap;
-        batchedEvents.forEach((event) => {
-          if (!min || event.counter < min) {
-            min = event.counter;
-          }
-          if (!max || event.counter > max) {
-            max = event.counter;
-          }
-          const { lineCssMap } = getLineTextHtml(event);
-          newCssMap = {
-            ...newCssMap,
-            ...lineCssMap,
-          };
-        });
-        setWsEvents((oldWsEvents) => {
-          const updated = oldWsEvents.concat(batchedEvents);
-          jobSocketCounter.current = updated.length;
-          return updated.sort((a, b) => a.counter - b.counter);
-        });
-        setCssMap((prevCssMap) => ({
-          ...prevCssMap,
-          ...newCssMap,
-        }));
-        if (max > jobSocketCounter.current) {
-          jobSocketCounter.current = max;
+    const addBatchedEvents = () => {
+      let min;
+      let max;
+      let newCssMap;
+      batchedEvents.forEach((event) => {
+        if (!min || event.counter < min) {
+          min = event.counter;
         }
-        batchedEvents = [];
-      };
+        if (!max || event.counter > max) {
+          max = event.counter;
+        }
+        const { lineCssMap } = getLineTextHtml(event);
+        newCssMap = {
+          ...newCssMap,
+          ...lineCssMap,
+        };
+      });
+      setWsEvents((oldWsEvents) => {
+        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);
+      });
+      setCssMap((prevCssMap) => ({
+        ...prevCssMap,
+        ...newCssMap,
+      }));
+      if (max > jobSocketCounter.current) {
+        jobSocketCounter.current = max;
+      }
+      batchedEvents = [];
+    };
 
+    connectJobSocket(job, (data) => {
       if (data.group_name === `${job.type}_events`) {
         batchedEvents.push(data);
         clearTimeout(batchTimeout);