From a4e4f0aa98baeb3c2a0538aa24a013c51884ab59 Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 13 Nov 2020 13:27:13 -0500 Subject: [PATCH] Show 'Deleted' when the source workflow job is deleted in workflow approvals list/details --- .../WorkflowApprovalDetail.jsx | 4 +++- .../WorkflowApprovalListItem.jsx | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx index 2496cbb4ee..add108602a 100644 --- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx +++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx @@ -128,10 +128,12 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) { {`${sourceWorkflowJob?.id} - ${sourceWorkflowJob?.name}`} + ) : ( + i18n._(t`Deleted`) ) } /> diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx index 26ed81456c..6f49920635 100644 --- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx +++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.jsx @@ -82,14 +82,16 @@ function WorkflowApprovalListItem({ , - {workflowJob && ( - <> - {i18n._(t`Job`)} + <> + {i18n._(t`Job`)} + {workflowJob && workflowJob?.id ? ( {`${workflowJob?.id} - ${workflowJob?.name}`} - - )} + ) : ( + i18n._(t`Deleted`) + )} + , {getStatus()}, ]}