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

Use PATCH request when updating wf nodes (#14063)

Browse Source
This commit is contained in:
Marliana Lara 2023-05-31 12:30:58 -04:00 committed by GitHub
parent ae7be2eea1
commit bdfd6f47ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js
View File

@ -484,15 +484,12 @@ function Visualizer({ template }) {
?.unified_job_type === 'workflow_approval'
) {
nodeRequests.push(
WorkflowJobTemplateNodesAPI.replace(
node.originalNodeObject.id,
{
all_parents_must_converge: node.all_parents_must_converge,
...(replaceIdentifier(node) && {
identifier: node.identifier,
}),
}
).then(({ data }) => {
WorkflowJobTemplateNodesAPI.update(node.originalNodeObject.id, {
all_parents_must_converge: node.all_parents_must_converge,
...(replaceIdentifier(node) && {
identifier: node.identifier,
}),
}).then(({ data }) => {
node.originalNodeObject = data;
approvalTemplateRequests.push(
WorkflowApprovalTemplatesAPI.update(
@ -509,15 +506,12 @@ function Visualizer({ template }) {
);
} else {
nodeRequests.push(
WorkflowJobTemplateNodesAPI.replace(
node.originalNodeObject.id,
{
all_parents_must_converge: node.all_parents_must_converge,
...(replaceIdentifier(node) && {
identifier: node.identifier,
}),
}
).then(({ data }) => {
WorkflowJobTemplateNodesAPI.update(node.originalNodeObject.id, {
all_parents_must_converge: node.all_parents_must_converge,
...(replaceIdentifier(node) && {
identifier: node.identifier,
}),
}).then(({ data }) => {
node.originalNodeObject = data;
approvalTemplateRequests.push(
WorkflowJobTemplateNodesAPI.createApprovalTemplate(
@ -534,7 +528,7 @@ function Visualizer({ template }) {
}
} else {
nodeRequests.push(
WorkflowJobTemplateNodesAPI.replace(node.originalNodeObject.id, {
WorkflowJobTemplateNodesAPI.update(node.originalNodeObject.id, {
...node.promptValues,
execution_environment:
node.promptValues?.execution_environment?.id || null,

12
awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.test.js
View File

@ -339,7 +339,7 @@ describe('Visualizer', () => {
results: [],
},
});
WorkflowJobTemplateNodesAPI.replace.mockRejectedValue(new Error());
WorkflowJobTemplateNodesAPI.update.mockRejectedValue(new Error());
await act(async () => {
wrapper = mountWithContexts(
<svg>
@ -355,7 +355,7 @@ describe('Visualizer', () => {
wrapper.find('Button#visualizer-save').simulate('click');
});
wrapper.update();
expect(WorkflowJobTemplateNodesAPI.replace).toHaveBeenCalledTimes(1);
expect(WorkflowJobTemplateNodesAPI.update).toHaveBeenCalledTimes(1);
expect(
wrapper.find('AlertModal[title="Error saving the workflow!"]').length
).toBe(1);
@ -465,7 +465,7 @@ describe('Visualizer', () => {
results: [],
},
});
WorkflowJobTemplateNodesAPI.replace.mockResolvedValue({
WorkflowJobTemplateNodesAPI.update.mockResolvedValue({
data: {
id: 9000,
summary_fields: {
@ -492,7 +492,7 @@ describe('Visualizer', () => {
wrapper.find('Button#visualizer-save').simulate('click');
});
wrapper.update();
expect(WorkflowJobTemplateNodesAPI.replace).toHaveBeenCalledTimes(1);
expect(WorkflowJobTemplateNodesAPI.update).toHaveBeenCalledTimes(1);
expect(WorkflowApprovalTemplatesAPI.update).toHaveBeenCalledTimes(1);
expect(
wrapper.find('AlertModal[title="Error saving the workflow!"]').length
@ -774,7 +774,7 @@ describe('Visualizer', () => {
results: [],
},
});
WorkflowJobTemplateNodesAPI.replace.mockResolvedValue();
WorkflowJobTemplateNodesAPI.update.mockResolvedValue();
WorkflowJobTemplateNodesAPI.disassociateCredentials.mockRejectedValue(
new Error()
);
@ -865,7 +865,7 @@ describe('Visualizer', () => {
results: [],
},
});
WorkflowJobTemplateNodesAPI.replace.mockResolvedValue();
WorkflowJobTemplateNodesAPI.update.mockResolvedValue();
WorkflowJobTemplateNodesAPI.disassociateCredentials.mockResolvedValue();
WorkflowJobTemplateNodesAPI.associateCredentials.mockRejectedValue(
new Error()