From 4302348e8e6bef1fcbc06e25b6e59362c48307ba Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Wed, 15 Mar 2023 09:48:11 -0400 Subject: [PATCH] Fixes bug where editing a node always defaulted to all convergence --- .../Modals/NodeModals/useWorkflowNodeSteps.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js index 853c23d31a..b512188168 100644 --- a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js +++ b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js @@ -66,7 +66,13 @@ const getNodeToEditDefaultValues = ( // There is a case where the nodeToEdit convergence value will not align with the // original node object value. This allows the nodeToEdit value to take precedence over the // original node object. - if (nodeToEdit) { + if ( + nodeToEdit && + Object.prototype.hasOwnProperty.call( + nodeToEdit, + 'all_parents_must_converge' + ) + ) { return nodeToEdit.all_parents_must_converge ? 'all' : 'any'; } return nodeToEdit?.originalNodeObject?.all_parents_must_converge