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

Show 'Deleted' when the source workflow job is deleted in workflow approvals list/details

Browse Source
This commit is contained in:
mabashian
2020-11-13 13:27:13 -05:00
parent ebf9bf429c
commit a4e4f0aa98
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx
View File

@@ -128,10 +128,12 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
<Detail <Detail
label={i18n._(t`Workflow Job`)} label={i18n._(t`Workflow Job`)}
value={ value={
sourceWorkflowJob && ( sourceWorkflowJob && sourceWorkflowJob?.id ? (
<Link to={`/jobs/workflow/${sourceWorkflowJob?.id}`}> <Link to={`/jobs/workflow/${sourceWorkflowJob?.id}`}>
{`${sourceWorkflowJob?.id} - ${sourceWorkflowJob?.name}`} {`${sourceWorkflowJob?.id} - ${sourceWorkflowJob?.name}`}
</Link> </Link>
) : (
i18n._(t`Deleted`)
) )
} }
/> />

12
awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx
View File

@@ -82,14 +82,16 @@ function WorkflowApprovalListItem({
</Link> </Link>
</DataListCell>, </DataListCell>,
<DataListCell key="job" id={labelId}> <DataListCell key="job" id={labelId}>
{workflowJob && ( <>
<> <JobLabel>{i18n._(t`Job`)}</JobLabel>
<JobLabel>{i18n._(t`Job`)}</JobLabel> {workflowJob && workflowJob?.id ? (
<Link to={`/jobs/workflow/${workflowJob?.id}`}> <Link to={`/jobs/workflow/${workflowJob?.id}`}>
{`${workflowJob?.id} - ${workflowJob?.name}`} {`${workflowJob?.id} - ${workflowJob?.name}`}
</Link> </Link>
</> ) : (
)} i18n._(t`Deleted`)
)}
</>
</DataListCell>, </DataListCell>,
<StatusCell key="status">{getStatus()}</StatusCell>, <StatusCell key="status">{getStatus()}</StatusCell>,
]} ]}