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

Merge pull request #7943 from mabashian/7660-workflow-details

Browse Source 
Adds workflow detail tab to workflow results

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
             https://github.com/jakemcdermott
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-08-20 16:30:23 +00:00 committed by GitHub
commit 780b2be8bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,10 +7,8 @@ import { Card, PageSection } from '@patternfly/react-core';
import { JobsAPI } from '../../api';
import ContentError from '../../components/ContentError';
import RoutedTabs from '../../components/RoutedTabs';
import JobDetail from './JobDetail';
import JobOutput from './JobOutput';
import WorkflowDetail from './WorkflowDetail';
import { WorkflowOutput } from './WorkflowOutput';
import { JOB_TYPE_URL_SEGMENTS } from '../../constants';
@ -129,7 +127,7 @@ class Job extends Component {
{job &&
job.type === 'workflow_job' && [
<Route key="workflow-details" path="/jobs/workflow/:id/details">
<WorkflowDetail job={job} />
<JobDetail type={match.params.type} job={job} />
</Route>,
<Route key="workflow-output" path="/jobs/workflow/:id/output">
<WorkflowOutput job={job} />

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

@ -84,6 +84,7 @@ function JobDetail({ job, i18n }) {
instance_group: instanceGroup,
inventory,
job_template: jobTemplate,
workflow_job_template: workflowJobTemplate,
labels,
project,
} = job.summary_fields;
@ -143,7 +144,7 @@ function JobDetail({ job, i18n }) {
/>
{jobTemplate && (
<Detail
label={i18n._(t`Template`)}
label={i18n._(t`Job Template`)}
value={
<Link to={`/templates/job_template/${jobTemplate.id}`}>
{jobTemplate.name}
@ -151,6 +152,18 @@ function JobDetail({ job, i18n }) {
}
/>
)}
{workflowJobTemplate && (
<Detail
label={i18n._(t`Workflow Job Template`)}
value={
<Link
to={`/templates/workflow_job_template/${workflowJobTemplate.id}`}
>
{workflowJobTemplate.name}
</Link>
}
/>
)}
<Detail label={i18n._(t`Job Type`)} value={toTitleCase(job.job_type)} />
<Detail
label={i18n._(t`Launched By`)}

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

@ -31,7 +31,7 @@ describe('<JobDetail />', () => {
assertDetail('Status', 'Successful');
assertDetail('Started', '8/8/2019, 7:24:18 PM');
assertDetail('Finished', '8/8/2019, 7:24:50 PM');
assertDetail('Template', mockJobData.summary_fields.job_template.name);
assertDetail('Job Template', mockJobData.summary_fields.job_template.name);
assertDetail('Job Type', 'Run');
assertDetail('Launched By', mockJobData.summary_fields.created_by.username);
assertDetail('Inventory', mockJobData.summary_fields.inventory.name);

7
awx/ui_next/src/screens/Job/WorkflowDetail/WorkflowDetail.jsx
View File

@ -1,7 +0,0 @@
import React from 'react';
function WorkflowDetail() {
return <div>Workflow Detail!</div>;
}
export default WorkflowDetail;

1
awx/ui_next/src/screens/Job/WorkflowDetail/index.js
View File

@ -1 +0,0 @@
export { default } from './WorkflowDetail';