From a7ed9c5ff61297b83efed56b4faa65721483d5d8 Mon Sep 17 00:00:00 2001 From: Alex Corey Date: Mon, 20 Sep 2021 15:08:32 -0400 Subject: [PATCH] Fixes convergence data value on node edit mode --- .../Modals/NodeModals/useWorkflowNodeSteps.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 81addb2463..c7baafa3ed 100644 --- a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js +++ b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js @@ -54,14 +54,21 @@ const getNodeToEditDefaultValues = ( identifier = nodeToEdit?.originalNodeObject?.identifier; } + const getConvergence = () => { + // 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) { + return nodeToEdit.all_parents_must_converge ? 'all' : 'any'; + } + return nodeToEdit?.originalNodeObject?.all_parents_must_converge + ? 'all' + : 'any'; + }; const initialValues = { nodeResource: nodeToEdit?.fullUnifiedJobTemplate || null, nodeType: nodeToEdit?.fullUnifiedJobTemplate?.type || 'job_template', - convergence: - nodeToEdit?.all_parents_must_converge || - nodeToEdit?.originalNodeObject?.all_parents_must_converge - ? 'all' - : 'any', + convergence: getConvergence(), identifier, }; @@ -322,7 +329,6 @@ export default function useWorkflowNodeSteps( } // eslint-disable-next-line react-hooks/exhaustive-deps }, [launchConfig, surveyConfig, isReady]); - const stepWithError = steps.find((s) => s.contentError); const contentError = stepWithError ? stepWithError.contentError : null;