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

Merge pull request #9035 from mabashian/8915-source-workflow-link

Browse Source 
Display source workflow job when available on job details view

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-01-26 22:31:59 +00:00
committed by GitHub
parent b7eb1a4c59 c0690cddc8
commit ce59f1817a
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
View File

@@ -93,6 +93,7 @@ function JobDetail({ job, i18n }) {
workflow_job_template: workflowJobTemplate, workflow_job_template: workflowJobTemplate,
labels, labels,
project, project,
source_workflow_job,
} = job.summary_fields; } = job.summary_fields;
const [errorMsg, setErrorMsg] = useState(); const [errorMsg, setErrorMsg] = useState();
const history = useHistory(); const history = useHistory();
@@ -195,6 +196,16 @@ function JobDetail({ job, i18n }) {
} }
/> />
)} )}
{source_workflow_job && (
<Detail
label={i18n._(t`Source Workflow Job`)}
value={
<Link to={`/jobs/workflow/${source_workflow_job.id}`}>
{source_workflow_job.id} - {source_workflow_job.name}
</Link>
}
/>
)}
<Detail label={i18n._(t`Job Type`)} value={jobTypes[job.type]} /> <Detail label={i18n._(t`Job Type`)} value={jobTypes[job.type]} />
<Detail <Detail
label={i18n._(t`Launched By`)} label={i18n._(t`Launched By`)}

5
awx/ui_next/src/screens/Job/JobDetail/JobDetail.test.jsx
View File

@@ -35,6 +35,10 @@ describe('<JobDetail />', () => {
kubernetes: false, kubernetes: false,
credential_type_id: 1, credential_type_id: 1,
}, },
source_workflow_job: {
id: 1234,
name: 'Test Source Workflow',
},
}, },
}} }}
/> />
@@ -45,6 +49,7 @@ describe('<JobDetail />', () => {
assertDetail('Started', '8/8/2019, 7:24:18 PM'); assertDetail('Started', '8/8/2019, 7:24:18 PM');
assertDetail('Finished', '8/8/2019, 7:24:50 PM'); assertDetail('Finished', '8/8/2019, 7:24:50 PM');
assertDetail('Job Template', mockJobData.summary_fields.job_template.name); assertDetail('Job Template', mockJobData.summary_fields.job_template.name);
assertDetail('Source Workflow Job', `1234 - Test Source Workflow`);
assertDetail('Job Type', 'Playbook Run'); assertDetail('Job Type', 'Playbook Run');
assertDetail('Launched By', mockJobData.summary_fields.created_by.username); assertDetail('Launched By', mockJobData.summary_fields.created_by.username);
assertDetail('Inventory', mockJobData.summary_fields.inventory.name); assertDetail('Inventory', mockJobData.summary_fields.inventory.name);