Show all wf options when node is not a root node

* Edge type of root node is always "always" * If node is not a root node, show all options: always, success, fail * Remove edge conflict logic
ansible · Oct 5, 2018 · 50399e3 · 50399e3
1 parent 252bac2
commit 50399e3
Show file tree

Hide file tree

Showing 6 changed files with 271 additions and 419 deletions.
diff --git a/awx/ui/client/features/templates/templates.strings.js b/awx/ui/client/features/templates/templates.strings.js
@@ -112,7 +112,6 @@ function TemplatesStrings (BaseString) {
         RUN: t.s('RUN'),
         CHECK: t.s('CHECK'),
         SELECT: t.s('SELECT'),
-        EDGE_CONFLICT: t.s('EDGE CONFLICT'),
         DELETED: t.s('DELETED'),
         START: t.s('START'),
         DETAILS: t.s('DETAILS'),

diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
@@ -101,13 +101,6 @@
     width: 90px;
     color: @default-interface-txt;
 }
-.WorkflowChart-conflictIcon {
-    color: @default-err;
-}
-.WorkflowChart-conflictText {
-    width: 90px;
-    color: @default-interface-txt;
-}
 .WorkflowChart-activeNode {
     fill: @default-link;
 }

diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
@@ -327,16 +327,6 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
                                     return (d.unifiedJobTemplate && d.unifiedJobTemplate.name) ? d.unifiedJobTemplate.name : "";
                                 }).each(wrap);
 
-                            thisNode.append("foreignObject")
-                                 .attr("x", 54)
-                                 .attr("y", 45)
-                                 .style("font-size","0.7em")
-                                 .attr("class", "WorkflowChart-conflictText")
-                                 .html(function () {
-                                     return `<span class=\"WorkflowChart-conflictIcon\">\uf06a</span><span> ${TemplatesStrings.get('workflow_maker.EDGE_CONFLICT')}</span>`;
-                                 })
-                                 .style("display", function(d) { return (d.edgeConflict && !d.placeholder) ? null : "none"; });
-
                             thisNode.append("foreignObject")
                                 .attr("x", 62)
                                 .attr("y", 22)
@@ -831,9 +821,6 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
                     t.selectAll(".WorkflowChart-deletedText")
                         .style("display", function(d){ return d.unifiedJobTemplate || d.placeholder ? "none" : null; });
 
-                    t.selectAll(".WorkflowChart-conflictText")
-                        .style("display", function(d) { return (d.edgeConflict && !d.placeholder) ? null : "none"; });
-
                     t.selectAll(".WorkflowChart-activeNode")
                         .style("display", function(d) { return d.isActiveEdit ? null : "none"; });