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

Extend launched by details to handle scheduled JTs and WFJTs

Browse Source
This commit is contained in:
Marliana Lara 2021-01-14 11:56:56 -05:00
parent 66a9ffc376
commit d1981fcb4a
No known key found for this signature in database
GPG Key ID: 38C73B40DFA809EE
2 changed files with 108 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
awx/ui_next/src/components/DetailList/LaunchedByDetail.jsx
View File

@ -3,13 +3,43 @@ import { Link } from 'react-router-dom';
import { t } from '@lingui/macro';
import Detail from './Detail';
const getLaunchedByDetails = ({ summary_fields = {}, related = {} }) => {
function getScheduleURL(template, scheduleId, inventoryId = null) {
let scheduleUrl;
switch (template.unified_job_type) {
case 'inventory_update':
scheduleUrl =
inventoryId &&
`/inventories/inventory/${inventoryId}/sources/${template.id}/schedules/${scheduleId}/details`;
break;
case 'job':
scheduleUrl = `/templates/job_template/${template.id}/schedules/${scheduleId}/details`;
break;
case 'project_update':
scheduleUrl = `/projects/${template.id}/schedules/${scheduleId}/details`;
break;
case 'system_job':
scheduleUrl = `/management_jobs/${template.id}/schedules/${scheduleId}/details`;
break;
case 'workflow_job':
scheduleUrl = `/templates/workflow_job_template/${template.id}/schedules/${scheduleId}/details`;
break;
default:
break;
}
return scheduleUrl;
}
const getLaunchedByDetails = ({ summary_fields = {}, launch_type }, i18n) => {
const {
created_by: createdBy,
job_template: jobTemplate,
unified_job_template: unifiedJT,
workflow_job_template: workflowJT,
inventory,
schedule,
} = summary_fields;
const { schedule: relatedSchedule } = related;
if (!createdBy && !schedule) {
return {};
@ -18,15 +48,26 @@ const getLaunchedByDetails = ({ summary_fields = {}, related = {} }) => {
let link;
let value;
if (createdBy) {
link = `/users/${createdBy.id}`;
value = createdBy.username;
} else if (relatedSchedule && jobTemplate) {
link = `/templates/job_template/${jobTemplate.id}/schedules/${schedule.id}`;
value = schedule.name;
} else {
link = null;
value = schedule.name;
switch (launch_type) {
case 'webhook':
value = i18n._(t`Webhook`);
link =
(jobTemplate && `/templates/job_template/${jobTemplate.id}/details`) ||
(workflowJT &&
`/templates/workflow_job_template/${workflowJT.id}/details`);
break;
case 'scheduled':
value = schedule.name;
link = getScheduleURL(unifiedJT, schedule.id, inventory?.id);
break;
case 'manual':
link = `/users/${createdBy.id}/details`;
value = createdBy.username;
break;
default:
link = createdBy && `/users/${createdBy.id}/details`;
value = createdBy && createdBy.username;
break;
}
return { link, value };
@ -34,7 +75,7 @@ const getLaunchedByDetails = ({ summary_fields = {}, related = {} }) => {
export default function LaunchedByDetail({ job }) {
const { value: launchedByValue, link: launchedByLink } =
getLaunchedByDetails(job) || {};
getLaunchedByDetails(job, i18n) || {};
return (
<Detail

55
awx/ui_next/src/screens/Job/JobDetail/JobDetail.test.jsx
View File

@ -108,6 +108,61 @@ describe('<JobDetail />', () => {
).toHaveLength(1);
});
test('should show schedule that launched workflow job', async () => {
wrapper = mountWithContexts(
<JobDetail
job={{
...mockJobData,
launch_type: 'scheduled',
summary_fields: {
user_capabilities: {},
schedule: {
name: 'mock wf schedule',
id: 999,
},
unified_job_template: {
unified_job_type: 'workflow_job',
id: 888,
},
},
}}
/>
);
const launchedByDetail = wrapper.find('Detail[label="Launched By"] dd');
expect(launchedByDetail).toHaveLength(1);
expect(launchedByDetail.text()).toBe('mock wf schedule');
expect(
launchedByDetail.find(
'a[href="/templates/workflow_job_template/888/schedules/999/details"]'
)
).toHaveLength(1);
});
test('should hide "Launched By" detail for JT launched from a workflow launched by a schedule', async () => {
wrapper = mountWithContexts(
<JobDetail
job={{
...mockJobData,
launch_type: 'workflow',
type: 'job',
summary_fields: {
user_capabilities: {},
source_workflow_job: {
name: 'mock wf job',
id: 888,
},
unified_job_template: {
unified_job_type: 'job',
id: 111,
},
},
}}
/>
);
expect(wrapper.find('Detail[label="Launched By"] dt')).toHaveLength(0);
expect(wrapper.find('Detail[label="Launched By"] dd')).toHaveLength(0);
});
test('should properly delete job', async () => {
wrapper = mountWithContexts(<JobDetail job={mockJobData} />);
wrapper.find('button[aria-label="Delete"]').simulate('click');