External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 13:41:28 -03:30
Code Issues Packages Projects Releases Wiki Activity

don’t add still running jobs to some jobs lists

Browse Source
This commit is contained in:
Keith Grant 2020-06-05 14:57:45 -07:00
parent b055d34139
commit 38079b2ad5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/JobList/JobList.jsx
View File

@ -54,7 +54,7 @@ function JobList({ i18n, defaultParams, showTypeColumn = false }) {
fetchJobs();
}, [fetchJobs]);
const jobs = useWsJobs(results, fetchJobs);
const jobs = useWsJobs(results, fetchJobs, !!defaultParams);
const isAllSelected = selected.length === jobs.length && selected.length > 0;
const {

8
awx/ui_next/src/components/JobList/useWsJobs.js
View File

@ -1,6 +1,6 @@
import { useState, useEffect, useRef } from 'react';
export default function useWsJobs(initialJobs, refetchJobs) {
export default function useWsJobs(initialJobs, refetchJobs, filtersApplied) {
const [jobs, setJobs] = useState(initialJobs);
const [lastMessage, setLastMessage] = useState(null);
useEffect(() => {
@ -13,6 +13,12 @@ export default function useWsJobs(initialJobs, refetchJobs) {
if (!lastMessage || !lastMessage.unified_job_id) {
return;
}
if (filtersApplied) {
if (['completed', 'failed', 'error'].includes(lastMessage.status)) {
refetchJobs();
}
return;
}
const jobId = lastMessage.unified_job_id;
const index = jobs.findIndex(j => j.id === jobId);