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

Fixes navigation issue and address ps issues.

Browse Source
This commit is contained in:
Alex Corey
2020-02-19 09:36:07 -05:00
parent 32e017bd03
commit 8f6b679c85
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/components/LaunchButton/LaunchButton.jsx
View File

@@ -62,8 +62,8 @@ class LaunchButton extends React.Component {
const { data: job } = await launchJob; const { data: job } = await launchJob;
history.push( history.push(
`/${ `/${
resource.type === 'workflow_job_template' ? 'workflow' : 'jobs' resource.type === 'workflow_job_template' ? 'jobs/workflow' : 'jobs'
}/${job.id}` }/${job.id}/output`
); );
} else { } else {
this.setState({ promptError: true }); this.setState({ promptError: true });

2
awx/ui_next/src/components/LaunchButton/LaunchButton.test.jsx
View File

@@ -55,7 +55,7 @@ describe('LaunchButton', () => {
expect(JobTemplatesAPI.readLaunch).toHaveBeenCalledWith(1); expect(JobTemplatesAPI.readLaunch).toHaveBeenCalledWith(1);
await sleep(0); await sleep(0);
expect(JobTemplatesAPI.launch).toHaveBeenCalledWith(1); 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 () => { test('should launch the correct job type', async () => {
WorkflowJobTemplatesAPI.readLaunch.mockResolvedValue({ WorkflowJobTemplatesAPI.readLaunch.mockResolvedValue({

3
awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
View File

@@ -91,8 +91,7 @@ function WorkflowJobTemplateDetail({ template, i18n, webHookKey }) {
</Link> </Link>
); );
}; };
const canLaunch = const canLaunch = summary_fields?.user_capabilities?.start;
summary_fields.user_capabilities && summary_fields.user_capabilities.start;
const recentPlaybookJobs = summary_fields.recent_jobs.map(job => ({ const recentPlaybookJobs = summary_fields.recent_jobs.map(job => ({
...job, ...job,
type: 'job', type: 'job',