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

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.

Browse Source
This commit is contained in:
mabashian
2020-01-30 13:55:52 -05:00
parent c70e5357d3
commit 048d4dbd95
1 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,45 +122,54 @@ class Job extends Component {
to="/jobs/:type/:id/output" to="/jobs/:type/:id/output"
exact exact
/> />
{job && [ <Route
<Route key="details"
key="details" path="/jobs/workflow/:id/details"
path="/jobs/:type/:id/details" render={() =>
render={() => job &&
match.params.type === 'workflow' ? ( job.type === 'workflow_job' && <WorkflowDetail job={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} /> <JobDetail type={match.params.type} job={job} />
) )}
} />,
/>, <Route
<Route key="output"
key="output" path="/jobs/:type/:id/output"
path="/jobs/:type/:id/output" render={() => (
render={() =>
match.params.type === 'workflow' ? (
<WorkflowOutput job={job} />
) : (
<JobOutput type={match.params.type} job={job} /> <JobOutput type={match.params.type} job={job} />
) )}
} />,
/>, <Route
<Route key="not-found"
key="not-found" path="*"
path="*" render={() =>
render={() => !hasContentLoading && (
!hasContentLoading && ( <ContentError isNotFound>
<ContentError isNotFound> <Link
<Link to={`/jobs/${match.params.type}/${match.params.id}/details`}
to={`/jobs/${match.params.type}/${match.params.id}/details`} >
> {i18n._(`View Job Details`)}
{i18n._(`View Job Details`)} </Link>
</Link> </ContentError>
</ContentError> )
) }
} />,
/>, ]}
]}
</Switch> </Switch>
</Card> </Card>
</PageSection> </PageSection>