From 48977e50df7db3b84794523520ddf8200a3fd539 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Thu, 11 Jun 2020 10:52:35 -0700
Subject: [PATCH] change jobs debounce to throttle; prevent duplicate rows

---
 .../src/components/JobList/JobList.jsx        |  8 ++---
 .../src/components/JobList/useWsJobs.js       | 30 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/awx/ui_next/src/components/JobList/JobList.jsx b/awx/ui_next/src/components/JobList/JobList.jsx
index bdd17cd46c..435b20d96d 100644
--- a/awx/ui_next/src/components/JobList/JobList.jsx
+++ b/awx/ui_next/src/components/JobList/JobList.jsx
@@ -68,12 +68,12 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
         params.id__in = ids.join(',');
         const { data } = await UnifiedJobsAPI.read({ ...params });
         setValue(prev => {
-          const mergedJobsList = [...data.results, ...prev.results].slice(
-            0,
-            params.page_size
+          const deDuplicated = data.results.filter(
+            job => !prev.results.find(j => j.id === job.id)
           );
+          const mergedJobsList = [...deDuplicated, ...prev.results];
           return {
-            results: mergedJobsList,
+            results: mergedJobsList.slice(0, params.page_size),
             count: prev.count + data.count,
           };
         });
diff --git a/awx/ui_next/src/components/JobList/useWsJobs.js b/awx/ui_next/src/components/JobList/useWsJobs.js
index 02a9c1671b..8602bc98c3 100644
--- a/awx/ui_next/src/components/JobList/useWsJobs.js
+++ b/awx/ui_next/src/components/JobList/useWsJobs.js
@@ -4,7 +4,9 @@ export default function useWsJobs(initialJobs, fetchJobsById, filtersApplied) {
   const [jobs, setJobs] = useState(initialJobs);
   const [lastMessage, setLastMessage] = useState(null);
   const [jobsToFetch, setJobsToFetch] = useState([]);
-  const debouncedJobsToFetch = useDebounce(jobsToFetch, 5000);
+  // const debouncedJobsToFetch = useDebounce(jobsToFetch, 5000);
+  const throttleJobsToFetch = useThrottle(jobsToFetch, 5000);
+
   useEffect(() => {
     setJobs(initialJobs);
   }, [initialJobs]);
@@ -15,11 +17,11 @@ export default function useWsJobs(initialJobs, fetchJobsById, filtersApplied) {
     }
   };
   useEffect(() => {
-    if (debouncedJobsToFetch.length) {
-      fetchJobsById(debouncedJobsToFetch);
+    if (throttleJobsToFetch.length) {
+      fetchJobsById(throttleJobsToFetch);
       setJobsToFetch([]);
     }
-  }, [debouncedJobsToFetch, fetchJobsById]);
+  }, [throttleJobsToFetch, fetchJobsById]);
 
   const ws = useRef(null);
 
@@ -100,18 +102,22 @@ function updateJob(jobs, index, message) {
   return [...jobs.slice(0, index), job, ...jobs.slice(index + 1)];
 }
 
-function useDebounce(value, delay) {
-  const [debouncedValue, setDebouncedValue] = useState(value);
+function useThrottle(value, limit) {
+  const [throttledValue, setThrottledValue] = useState(value);
+  const lastRan = useRef(Date.now());
 
   useEffect(() => {
-    const timeout = setTimeout(() => {
-      setDebouncedValue(value);
-    }, delay);
+    const handler = setTimeout(() => {
+      if (Date.now() - lastRan.current >= limit) {
+        setThrottledValue(value);
+        lastRan.current = Date.now();
+      }
+    }, limit - (Date.now() - lastRan.current));
 
     return () => {
-      clearTimeout(timeout);
+      clearTimeout(handler);
     };
-  }, [value, delay]);
+  }, [value, limit]);
 
-  return debouncedValue;
+  return throttledValue;
 }