External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 14:39:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict error

Browse Source
This commit is contained in:
mabashian
2020-09-03 15:34:07 -04:00
parent 5b56bda0bb
commit 45ca9976f3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,6 @@ import RoutedTabs from '../../components/RoutedTabs';
import useRequest from '../../util/useRequest'; import useRequest from '../../util/useRequest';
import JobDetail from './JobDetail'; import JobDetail from './JobDetail';
import JobOutput from './JobOutput'; import JobOutput from './JobOutput';
import WorkflowDetail from './WorkflowDetail';
import { WorkflowOutput } from './WorkflowOutput'; import { WorkflowOutput } from './WorkflowOutput';
import useWsJob from './useWsJob'; import useWsJob from './useWsJob';
import { JOB_TYPE_URL_SEGMENTS } from '../../constants'; import { JOB_TYPE_URL_SEGMENTS } from '../../constants';
@@ -47,7 +46,7 @@ function Job({ i18n, lookup, setBreadcrumb }) {
jobType = JOB_TYPE_URL_SEGMENTS[job.type]; jobType = JOB_TYPE_URL_SEGMENTS[job.type];
} }
const tabsArray = [ const tabsArray = [
{ {
name: ( name: (
<> <>
@@ -98,7 +97,7 @@ const tabsArray = [
{job && {job &&
job.type === 'workflow_job' && [ job.type === 'workflow_job' && [
<Route key="workflow-details" path="/jobs/workflow/:id/details"> <Route key="workflow-details" path="/jobs/workflow/:id/details">
<WorkflowDetail job={job} /> <JobDetail type={match.params.type} job={job} />
</Route>, </Route>,
<Route key="workflow-output" path="/jobs/workflow/:id/output"> <Route key="workflow-output" path="/jobs/workflow/:id/output">
<WorkflowOutput job={job} /> <WorkflowOutput job={job} />