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

Merge pull request #11788 from AlexSCorey/10281-OutputHostFilters

Browse Source 
Fixes search drop down items for job output search
This commit is contained in:
Sarah Akus 2022-03-23 09:45:01 -04:00 committed by GitHub
commit 4fa8b6ded8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/src/screens/Job/JobOutput/JobOutputSearch.js
View File

@ -93,9 +93,12 @@ function JobOutputSearch({
key: 'stdout__icontains',
isDefault: true,
},
{
];
if (job.type !== 'system_job' && job.type !== 'inventory_update') {
columns.push({
name: t`Event`,
key: 'event',
key: 'or__event',
options: [
['runner_on_failed', t`Host Failed`],
['runner_on_start', t`Host Started`],
@ -129,9 +132,9 @@ function JobOutputSearch({
['system_warning', t`System Warning`],
['error', t`Error`],
],
},
{ name: t`Advanced`, key: 'advanced' },
];
});
}
columns.push({ name: t`Advanced`, key: 'advanced' });
const isDisabled = isJobRunning(job.status);
return (

55
awx/ui/src/screens/Job/JobOutput/JobOutputSearch.test.js
View File

@ -23,6 +23,7 @@ describe('JobOutputSearch', () => {
<JobOutputSearch
job={{
status: 'successful',
type: 'project',
}}
qsConfig={{
defaultParams: { page: 1 },
@ -42,7 +43,59 @@ describe('JobOutputSearch', () => {
await act(async () => {
wrapper.find(searchBtn).simulate('click');
});
expect(wrapper.find('Search').prop('columns')).toHaveLength(3);
expect(wrapper.find('Search').prop('columns').at(0).name).toBe('Stdout');
expect(wrapper.find('Search').prop('columns').at(1).name).toBe('Event');
expect(wrapper.find('Search').prop('columns').at(2).name).toBe('Advanced');
expect(history.location.search).toEqual('?stdout__icontains=99');
});
test('Should not have Event key in search drop down for system job', () => {
const history = createMemoryHistory({
initialEntries: ['/jobs/playbook/1/output'],
});
const wrapper = mountWithContexts(
<JobOutputSearch
job={{
status: 'successful',
type: 'system_job',
}}
qsConfig={{
defaultParams: { page: 1 },
integerFields: ['page', 'page_size'],
}}
/>,
{
context: { router: { history } },
}
);
expect(wrapper.find('Search').prop('columns')).toHaveLength(2);
expect(wrapper.find('Search').prop('columns').at(0).name).toBe('Stdout');
expect(wrapper.find('Search').prop('columns').at(1).name).toBe('Advanced');
});
test('Should not have Event key in search drop down for inventory update job', () => {
const history = createMemoryHistory({
initialEntries: ['/jobs/playbook/1/output'],
});
const wrapper = mountWithContexts(
<JobOutputSearch
job={{
status: 'successful',
type: 'inventory_update',
}}
qsConfig={{
defaultParams: { page: 1 },
integerFields: ['page', 'page_size'],
}}
/>,
{
context: { router: { history } },
}
);
expect(wrapper.find('Search').prop('columns')).toHaveLength(2);
expect(wrapper.find('Search').prop('columns').at(0).name).toBe('Stdout');
expect(wrapper.find('Search').prop('columns').at(1).name).toBe('Advanced');
});
});