External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 08:18:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Hide message stating that the resource has been deleted if the output node is an approval node

Browse Source
This commit is contained in:
mabashian
2020-02-06 17:04:20 -05:00
parent 25fe2a2ce6
commit aa6857fd38
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
awx/ui_next/src/components/Workflow/WorkflowNodeHelp.jsx
View File

@@ -111,16 +111,17 @@ function WorkflowNodeHelp({ node, i18n }) {
return ( return (
<> <>
{!node.unifiedJobTemplate && ( {!node.unifiedJobTemplate &&
<> (!node.job || node.job.type !== 'workflow_approval') && (
<ResourceDeleted job={node.job}> <>
<StyledExclamationTriangleIcon /> <ResourceDeleted job={node.job}>
<Trans> <StyledExclamationTriangleIcon />
The resource associated with this node has been deleted. <Trans>
</Trans> The resource associated with this node has been deleted.
</ResourceDeleted> </Trans>
</> </ResourceDeleted>
)} </>
)}
{node.job && ( {node.job && (
<GridDL> <GridDL>
<dt> <dt>

1
awx/ui_next/src/components/Workflow/WorkflowNodeHelp.test.jsx
View File

@@ -13,6 +13,7 @@ describe('WorkflowNodeHelp', () => {
name: 'Foo Job Template', name: 'Foo Job Template',
elapsed: 9000, elapsed: 9000,
status: 'successful', status: 'successful',
type: 'job',
}, },
unifiedJobTemplate: { unifiedJobTemplate: {
name: 'Foo Job Template', name: 'Foo Job Template',