Ver código fonte

AMBARI-20093. Cannot edit join node name in Workflow Manager.(Belliraj HB via gauravn7)

Gaurav Nagar 8 anos atrás
pai
commit
7152be6e5b

+ 1 - 1
contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js

@@ -19,7 +19,7 @@ import Ember from 'ember';
 import CytoscapeStyles from '../domain/cytoscape-style';
 var CytoscapeRenderer= Ember.Object.extend({
   currentCyNode: null,
-  staticNodes: ['start', 'end', 'join', 'placeholder'],
+  staticNodes: ['start', 'end', 'placeholder'],
   dataNodes: [],
   cyOverflow: {},
   cy: null,

+ 8 - 0
contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-style.js

@@ -18,6 +18,7 @@
 import Ember from 'ember';
 var defaultNodeColor = '#fff';
 var actionNodeColor = '#f5f5f5';
+var killNodeColor='#d43f3a'
 var labelFunction=function(target) {
   if (!target.data().node.name) {
     return "";
@@ -114,6 +115,13 @@ export default Ember.Object.create({
             return "none";
           }
         },
+        'color': function(target){
+              if (!target.data().transition || !target.data().transition.isOnError()) {
+                return "black"
+              }else{
+                return killNodeColor;
+              }
+        },
         width: 1,
         'font-size': 12,
         label: function(target) {

+ 1 - 1
contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs

@@ -197,7 +197,7 @@
         <div id="cyRenderer">
           <div id="{{cyId}}" class="cy-panel"></div>
           {{#each dataNodes as |dataNode|}}
-            {{#if (or (eq dataNode.data.type 'action') (eq dataNode.data.type 'decision') (eq dataNode.data.type 'fork'))}}
+            {{#if (or (eq dataNode.data.type 'action') (eq dataNode.data.type 'decision') (eq dataNode.data.type 'fork')  (eq dataNode.data.type 'join'))}}
               <div id="{{dataNode.data.id}}" class="">
                 {{input required pattern="([a-zA-Z_]([\-_a-zA-Z0-9])*){1,39}" name="actionName" data-toggle="tooltip" title=dataNode.name classBinding="dataNode.data.node.errors:error:editable" class="editableNode overlay_node_editor" value=dataNode.dataNodeName placeholder="Action Name"}}
               </div>