External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 18:50:04 -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
2 changed files with 19 additions and 25 deletions
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' ?.unified_job_type === 'workflow_approval'
) { ) {
nodeRequests.push( nodeRequests.push(
WorkflowJobTemplateNodesAPI.replace( WorkflowJobTemplateNodesAPI.update(node.originalNodeObject.id, {
node.originalNodeObject.id, all_parents_must_converge: node.all_parents_must_converge,
{ ...(replaceIdentifier(node) && {
all_parents_must_converge: node.all_parents_must_converge, identifier: node.identifier,
...(replaceIdentifier(node) && { }),
identifier: node.identifier, }).then(({ data }) => {
}),
}
).then(({ data }) => {
node.originalNodeObject = data; node.originalNodeObject = data;
approvalTemplateRequests.push( approvalTemplateRequests.push(
WorkflowApprovalTemplatesAPI.update( WorkflowApprovalTemplatesAPI.update(
@@ -509,15 +506,12 @@ function Visualizer({ template }) {
); );
} else { } else {
nodeRequests.push( nodeRequests.push(
WorkflowJobTemplateNodesAPI.replace( WorkflowJobTemplateNodesAPI.update(node.originalNodeObject.id, {
node.originalNodeObject.id, all_parents_must_converge: node.all_parents_must_converge,
{ ...(replaceIdentifier(node) && {
all_parents_must_converge: node.all_parents_must_converge, identifier: node.identifier,
...(replaceIdentifier(node) && { }),
identifier: node.identifier, }).then(({ data }) => {
}),
}
).then(({ data }) => {
node.originalNodeObject = data; node.originalNodeObject = data;
approvalTemplateRequests.push( approvalTemplateRequests.push(
WorkflowJobTemplateNodesAPI.createApprovalTemplate( WorkflowJobTemplateNodesAPI.createApprovalTemplate(
@@ -534,7 +528,7 @@ function Visualizer({ template }) {
} }
} else { } else {
nodeRequests.push( nodeRequests.push(
WorkflowJobTemplateNodesAPI.replace(node.originalNodeObject.id, { WorkflowJobTemplateNodesAPI.update(node.originalNodeObject.id, {
...node.promptValues, ...node.promptValues,
execution_environment: execution_environment:
node.promptValues?.execution_environment?.id || null, 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: [], results: [],
}, },
}); });
WorkflowJobTemplateNodesAPI.replace.mockRejectedValue(new Error()); WorkflowJobTemplateNodesAPI.update.mockRejectedValue(new Error());
await act(async () => { await act(async () => {
wrapper = mountWithContexts( wrapper = mountWithContexts(
<svg> <svg>
@@ -355,7 +355,7 @@ describe('Visualizer', () => {
wrapper.find('Button#visualizer-save').simulate('click'); wrapper.find('Button#visualizer-save').simulate('click');
}); });
wrapper.update(); wrapper.update();
expect(WorkflowJobTemplateNodesAPI.replace).toHaveBeenCalledTimes(1); expect(WorkflowJobTemplateNodesAPI.update).toHaveBeenCalledTimes(1);
expect( expect(
wrapper.find('AlertModal[title="Error saving the workflow!"]').length wrapper.find('AlertModal[title="Error saving the workflow!"]').length
).toBe(1); ).toBe(1);
@@ -465,7 +465,7 @@ describe('Visualizer', () => {
results: [], results: [],
}, },
}); });
WorkflowJobTemplateNodesAPI.replace.mockResolvedValue({ WorkflowJobTemplateNodesAPI.update.mockResolvedValue({
data: { data: {
id: 9000, id: 9000,
summary_fields: { summary_fields: {
@@ -492,7 +492,7 @@ describe('Visualizer', () => {
wrapper.find('Button#visualizer-save').simulate('click'); wrapper.find('Button#visualizer-save').simulate('click');
}); });
wrapper.update(); wrapper.update();
expect(WorkflowJobTemplateNodesAPI.replace).toHaveBeenCalledTimes(1); expect(WorkflowJobTemplateNodesAPI.update).toHaveBeenCalledTimes(1);
expect(WorkflowApprovalTemplatesAPI.update).toHaveBeenCalledTimes(1); expect(WorkflowApprovalTemplatesAPI.update).toHaveBeenCalledTimes(1);
expect( expect(
wrapper.find('AlertModal[title="Error saving the workflow!"]').length wrapper.find('AlertModal[title="Error saving the workflow!"]').length
@@ -774,7 +774,7 @@ describe('Visualizer', () => {
results: [], results: [],
}, },
}); });
WorkflowJobTemplateNodesAPI.replace.mockResolvedValue(); WorkflowJobTemplateNodesAPI.update.mockResolvedValue();
WorkflowJobTemplateNodesAPI.disassociateCredentials.mockRejectedValue( WorkflowJobTemplateNodesAPI.disassociateCredentials.mockRejectedValue(
new Error() new Error()
); );
@@ -865,7 +865,7 @@ describe('Visualizer', () => {
results: [], results: [],
}, },
}); });
WorkflowJobTemplateNodesAPI.replace.mockResolvedValue(); WorkflowJobTemplateNodesAPI.update.mockResolvedValue();
WorkflowJobTemplateNodesAPI.disassociateCredentials.mockResolvedValue(); WorkflowJobTemplateNodesAPI.disassociateCredentials.mockResolvedValue();
WorkflowJobTemplateNodesAPI.associateCredentials.mockRejectedValue( WorkflowJobTemplateNodesAPI.associateCredentials.mockRejectedValue(
new Error() new Error()