From c0cb1dee91bae4a45580841eb3682cfad93b0104 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 19 Aug 2020 13:55:42 -0400
Subject: [PATCH] Adds workflow detail tab to workflow results

---
 awx/ui_next/src/screens/Job/Job.jsx               |  4 +---
 .../src/screens/Job/JobDetail/JobDetail.jsx       | 15 ++++++++++++++-
 .../src/screens/Job/JobDetail/JobDetail.test.jsx  |  2 +-
 .../screens/Job/WorkflowDetail/WorkflowDetail.jsx |  7 -------
 .../src/screens/Job/WorkflowDetail/index.js       |  1 -
 5 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 awx/ui_next/src/screens/Job/WorkflowDetail/WorkflowDetail.jsx
 delete mode 100644 awx/ui_next/src/screens/Job/WorkflowDetail/index.js

diff --git a/awx/ui_next/src/screens/Job/Job.jsx b/awx/ui_next/src/screens/Job/Job.jsx
index bc95cfaf39..9530c4eeb3 100644
--- a/awx/ui_next/src/screens/Job/Job.jsx
+++ b/awx/ui_next/src/screens/Job/Job.jsx
@@ -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} />
diff --git a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
index dc7a3e0e6b..cd7b2c4dd3 100644
--- a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
+++ b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
@@ -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`)}
diff --git a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.test.jsx b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.test.jsx
index e5bc71c53d..2d5ff5d5fe 100644
--- a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.test.jsx
+++ b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.test.jsx
@@ -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);
diff --git a/awx/ui_next/src/screens/Job/WorkflowDetail/WorkflowDetail.jsx b/awx/ui_next/src/screens/Job/WorkflowDetail/WorkflowDetail.jsx
deleted file mode 100644
index 26d0384ab3..0000000000
--- a/awx/ui_next/src/screens/Job/WorkflowDetail/WorkflowDetail.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-
-function WorkflowDetail() {
-  return <div>Workflow Detail!</div>;
-}
-
-export default WorkflowDetail;
diff --git a/awx/ui_next/src/screens/Job/WorkflowDetail/index.js b/awx/ui_next/src/screens/Job/WorkflowDetail/index.js
deleted file mode 100644
index 3ced22dd95..0000000000
--- a/awx/ui_next/src/screens/Job/WorkflowDetail/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './WorkflowDetail';