External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Only attempt to fetch event options on non workflow jobs

Browse Source
This commit is contained in:
mabashian
2021-03-19 16:52:26 -04:00
parent f98c6b5c5b
commit 9b3aa60468
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui_next/src/screens/Job/Job.jsx
View File

@@ -33,11 +33,15 @@ function Job({ i18n, setBreadcrumb }) {
result: { jobDetail, eventRelatedSearchableKeys, eventSearchableKeys }, result: { jobDetail, eventRelatedSearchableKeys, eventSearchableKeys },
} = useRequest( } = useRequest(
useCallback(async () => { useCallback(async () => {
let eventOptions = {};
const { data: jobDetailData } = await JobsAPI.readDetail(id, type); const { data: jobDetailData } = await JobsAPI.readDetail(id, type);
const { data: jobEventOptions } = await JobsAPI.readEventOptions( if (jobDetailData.type !== 'workflow_job') {
id, const { data: jobEventOptions } = await JobsAPI.readEventOptions(
type id,
); type
);
eventOptions = jobEventOptions;
}
if ( if (
jobDetailData?.summary_fields?.credentials?.find( jobDetailData?.summary_fields?.credentials?.find(
cred => cred.kind === 'vault' cred => cred.kind === 'vault'
@@ -54,11 +58,11 @@ function Job({ i18n, setBreadcrumb }) {
return { return {
jobDetail: jobDetailData, jobDetail: jobDetailData,
eventRelatedSearchableKeys: ( eventRelatedSearchableKeys: (
jobEventOptions?.related_search_fields || [] eventOptions?.related_search_fields || []
).map(val => val.slice(0, -8)), ).map(val => val.slice(0, -8)),
eventSearchableKeys: Object.keys( eventSearchableKeys: Object.keys(
jobEventOptions.actions?.GET || {} eventOptions?.actions?.GET || {}
).filter(key => jobEventOptions.actions?.GET[key].filterable), ).filter(key => eventOptions?.actions?.GET[key].filterable),
}; };
}, [id, type, setBreadcrumb]), }, [id, type, setBreadcrumb]),
{ {