{{nodeConfig.mode === 'edit' ? nodeConfig.node.fullUnifiedJobTemplateObject.name || nodeConfig.node.unifiedJobTemplate.name : strings.get('workflow_maker.ADD_A_NODE')}}
-
@@ -238,7 +277,8 @@
-
+
+
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less
index 760ceafc7d..87f20ce5db 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less
@@ -296,8 +296,8 @@
border-bottom-left-radius: 5px;
}
-.WorkflowMaker-formTab {
- margin-right: 10px;
+.WorkflowMaker-formTypeDropdown {
+ margin-bottom: 20px;
}
.WorkflowMaker-preventBodyScrolling {
@@ -314,6 +314,13 @@
margin-bottom: 20px;
}
+.WorkflowMaker-pauseCheckbox {
+ input {
+ margin-right: 5px;
+ }
+ margin-bottom: 20px;
+}
+
.Key-list {
margin: 0;
padding: 20px;
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index 68fcfda0b9..d5e166a7b5 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -140,59 +140,126 @@ export default ['$scope', 'TemplatesService',
};
if ($scope.graphState.arrayOfNodesForChart.length > 1) {
+ let approvalTemplatePromises = [];
let addPromises = [];
let editPromises = [];
let credentialRequests = [];
Object.keys(nodeRef).map((workflowMakerNodeId) => {
- if (nodeRef[workflowMakerNodeId].isNew) {
- addPromises.push(TemplatesService.addWorkflowNode({
- url: $scope.workflowJobTemplateObj.related.workflow_nodes,
- data: buildSendableNodeData(nodeRef[workflowMakerNodeId])
- }).then(({data}) => {
- nodeRef[workflowMakerNodeId].originalNodeObject = data;
- nodeIdToChartNodeIdMapping[data.id] = parseInt(workflowMakerNodeId);
- if (_.get(nodeRef[workflowMakerNodeId], 'promptData.launchConf.ask_credential_on_launch')) {
- // This finds the credentials that were selected in the prompt but don't occur
- // in the template defaults
- let credentialIdsToPost = nodeRef[workflowMakerNodeId].promptData.prompts.credentials.value.filter((credFromPrompt) => {
- let defaultCreds = _.get(nodeRef[workflowMakerNodeId], 'promptData.launchConf.defaults.credentials', []);
- return !defaultCreds.some((defaultCred) => {
- return credFromPrompt.id === defaultCred.id;
+ const node = nodeRef[workflowMakerNodeId];
+ if (node.isNew) {
+ if (node.unifiedJobTemplate && node.unifiedJobTemplate.unified_job_type === "workflow_approval") {
+ approvalTemplatePromises.push(TemplatesService.createApprovalTemplate({
+ name: node.unifiedJobTemplate.name
+ }).then(({data: approvalTemplateData}) => {
+ addPromises.push(TemplatesService.addWorkflowNode({
+ url: $scope.workflowJobTemplateObj.related.workflow_nodes,
+ data: {
+ unified_job_template: approvalTemplateData.id
+ }
+ }).then(({data: nodeData}) => {
+ node.originalNodeObject = nodeData;
+ nodeIdToChartNodeIdMapping[nodeData.id] = parseInt(workflowMakerNodeId);
+ }).catch(({ data, status }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
});
+ }));
+ }).catch(({ data, status }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
});
-
- credentialIdsToPost.forEach((credentialToPost) => {
- credentialRequests.push({
- id: data.id,
+ }));
+ } else {
+ addPromises.push(TemplatesService.addWorkflowNode({
+ url: $scope.workflowJobTemplateObj.related.workflow_nodes,
+ data: buildSendableNodeData(node)
+ }).then(({data}) => {
+ node.originalNodeObject = data;
+ nodeIdToChartNodeIdMapping[data.id] = parseInt(workflowMakerNodeId);
+ if (_.get(node, 'promptData.launchConf.ask_credential_on_launch')) {
+ // This finds the credentials that were selected in the prompt but don't occur
+ // in the template defaults
+ let credentialIdsToPost = node.promptData.prompts.credentials.value.filter((credFromPrompt) => {
+ let defaultCreds = _.get(node, 'promptData.launchConf.defaults.credentials', []);
+ return !defaultCreds.some((defaultCred) => {
+ return credFromPrompt.id === defaultCred.id;
+ });
+ });
+
+ credentialIdsToPost.forEach((credentialToPost) => {
+ credentialRequests.push({
+ id: data.id,
+ data: {
+ id: credentialToPost.id
+ }
+ });
+ });
+ }
+ }).catch(({ data, status }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
+ });
+ }));
+ }
+ } else if (node.isEdited) {
+ if (node.unifiedJobTemplate && node.unifiedJobTemplate.unified_job_type === "workflow_approval") {
+ if (node.originalNodeObject.summary_fields.unified_job_template.unified_job_type === "workflow_approval") {
+ approvalTemplatePromises.push(TemplatesService.patchApprovalTemplate({
+ id: node.originalNodeObject.summary_fields.unified_job_template.id,
+ data: {
+ name: node.unifiedJobTemplate.name,
+ description: node.unifiedJobTemplate.description
+ }
+ }).catch(({ data, status }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
+ });
+ }));
+ } else {
+ approvalTemplatePromises.push(TemplatesService.createApprovalTemplate({
+ name: node.unifiedJobTemplate.name
+ }).then(({data: approvalTemplateData}) => {
+ // Make sure that this isn't overwriting everything on the node...
+ editPromises.push(TemplatesService.editWorkflowNode({
+ url: $scope.workflowJobTemplateObj.related.workflow_nodes,
data: {
- id: credentialToPost.id
+ unified_job_template: approvalTemplateData.id
}
+ }).catch(({ data, status }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
+ });
+ }));
+ }).catch(({ data, status }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
});
- });
+ }));
}
- }).catch(({ data, status }) => {
- Wait('stop');
- ProcessErrors($scope, data, status, null, {
- hdr: $scope.strings.get('error.HEADER')
- });
- }));
- } else if (nodeRef[workflowMakerNodeId].isEdited) {
- editPromises.push(TemplatesService.editWorkflowNode({
- id: nodeRef[workflowMakerNodeId].originalNodeObject.id,
- data: buildSendableNodeData(nodeRef[workflowMakerNodeId])
- }));
+ } else {
+ editPromises.push(TemplatesService.editWorkflowNode({
+ id: node.originalNodeObject.id,
+ data: buildSendableNodeData(node)
+ }));
+ }
- if (_.get(nodeRef[workflowMakerNodeId], 'promptData.launchConf.ask_credential_on_launch')) {
- let credentialsNotInPriorCredentials = nodeRef[workflowMakerNodeId].promptData.prompts.credentials.value.filter((credFromPrompt) => {
- let defaultCreds = _.get(nodeRef[workflowMakerNodeId], 'promptData.launchConf.defaults.credentials', []);
+ if (_.get(node, 'promptData.launchConf.ask_credential_on_launch')) {
+ let credentialsNotInPriorCredentials = node.promptData.prompts.credentials.value.filter((credFromPrompt) => {
+ let defaultCreds = _.get(node, 'promptData.launchConf.defaults.credentials', []);
return !defaultCreds.some((defaultCred) => {
return credFromPrompt.id === defaultCred.id;
});
});
let credentialsToAdd = credentialsNotInPriorCredentials.filter((credNotInPrior) => {
- let previousOverrides = _.get(nodeRef[workflowMakerNodeId], 'promptData.prompts.credentials.previousOverrides', []);
+ let previousOverrides = _.get(node, 'promptData.prompts.credentials.previousOverrides', []);
return !previousOverrides.some((priorCred) => {
return credNotInPrior.id === priorCred.id;
});
@@ -200,8 +267,8 @@ export default ['$scope', 'TemplatesService',
let credentialsToRemove = [];
- if (_.has(nodeRef[workflowMakerNodeId], 'promptData.prompts.credentials.previousOverrides')) {
- credentialsToRemove = nodeRef[workflowMakerNodeId].promptData.prompts.credentials.previousOverrides.filter((priorCred) => {
+ if (_.has(node, 'promptData.prompts.credentials.previousOverrides')) {
+ credentialsToRemove = node.promptData.prompts.credentials.previousOverrides.filter((priorCred) => {
return !credentialsNotInPriorCredentials.some((credNotInPrior) => {
return priorCred.id === credNotInPrior.id;
});
@@ -210,7 +277,7 @@ export default ['$scope', 'TemplatesService',
credentialsToAdd.forEach((credentialToAdd) => {
credentialRequests.push({
- id: nodeRef[workflowMakerNodeId].originalNodeObject.id,
+ id: node.originalNodeObject.id,
data: {
id: credentialToAdd.id
}
@@ -219,7 +286,7 @@ export default ['$scope', 'TemplatesService',
credentialsToRemove.forEach((credentialToRemove) => {
credentialRequests.push({
- id: nodeRef[workflowMakerNodeId].originalNodeObject.id,
+ id: node.originalNodeObject.id,
data: {
id: credentialToRemove.id,
disassociate: true
@@ -235,172 +302,177 @@ export default ['$scope', 'TemplatesService',
return TemplatesService.deleteWorkflowJobTemplateNode(nodeId);
});
- $q.all(addPromises.concat(editPromises, deletePromises))
+ $q.all(approvalTemplatePromises)
.then(() => {
- let disassociatePromises = [];
- let associatePromises = [];
- let linkMap = {};
-
- // Build a link map for easy access
- $scope.graphState.arrayOfLinksForChart.forEach(link => {
- // link.source.id of 1 is our artificial start node
- if (link.source.id !== 1) {
- const sourceNodeId = nodeRef[link.source.id].originalNodeObject.id;
- const targetNodeId = nodeRef[link.target.id].originalNodeObject.id;
- if (!linkMap[sourceNodeId]) {
- linkMap[sourceNodeId] = {};
+ $q.all(addPromises.concat(editPromises, deletePromises))
+ .then(() => {
+ let disassociatePromises = [];
+ let associatePromises = [];
+ let linkMap = {};
+
+ // Build a link map for easy access
+ $scope.graphState.arrayOfLinksForChart.forEach(link => {
+ // link.source.id of 1 is our artificial start node
+ if (link.source.id !== 1) {
+ const sourceNodeId = nodeRef[link.source.id].originalNodeObject.id;
+ const targetNodeId = nodeRef[link.target.id].originalNodeObject.id;
+ if (!linkMap[sourceNodeId]) {
+ linkMap[sourceNodeId] = {};
+ }
+
+ linkMap[sourceNodeId][targetNodeId] = link.edgeType;
}
-
- linkMap[sourceNodeId][targetNodeId] = link.edgeType;
- }
- });
-
- Object.keys(nodeRef).map((workflowNodeId) => {
- let nodeId = nodeRef[workflowNodeId].originalNodeObject.id;
- if (nodeRef[workflowNodeId].originalNodeObject.success_nodes) {
- nodeRef[workflowNodeId].originalNodeObject.success_nodes.forEach((successNodeId) => {
- if (
- !deletedNodeIds.includes(successNodeId) &&
- (!linkMap[nodeId] ||
- !linkMap[nodeId][successNodeId] ||
- linkMap[nodeId][successNodeId] !== "success")
- ) {
- disassociatePromises.push(
- TemplatesService.disassociateWorkflowNode({
- parentId: nodeId,
- nodeId: successNodeId,
- edge: "success"
- })
- );
- }
- });
- }
- if (nodeRef[workflowNodeId].originalNodeObject.failure_nodes) {
- nodeRef[workflowNodeId].originalNodeObject.failure_nodes.forEach((failureNodeId) => {
- if (
- !deletedNodeIds.includes(failureNodeId) &&
- (!linkMap[nodeId] ||
- !linkMap[nodeId][failureNodeId] ||
- linkMap[nodeId][failureNodeId] !== "failure")
- ) {
- disassociatePromises.push(
- TemplatesService.disassociateWorkflowNode({
- parentId: nodeId,
- nodeId: failureNodeId,
- edge: "failure"
- })
- );
- }
- });
- }
- if (nodeRef[workflowNodeId].originalNodeObject.always_nodes) {
- nodeRef[workflowNodeId].originalNodeObject.always_nodes.forEach((alwaysNodeId) => {
- if (
- !deletedNodeIds.includes(alwaysNodeId) &&
- (!linkMap[nodeId] ||
- !linkMap[nodeId][alwaysNodeId] ||
- linkMap[nodeId][alwaysNodeId] !== "always")
- ) {
- disassociatePromises.push(
- TemplatesService.disassociateWorkflowNode({
- parentId: nodeId,
- nodeId: alwaysNodeId,
- edge: "always"
- })
- );
- }
- });
- }
- });
-
- Object.keys(linkMap).map((sourceNodeId) => {
- Object.keys(linkMap[sourceNodeId]).map((targetNodeId) => {
- const sourceChartNodeId = nodeIdToChartNodeIdMapping[sourceNodeId];
- const targetChartNodeId = nodeIdToChartNodeIdMapping[targetNodeId];
- switch(linkMap[sourceNodeId][targetNodeId]) {
- case "success":
+ });
+
+ Object.keys(nodeRef).map((workflowNodeId) => {
+ let nodeId = nodeRef[workflowNodeId].originalNodeObject.id;
+ if (nodeRef[workflowNodeId].originalNodeObject.success_nodes) {
+ nodeRef[workflowNodeId].originalNodeObject.success_nodes.forEach((successNodeId) => {
if (
- !nodeRef[sourceChartNodeId].originalNodeObject.success_nodes ||
- !nodeRef[sourceChartNodeId].originalNodeObject.success_nodes.includes(nodeRef[targetChartNodeId].originalNodeObject.id)
+ !deletedNodeIds.includes(successNodeId) &&
+ (!linkMap[nodeId] ||
+ !linkMap[nodeId][successNodeId] ||
+ linkMap[nodeId][successNodeId] !== "success")
) {
- associatePromises.push(
- TemplatesService.associateWorkflowNode({
- parentId: parseInt(sourceNodeId),
- nodeId: parseInt(targetNodeId),
+ disassociatePromises.push(
+ TemplatesService.disassociateWorkflowNode({
+ parentId: nodeId,
+ nodeId: successNodeId,
edge: "success"
})
);
}
- break;
- case "failure":
+ });
+ }
+ if (nodeRef[workflowNodeId].originalNodeObject.failure_nodes) {
+ nodeRef[workflowNodeId].originalNodeObject.failure_nodes.forEach((failureNodeId) => {
if (
- !nodeRef[sourceChartNodeId].originalNodeObject.failure_nodes ||
- !nodeRef[sourceChartNodeId].originalNodeObject.failure_nodes.includes(nodeRef[targetChartNodeId].originalNodeObject.id)
+ !deletedNodeIds.includes(failureNodeId) &&
+ (!linkMap[nodeId] ||
+ !linkMap[nodeId][failureNodeId] ||
+ linkMap[nodeId][failureNodeId] !== "failure")
) {
- associatePromises.push(
- TemplatesService.associateWorkflowNode({
- parentId: parseInt(sourceNodeId),
- nodeId: parseInt(targetNodeId),
+ disassociatePromises.push(
+ TemplatesService.disassociateWorkflowNode({
+ parentId: nodeId,
+ nodeId: failureNodeId,
edge: "failure"
})
);
}
- break;
- case "always":
+ });
+ }
+ if (nodeRef[workflowNodeId].originalNodeObject.always_nodes) {
+ nodeRef[workflowNodeId].originalNodeObject.always_nodes.forEach((alwaysNodeId) => {
if (
- !nodeRef[sourceChartNodeId].originalNodeObject.always_nodes ||
- !nodeRef[sourceChartNodeId].originalNodeObject.always_nodes.includes(nodeRef[targetChartNodeId].originalNodeObject.id)
+ !deletedNodeIds.includes(alwaysNodeId) &&
+ (!linkMap[nodeId] ||
+ !linkMap[nodeId][alwaysNodeId] ||
+ linkMap[nodeId][alwaysNodeId] !== "always")
) {
- associatePromises.push(
- TemplatesService.associateWorkflowNode({
- parentId: parseInt(sourceNodeId),
- nodeId: parseInt(targetNodeId),
+ disassociatePromises.push(
+ TemplatesService.disassociateWorkflowNode({
+ parentId: nodeId,
+ nodeId: alwaysNodeId,
edge: "always"
})
);
}
- break;
+ });
}
});
- });
-
- $q.all(disassociatePromises)
- .then(() => {
- let credentialPromises = credentialRequests.map((request) => {
- return TemplatesService.postWorkflowNodeCredential({
- id: request.id,
- data: request.data
- });
- });
-
- return $q.all(associatePromises.concat(credentialPromises))
- .then(() => {
- Wait('stop');
- $scope.workflowChangesUnsaved = false;
- $scope.workflowChangesStarted = false;
- $scope.closeDialog();
- }).catch(({ data, status }) => {
- Wait('stop');
- ProcessErrors($scope, data, status, null, {
- hdr: $scope.strings.get('error.HEADER')
- });
- });
- }).catch(({
- data,
- status
- }) => {
- Wait('stop');
- ProcessErrors($scope, data, status, null, {
- hdr: $scope.strings.get('error.HEADER')
+
+ Object.keys(linkMap).map((sourceNodeId) => {
+ Object.keys(linkMap[sourceNodeId]).map((targetNodeId) => {
+ const sourceChartNodeId = nodeIdToChartNodeIdMapping[sourceNodeId];
+ const targetChartNodeId = nodeIdToChartNodeIdMapping[targetNodeId];
+ switch(linkMap[sourceNodeId][targetNodeId]) {
+ case "success":
+ if (
+ !nodeRef[sourceChartNodeId].originalNodeObject.success_nodes ||
+ !nodeRef[sourceChartNodeId].originalNodeObject.success_nodes.includes(nodeRef[targetChartNodeId].originalNodeObject.id)
+ ) {
+ associatePromises.push(
+ TemplatesService.associateWorkflowNode({
+ parentId: parseInt(sourceNodeId),
+ nodeId: parseInt(targetNodeId),
+ edge: "success"
+ })
+ );
+ }
+ break;
+ case "failure":
+ if (
+ !nodeRef[sourceChartNodeId].originalNodeObject.failure_nodes ||
+ !nodeRef[sourceChartNodeId].originalNodeObject.failure_nodes.includes(nodeRef[targetChartNodeId].originalNodeObject.id)
+ ) {
+ associatePromises.push(
+ TemplatesService.associateWorkflowNode({
+ parentId: parseInt(sourceNodeId),
+ nodeId: parseInt(targetNodeId),
+ edge: "failure"
+ })
+ );
+ }
+ break;
+ case "always":
+ if (
+ !nodeRef[sourceChartNodeId].originalNodeObject.always_nodes ||
+ !nodeRef[sourceChartNodeId].originalNodeObject.always_nodes.includes(nodeRef[targetChartNodeId].originalNodeObject.id)
+ ) {
+ associatePromises.push(
+ TemplatesService.associateWorkflowNode({
+ parentId: parseInt(sourceNodeId),
+ nodeId: parseInt(targetNodeId),
+ edge: "always"
+ })
+ );
+ }
+ break;
+ }
});
});
- }).catch(({ data, status }) => {
- Wait('stop');
- ProcessErrors($scope, data, status, null, {
- hdr: $scope.strings.get('error.HEADER')
+
+ $q.all(disassociatePromises)
+ .then(() => {
+ let credentialPromises = credentialRequests.map((request) => {
+ return TemplatesService.postWorkflowNodeCredential({
+ id: request.id,
+ data: request.data
+ });
+ });
+
+ return $q.all(associatePromises.concat(credentialPromises))
+ .then(() => {
+ Wait('stop');
+ $scope.workflowChangesUnsaved = false;
+ $scope.workflowChangesStarted = false;
+ $scope.closeDialog();
+ }).catch(({ data, status }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
+ });
+ });
+ }).catch(({
+ data,
+ status
+ }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
+ });
+ });
+ }).catch(({ data, status }) => {
+ Wait('stop');
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER')
+ });
});
+ })
+ .catch(() => {
+ // TODO: handle
});
-
} else {
let deletePromises = deletedNodeIds.map((nodeId) => {
@@ -511,17 +583,27 @@ export default ['$scope', 'TemplatesService',
$scope.formState.showNodeForm = true;
};
- $scope.confirmNodeForm = (selectedTemplate, promptData, edgeType) => {
+ $scope.confirmNodeForm = (selectedTemplate, promptData, edgeType, pauseNode) => {
$scope.workflowChangesUnsaved = true;
const nodeId = $scope.nodeConfig.nodeId;
if ($scope.nodeConfig.mode === "add") {
- if (selectedTemplate && edgeType && edgeType.value) {
- nodeRef[$scope.nodeConfig.nodeId] = {
- fullUnifiedJobTemplateObject: selectedTemplate,
- promptData,
- isNew: true
- };
-
+ if (edgeType && edgeType.value) {
+ if (selectedTemplate) {
+ nodeRef[$scope.nodeConfig.nodeId] = {
+ fullUnifiedJobTemplateObject: selectedTemplate,
+ promptData,
+ isNew: true
+ };
+ } else if (pauseNode && pauseNode.isPauseNode) {
+ nodeRef[$scope.nodeConfig.nodeId] = {
+ unifiedJobTemplate: {
+ name: pauseNode.name,
+ description: pauseNode.description,
+ unified_job_type: "workflow_approval"
+ },
+ isNew: true
+ };
+ }
$scope.graphState.nodeBeingAdded = null;
$scope.graphState.arrayOfLinksForChart.map( (link) => {
@@ -534,6 +616,7 @@ export default ['$scope', 'TemplatesService',
} else if ($scope.nodeConfig.mode === "edit") {
if (selectedTemplate) {
nodeRef[$scope.nodeConfig.nodeId].fullUnifiedJobTemplateObject = selectedTemplate;
+ nodeRef[$scope.nodeConfig.nodeId].unifiedJobTemplate = selectedTemplate;
nodeRef[$scope.nodeConfig.nodeId].promptData = _.cloneDeep(promptData);
nodeRef[$scope.nodeConfig.nodeId].isEdited = true;
$scope.graphState.nodeBeingEdited = null;
@@ -546,12 +629,30 @@ export default ['$scope', 'TemplatesService',
link.source.unifiedJobTemplate = selectedTemplate;
}
});
+ } else if (pauseNode && pauseNode.isPauseNode) {
+ // If it's a _new_ pause node then we'll want to create the new ujt
+ // If it's an existing pause node then we'll want to update the ujt
+ nodeRef[$scope.nodeConfig.nodeId].unifiedJobTemplate = {
+ name: pauseNode.name,
+ description: pauseNode.description,
+ unified_job_type: "workflow_approval"
+ },
+ nodeRef[$scope.nodeConfig.nodeId].isEdited = true;
}
}
$scope.graphState.arrayOfNodesForChart.map( (node) => {
if (node.id === nodeId) {
- node.unifiedJobTemplate = selectedTemplate;
+ if (pauseNode && pauseNode.isPauseNode) {
+ node.unifiedJobTemplate = {
+ unified_job_type: 'workflow_approval',
+ name: pauseNode.name,
+ description: pauseNode.description
+ };
+ } else {
+ node.unifiedJobTemplate = selectedTemplate;
+ }
+
}
});
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
index 4e986586ea..d8685582fe 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
@@ -128,7 +128,7 @@