diff --git a/awx/ui/src/components/JobList/JobList.js b/awx/ui/src/components/JobList/JobList.js index 4471df2333..c2b2d7b472 100644 --- a/awx/ui/src/components/JobList/JobList.js +++ b/awx/ui/src/components/JobList/JobList.js @@ -103,13 +103,17 @@ function JobList({ }, [fetchJobs]); const fetchJobsById = useCallback( - async (ids, qs = {}) => { - const params = parseQueryString(qs, location.search); + async (ids) => { + const params = parseQueryString(qsConfig, location.search); params.id__in = ids.join(','); - const { data } = await UnifiedJobsAPI.read(params); - return data.results; + try { + const { data } = await UnifiedJobsAPI.read(params); + return data.results; + } catch (e) { + return []; + } }, - [location.search] + [location.search] // eslint-disable-line react-hooks/exhaustive-deps ); const jobs = useWsJobs(results, fetchJobsById, qsConfig); diff --git a/awx/ui/src/components/JobList/useWsJobs.js b/awx/ui/src/components/JobList/useWsJobs.js index b2173950cc..0d60868c87 100644 --- a/awx/ui/src/components/JobList/useWsJobs.js +++ b/awx/ui/src/components/JobList/useWsJobs.js @@ -47,16 +47,9 @@ export default function useWsJobs(initialJobs, fetchJobsById, qsConfig) { return; } const params = parseQueryString(qsConfig, location.search); - const filtersApplied = Object.keys(params).length > 4; - if ( - filtersApplied && - !['completed', 'failed', 'error'].includes(lastMessage.status) - ) { - return; - } - const jobId = lastMessage.unified_job_id; const index = jobs.findIndex((j) => j.id === jobId); + if (index > -1) { setJobs(sortJobs(updateJob(jobs, index, lastMessage), params)); } else {