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

Merge pull request #11096 from AlexSCorey/10945-DisplayCurrentConvergenceData

Browse Source 
Fixes convergence data value on node edit mode
This commit is contained in:
Wambugu “Innocent” Kironji 2021-09-21 16:26:16 -04:00 committed by GitHub
commit 7c707ede2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/useWorkflowNodeSteps.js
View File

@ -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;