From 048d4dbd959dd77b43c39f0e2b95218f8c6e82cb Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Thu, 30 Jan 2020 13:55:52 -0500
Subject: [PATCH] Fixes bug where viewing the workflow output, clicking a node
 to view the details of that job and then hitting the back button would result
 in an error and no output graph.

---
 awx/ui_next/src/screens/Job/Job.jsx | 83 ++++++++++++++++-------------
 1 file changed, 46 insertions(+), 37 deletions(-)

diff --git a/awx/ui_next/src/screens/Job/Job.jsx b/awx/ui_next/src/screens/Job/Job.jsx
index 92018314bb..726c526c18 100644
--- a/awx/ui_next/src/screens/Job/Job.jsx
+++ b/awx/ui_next/src/screens/Job/Job.jsx
@@ -122,45 +122,54 @@ class Job extends Component {
               to="/jobs/:type/:id/output"
               exact
             />
-            {job && [
-              <Route
-                key="details"
-                path="/jobs/:type/:id/details"
-                render={() =>
-                  match.params.type === 'workflow' ? (
-                    <WorkflowDetail job={job} />
-                  ) : (
+            <Route
+              key="details"
+              path="/jobs/workflow/:id/details"
+              render={() =>
+                job &&
+                job.type === 'workflow_job' && <WorkflowDetail job={job} />
+              }
+            />
+            <Route
+              key="output"
+              path="/jobs/workflow/:id/output"
+              render={() =>
+                job &&
+                job.type === 'workflow_job' && <WorkflowOutput job={job} />
+              }
+            />
+            {job &&
+              job.type !== 'workflow_job' && [
+                <Route
+                  key="details"
+                  path="/jobs/:type/:id/details"
+                  render={() => (
                     <JobDetail type={match.params.type} job={job} />
-                  )
-                }
-              />,
-              <Route
-                key="output"
-                path="/jobs/:type/:id/output"
-                render={() =>
-                  match.params.type === 'workflow' ? (
-                    <WorkflowOutput job={job} />
-                  ) : (
+                  )}
+                />,
+                <Route
+                  key="output"
+                  path="/jobs/:type/:id/output"
+                  render={() => (
                     <JobOutput type={match.params.type} job={job} />
-                  )
-                }
-              />,
-              <Route
-                key="not-found"
-                path="*"
-                render={() =>
-                  !hasContentLoading && (
-                    <ContentError isNotFound>
-                      <Link
-                        to={`/jobs/${match.params.type}/${match.params.id}/details`}
-                      >
-                        {i18n._(`View Job Details`)}
-                      </Link>
-                    </ContentError>
-                  )
-                }
-              />,
-            ]}
+                  )}
+                />,
+                <Route
+                  key="not-found"
+                  path="*"
+                  render={() =>
+                    !hasContentLoading && (
+                      <ContentError isNotFound>
+                        <Link
+                          to={`/jobs/${match.params.type}/${match.params.id}/details`}
+                        >
+                          {i18n._(`View Job Details`)}
+                        </Link>
+                      </ContentError>
+                    )
+                  }
+                />,
+              ]}
           </Switch>
         </Card>
       </PageSection>