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

Merge pull request #12348 from nixocio/ui_issue_111987

Browse Source 
Update project status to reflect project sync related to job template
This commit is contained in:
Sarah Akus
2022-06-14 14:41:01 -04:00
committed by GitHub
parent c231e4d05e 20a1da61c0
commit 51a8790d56
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/src/screens/Job/Job.helptext.js
View File

@@ -18,6 +18,7 @@ const jobHelpText = {
jobTags: t`Tags are useful when you have a large playbook, and you want to run a specific part of a play or task. Use commas to separate multiple tags. Refer to the documentation for details on the usage of tags.`, jobTags: t`Tags are useful when you have a large playbook, and you want to run a specific part of a play or task. Use commas to separate multiple tags. Refer to the documentation for details on the usage of tags.`,
skipTags: t`Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task. Use commas to separate multiple tags. Refer to the documentation for details on the usage of tags.`, skipTags: t`Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task. Use commas to separate multiple tags. Refer to the documentation for details on the usage of tags.`,
sourceControlBranch: t`Select a branch for the workflow. This branch is applied to all job template nodes that prompt for a branch.`, sourceControlBranch: t`Select a branch for the workflow. This branch is applied to all job template nodes that prompt for a branch.`,
projectUpdate: t`Project checkout results`,
forks: ( forks: (
<span> <span>
{t`The number of parallel or simultaneous processes to use while executing the playbook. An empty value, or a value less than 1 will use the Ansible default which is usually 5. The default number of forks can be overwritten with a change to`}{' '} {t`The number of parallel or simultaneous processes to use while executing the playbook. An empty value, or a value less than 1 will use the Ansible default which is usually 5. The default number of forks can be overwritten with a change to`}{' '}

9
awx/ui/src/screens/Job/JobDetail/JobDetail.js
View File

@@ -168,15 +168,14 @@ function JobDetail({ job, inventorySourceLabels }) {
/> />
<Detail <Detail
dataCy="job-project-status" dataCy="job-project-status"
label={t`Project Status`} label={t`Project Update Status`}
helpText={jobHelpText.projectUpdate}
value={ value={
projectUpdate ? ( projectUpdate ? (
<Link to={`/jobs/project/${projectUpdate.id}`}> <Link to={`/jobs/project/${projectUpdate.id}`}>
<StatusLabel status={project.status} /> <StatusLabel status={projectUpdate.status} />
</Link> </Link>
) : ( ) : null
<StatusLabel status={project.status} />
)
} }
/> />
</> </>

4
awx/ui/src/screens/Job/JobDetail/JobDetail.test.js
View File

@@ -103,7 +103,9 @@ describe('<JobDetail />', () => {
const statusLabel = statusDetail.find('StatusLabel'); const statusLabel = statusDetail.find('StatusLabel');
expect(statusLabel.prop('status')).toEqual('successful'); expect(statusLabel.prop('status')).toEqual('successful');
const projectStatusDetail = wrapper.find('Detail[label="Project Status"]'); const projectStatusDetail = wrapper.find(
'Detail[label="Project Update Status"]'
);
expect(projectStatusDetail.find('StatusLabel')).toHaveLength(1); expect(projectStatusDetail.find('StatusLabel')).toHaveLength(1);
const projectStatusLabel = statusDetail.find('StatusLabel'); const projectStatusLabel = statusDetail.find('StatusLabel');
expect(projectStatusLabel.prop('status')).toEqual('successful'); expect(projectStatusLabel.prop('status')).toEqual('successful');