Sequence Flow Expression + Exclusive Event Support

Dominik Horn · Dominik Horn · commit bf48ab1a8038 · 2017-09-25T14:09:34.000+02:00
diff --git a/client/lib/custom/CustomElementFactory.js b/client/lib/custom/CustomElementFactory.js
diff --git a/client/lib/custom/CustomPalette.js b/client/lib/custom/CustomPalette.js
@@ -121,6 +121,9 @@ PaletteProvider.prototype.getPaletteEntries = function(element) {
     ),
     'create.service-task': createAction(
       'bpmn:ServiceTask', 'activity', 'bpmn-icon-service-task'
+    ),
+    'create.exclusive-gateway': createAction(
+      'bpmn:ExclusiveGateway', 'gateway', 'bpmn-icon-gateway-xor'
     )
   });
 
diff --git a/client/lib/custom/CustomReplaceMenuProvider.js b/client/lib/custom/CustomReplaceMenuProvider.js
@@ -9,6 +9,7 @@ function CustomReplaceMenuProvider(popupMenu, modeling, moddle, bpmnReplace, rul
 
 inherits(CustomReplaceMenuProvider, ReplaceMenuProvider);
 
+//For future element support!!  
 CustomReplaceMenuProvider.prototype._createEntries = function(element, replaceOptions) {
   var options = ReplaceMenuProvider.prototype._createEntries.call(this, element, replaceOptions);
 
diff --git a/client/lib/custom/CustomRules.js b/client/lib/custom/CustomRules.js
@@ -41,6 +41,11 @@ CustomRules.prototype.init = function() {
    * Can shape be created on target container?
    */
   function canCreate(source) {
+
+    if(is(source, 'bpmn:ExclusiveGateway')){
+      return true;
+    }
+
     return !hasOutgoings(source);
   }
 
@@ -49,8 +54,11 @@ CustomRules.prototype.init = function() {
    */
   function canConnect(source, target) {
 
+     if(is(source, 'bpmn:ExclusiveGateway')){
+      return true;
+    }
 
-    return !hasOutgoings(source) && !hasIncomings(target);
+    return !hasOutgoings(source);
     
   }
 
diff --git a/client/lib/custom/index.js b/client/lib/custom/index.js
@@ -1,6 +1,5 @@
 module.exports = {
   __init__: [  'paletteProvider', 'customRules', 'contextPadProvider', 'replaceMenuProvider' ],
-  elementFactory: [ 'type', require('./CustomElementFactory') ],
   paletteProvider: [ 'type', require('./CustomPalette') ],
   customRules: [ 'type', require('./CustomRules') ],
   replaceMenuProvider: [ 'type', require('./CustomReplaceMenuProvider') ],
diff --git a/client/lib/custom/modeler-options/Options.js b/client/lib/custom/modeler-options/Options.js
@@ -9,6 +9,7 @@ module.exports.AVAILABLE_REPLACE_ELEMENTS = [
 
 module.exports.AVAILABLE_CONTEXTPAD_ENTRIES = [
 	'append.end-event',
+	'append.gateway',
 	'delete',
 	'connect'
 
diff --git a/client/lib/custom/propertyprovider/ZeebePropertiesProvider.js b/client/lib/custom/propertyprovider/ZeebePropertiesProvider.js
@@ -1,21 +1,19 @@
 'use strict';
 
 
-var inherits = require('inherits');
+var inherits = require('inherits'),
+     is = require('bpmn-js/lib/util/ModelUtil').is;
 
 var PropertiesActivator = require('bpmn-js-properties-panel/lib/PropertiesActivator');
-var idProps = require('bpmn-js-properties-panel/lib/provider/bpmn/parts/IdProps'),
-nameProps = require('bpmn-js-properties-panel/lib/provider/bpmn/parts/NameProps'),
-executableProps = require('bpmn-js-properties-panel/lib/provider/bpmn/parts/ExecutableProps');
-
-var is = require('bpmn-js/lib/util/ModelUtil').is;
-
-var inputOutput = require('./parts/InputOutputProps'),
-inputOutputParameter = require('./parts/InputOutputParameterProps');
 
-var headers = require('./parts/HeadersProps');
-
-var taskDefinition = require('./parts/TaskDefinitionProps');
+var idProps = require('bpmn-js-properties-panel/lib/provider/bpmn/parts/IdProps'),
+    nameProps = require('bpmn-js-properties-panel/lib/provider/bpmn/parts/NameProps'),
+    executableProps = require('bpmn-js-properties-panel/lib/provider/bpmn/parts/ExecutableProps'),
+    inputOutput = require('./parts/InputOutputProps'),
+    inputOutputParameter = require('./parts/InputOutputParameterProps'),
+    headers = require('./parts/HeadersProps'),
+    taskDefinition = require('./parts/TaskDefinitionProps'),
+    sequenceFlowProps = require('./parts/SequenceFlowProps');
 
 
 var getInputOutputParameterLabel = function(param) {
@@ -42,6 +40,7 @@ function createGeneralTabGroups(element, bpmnFactory, elementRegistry, translate
   nameProps(generalGroup, element, translate);
   executableProps(generalGroup, element,translate);
   taskDefinition(generalGroup, element, bpmnFactory);
+  sequenceFlowProps(generalGroup, element, bpmnFactory, translate);
 
   return[
   generalGroup
diff --git a/client/lib/custom/propertyprovider/parts/HeadersProps.js b/client/lib/custom/propertyprovider/parts/HeadersProps.js
@@ -1,10 +1,14 @@
 var properties = require('./implementation/Headers'),
     elementHelper = require('bpmn-js-properties-panel/lib/helper/ElementHelper'),
-    cmdHelper = require('bpmn-js-properties-panel/lib/helper/CmdHelper');
-
+    cmdHelper = require('bpmn-js-properties-panel/lib/helper/CmdHelper'),
+    is = require('bpmn-js/lib/util/ModelUtil').is;
 
 module.exports = function(group, element, bpmnFactory) {
 
+  if(!is(element, 'bpmn:ServiceTask')){
+    return;
+  }
+
   var propertiesEntry = properties(element, bpmnFactory, {
     id: 'headers',
     modelProperties: [ 'key', 'value' ],
diff --git a/client/lib/custom/propertyprovider/parts/InputOutputParameterProps.js b/client/lib/custom/propertyprovider/parts/InputOutputParameterProps.js
@@ -1,11 +1,13 @@
 'use strict';
 
 var inputOutputParameter = require('./implementation/InputOutputParameter');
+var is = require('bpmn-js/lib/util/ModelUtil').is;
 
 var assign = require('lodash/object/assign');
 
 module.exports = function(group, element, bpmnFactory, options) {
 
+
   group.entries = group.entries.concat(inputOutputParameter(element, bpmnFactory, assign({}, options)));
 
 };
diff --git a/client/lib/custom/propertyprovider/parts/InputOutputProps.js b/client/lib/custom/propertyprovider/parts/InputOutputProps.js
@@ -1,15 +1,16 @@
 'use strict';
 
 var inputOutput = require('./implementation/InputOutput');
+var is = require('bpmn-js/lib/util/ModelUtil').is;
 
 module.exports = function(group, element, bpmnFactory) {
 
-  var inputOutputEntry = inputOutput(element, bpmnFactory);
+	var inputOutputEntry = inputOutput(element, bpmnFactory);
 
-  group.entries = group.entries.concat(inputOutputEntry.entries);
+	group.entries = group.entries.concat(inputOutputEntry.entries);
 
-  return {
-    getSelectedParameter: inputOutputEntry.getSelectedParameter
-  };
+	return {
+		getSelectedParameter: inputOutputEntry.getSelectedParameter
+	};
 
 };
diff --git a/client/lib/custom/propertyprovider/parts/SequenceFlowProps.js b/client/lib/custom/propertyprovider/parts/SequenceFlowProps.js
@@ -0,0 +1,141 @@
+'use strict';
+
+var is = require('bpmn-js/lib/util/ModelUtil').is,
+    isAny = require('bpmn-js/lib/features/modeling/util/ModelingUtil').isAny,
+    getBusinessObject = require('bpmn-js/lib/util/ModelUtil').getBusinessObject,
+    domQuery = require('min-dom/lib/query'),
+    cmdHelper = require('bpmn-js-properties-panel/lib/helper/CmdHelper'),
+    elementHelper = require('bpmn-js-properties-panel/lib/helper/ElementHelper');
+
+
+module.exports = function(group, element, bpmnFactory, translate) {
+  var bo;
+
+  if (is(element, 'bpmn:SequenceFlow')) {
+    bo = getBusinessObject(element);
+  }
+
+  if (!bo) {
+    return;
+  }
+
+  if (!isConditionalSource(element.source)) {
+    return;
+  }
+
+  group.entries.push({
+    id: 'condition',
+    label: translate('Condition'),
+    html:  // expression
+            '<div class="bpp-row">' +
+              '<label for="zeebe-condition">'+translate('Expression')+'</label>' +
+              '<div class="bpp-field-wrapper">' +
+                '<input id="zeebe-condition" type="text" name="condition" />' +
+                '<button class="clear" data-action="clear" data-show="canClear">' +
+                  '<span>X</span>' +
+                '</button>' +
+              '</div>' +
+            '</div>',
+
+    get: function(element, propertyName) {
+
+      // read values from xml:
+      var conditionExpression = bo.conditionExpression;
+
+      var values = {},
+          conditionType = '';
+
+      if (conditionExpression) {
+          conditionType = 'expression';
+          values.condition = conditionExpression.get('body');
+      }
+
+      values.conditionType = conditionType;
+
+      return values;
+
+    },
+
+    set: function(element, values, containerElement) {
+      var conditionType = 'expression';
+      var commands = [];
+
+      var conditionProps = {
+        body: undefined
+      };
+
+        var condition = values.condition;
+        conditionProps.body = condition;
+
+      var update = {
+        'conditionExpression': undefined
+      };
+
+      if (conditionType) {
+        update.conditionExpression = elementHelper.createElement(
+          'bpmn:FormalExpression',
+          conditionProps,
+          bo,
+          bpmnFactory
+        );
+
+        var source = element.source;
+
+        // if default-flow, remove default-property from source
+        if (source.businessObject.default === bo) {
+          commands.push(cmdHelper.updateProperties(source, { 'default': undefined }));
+        }
+      }
+
+      commands.push(cmdHelper.updateBusinessObject(element, bo, update));
+
+      return commands;
+    },
+
+    validate: function(element, values) {
+      var validationResult = {};
+
+      if (!values.condition && values.conditionType === 'expression') {
+        validationResult.condition = 'Must provide a value';
+      }
+
+      return validationResult;
+    },
+
+    isExpression: function(element, inputNode) {
+      var conditionType = domQuery('select[name=conditionType]', inputNode);
+      if (conditionType.selectedIndex >= 0) {
+        return conditionType.options[conditionType.selectedIndex].value === 'expression';
+      }
+    },
+
+    clear: function(element, inputNode) {
+      // clear text input
+      domQuery('input[name=condition]', inputNode).value='';
+
+      return true;
+    },
+
+    canClear: function(element, inputNode) {
+      var input = domQuery('input[name=condition]', inputNode);
+
+      return input.value !== '';
+    },
+
+    cssClasses: [ 'bpp-textfield' ]
+  });
+};
+
+
+////// utilities //////////////////////////
+
+var CONDITIONAL_SOURCES = [
+  'bpmn:Activity',
+  'bpmn:ExclusiveGateway',
+  'bpmn:InclusiveGateway',
+  'bpmn:ComplexGateway'
+];
+
+function isConditionalSource(element) {
+  return isAny(element, CONDITIONAL_SOURCES);
+}
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ PaletteProvider.prototype.getPaletteEntries = function(element) {`
`121`	`121`	`),`
`122`	`122`	`'create.service-task': createAction(`
`123`	`123`	`'bpmn:ServiceTask', 'activity', 'bpmn-icon-service-task'`
	`124`	`+ ),`
	`125`	`+ 'create.exclusive-gateway': createAction(`
	`126`	`+ 'bpmn:ExclusiveGateway', 'gateway', 'bpmn-icon-gateway-xor'`
`124`	`127`	`)`
`125`	`128`	`});`
`126`	`129`