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

Update project status to reflect project sync related to job template

Browse Source 
Update project status to reflect project update sync related to job
template that was launched with branch override.

We were displaying status of project sync itself, not from the project
update job as expected.

Also, rename `Project Status` to be `Project Update Status`.

See: https://github.com/ansible/awx/issues/11987
This commit is contained in:
nixocio 2022-06-08 12:06:14 -04:00
parent e94e15977c
commit 20a1da61c0
3 changed files with 8 additions and 6 deletions
Show Stats 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.`,
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.`,
projectUpdate: t`Project checkout results`,
forks: (
<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`}{' '}

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

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

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

@ -103,7 +103,9 @@ describe('<JobDetail />', () => {
const statusLabel = statusDetail.find('StatusLabel');
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);
const projectStatusLabel = statusDetail.find('StatusLabel');
expect(projectStatusLabel.prop('status')).toEqual('successful');