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

Merge pull request #12191 from kialam/fix-12188-undefined-wf-approval-list

Browse Source 
Fix deleted wf approval node name.
This commit is contained in:
kialam
2022-05-09 11:16:21 -07:00
committed by GitHub
parent b73078e9db b17f22cd38
commit 1da57a4a12
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.js
View File

@@ -45,12 +45,8 @@ function WorkflowApprovalsList() {
WorkflowApprovalsAPI.read(params), WorkflowApprovalsAPI.read(params),
WorkflowApprovalsAPI.readOptions(), WorkflowApprovalsAPI.readOptions(),
]); ]);
const dataWithModifiedName = response.data.results.map((i) => {
i.name = `${i.summary_fields.source_workflow_job.id} - ${i.name}`;
return i;
});
return { return {
results: dataWithModifiedName, results: response.data.results,
count: response.data.count, count: response.data.count,
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []

9
awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.js
View File

@@ -21,7 +21,6 @@ function WorkflowApprovalListItem({
}) { }) {
const labelId = `check-action-${workflowApproval.id}`; const labelId = `check-action-${workflowApproval.id}`;
const workflowJob = workflowApproval?.summary_fields?.source_workflow_job; const workflowJob = workflowApproval?.summary_fields?.source_workflow_job;
return ( return (
<Tr id={`workflow-approval-row-${workflowApproval.id}`}> <Tr id={`workflow-approval-row-${workflowApproval.id}`}>
<Td <Td
@@ -34,7 +33,13 @@ function WorkflowApprovalListItem({
/> />
<Td id={labelId} dataLabel={t`Name`}> <Td id={labelId} dataLabel={t`Name`}>
<Link to={`${detailUrl}`}> <Link to={`${detailUrl}`}>
<b>{workflowApproval.name}</b> {workflowJob && workflowJob?.id ? (
<b>{`${workflowJob?.id} - ${workflowApproval?.name}`}</b>
) : (
<b>
{t`Deleted`} {`- ${workflowApproval?.name}`}
</b>
)}
</Link> </Link>
</Td> </Td>
<Td> <Td>