From 8f6b679c856dfa51a352a7ee4b9b38ac9bb5fe15 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Wed, 19 Feb 2020 09:36:07 -0500
Subject: [PATCH] Fixes navigation issue and address ps issues.

---
 awx/ui_next/src/components/LaunchButton/LaunchButton.jsx      | 4 ++--
 awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx | 2 +-
 .../WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx   | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx b/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
index b18bc1233a..1793eed8ba 100644
--- a/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
+++ b/awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
@@ -62,8 +62,8 @@ class LaunchButton extends React.Component {
         const { data: job } = await launchJob;
         history.push(
           `/${
-            resource.type === 'workflow_job_template' ? 'workflow' : 'jobs'
-          }/${job.id}`
+            resource.type === 'workflow_job_template' ? 'jobs/workflow' : 'jobs'
+          }/${job.id}/output`
         );
       } else {
         this.setState({ promptError: true });
diff --git a/awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx b/awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx
index 7b292809a1..60a24054a2 100644
--- a/awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx
+++ b/awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx
@@ -55,7 +55,7 @@ describe('LaunchButton', () => {
     expect(JobTemplatesAPI.readLaunch).toHaveBeenCalledWith(1);
     await sleep(0);
     expect(JobTemplatesAPI.launch).toHaveBeenCalledWith(1);
-    expect(history.location.pathname).toEqual('/jobs/9000');
+    expect(history.location.pathname).toEqual('/jobs/9000/output');
   });
   test('should launch the correct job type', async () => {
     WorkflowJobTemplatesAPI.readLaunch.mockResolvedValue({
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
index 360f65b3d9..e68dbb3e17 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
@@ -91,8 +91,7 @@ function WorkflowJobTemplateDetail({ template, i18n, webHookKey }) {
       </Link>
     );
   };
-  const canLaunch =
-    summary_fields.user_capabilities && summary_fields.user_capabilities.start;
+  const canLaunch = summary_fields?.user_capabilities?.start;
   const recentPlaybookJobs = summary_fields.recent_jobs.map(job => ({
     ...job,
     type: 'job',