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

Merge pull request #11209 from kialam/fix-job-list-refresh

Browse Source 
Pass configurable qs to fetchJobsById function.
This commit is contained in:
Wambugu “Innocent” Kironji 2021-10-08 13:18:53 -04:00 committed by GitHub
commit dda940344e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/src/components/JobList/JobList.js
View File

@ -98,15 +98,14 @@ function JobList({ defaultParams, showTypeColumn = false }) {
fetchJobs();
}, [fetchJobs]);
// TODO: update QS_CONFIG to be safe for deps array
const fetchJobsById = useCallback(
async (ids) => {
const params = parseQueryString(qsConfig, location.search);
async (ids, qs = {}) => {
const params = parseQueryString(qs, location.search);
params.id__in = ids.join(',');
const { data } = await UnifiedJobsAPI.read(params);
return data.results;
},
[location.search] // eslint-disable-line react-hooks/exhaustive-deps
[location.search]
);
const jobs = useWsJobs(results, fetchJobsById, qsConfig);

55
awx/ui/src/components/JobList/JobList.test.js
View File

@ -265,6 +265,61 @@ describe('<JobList />', () => {
jest.restoreAllMocks();
});
test('should query jobs list after delete API requests', async () => {
UnifiedJobsAPI.read.mockResolvedValue({
data: {
count: 1,
results: [
{
id: 1,
url: '/api/v2/project_updates/1',
name: 'job 1',
type: 'project_update',
status: 'running',
related: {
cancel: '/api/v2/project_updates/1/cancel',
},
summary_fields: {
user_capabilities: {
delete: true,
start: true,
},
},
},
],
},
});
const jobListParams = {
order_by: '-finished',
not__launch_type: 'sync',
page: 1,
page_size: 20,
};
let wrapper;
await act(async () => {
wrapper = mountWithContexts(<JobList />);
});
await waitForLoaded(wrapper);
act(() => {
expect(UnifiedJobsAPI.read).toHaveBeenCalledTimes(1);
wrapper.find('DataListToolbar').invoke('onSelectAll')(true);
});
wrapper.update();
wrapper.find('JobListItem');
expect(
wrapper.find('ToolbarDeleteButton').prop('itemsToDelete')
).toHaveLength(1);
await act(async () => {
wrapper.find('ToolbarDeleteButton').invoke('onDelete')();
expect(UnifiedJobsAPI.read).toHaveBeenCalledTimes(1);
expect(UnifiedJobsAPI.read).toHaveBeenCalledWith(jobListParams);
});
jest.restoreAllMocks();
});
test('should display message about job running status', async () => {
UnifiedJobsAPI.read.mockResolvedValue({
data: {