feat(camunda): allow <camunda:In> in signal throw events

Related to camunda/camunda-modeler#1684
camunda · Feb 11, 2020 · 5d62e55 · 5d62e55
1 parent 51005be
commit 5d62e55
Show file tree

Hide file tree

Showing 3 changed files with 169 additions and 1 deletion.
diff --git a/lib/extension.js b/lib/extension.js
@@ -42,6 +42,9 @@ CamundaModdleExtension.prototype.canCopyProperty = function(property, parent) {
     return false;
   }
 
+  if (is(property, 'camunda:In') && !this.canHostIn(parent)) {
+    return false;
+  }
 };
 
 CamundaModdleExtension.prototype.canHostInputOutput = function(parent) {
@@ -87,6 +90,28 @@ CamundaModdleExtension.prototype.canHostConnector = function(parent) {
   return true;
 };
 
+CamundaModdleExtension.prototype.canHostIn = function(parent) {
+
+  var callActivity = getParent(parent, 'bpmn:CallActivity');
+
+  if (callActivity) {
+    return true;
+  }
+
+  var signalEventDefinition = getParent(parent, 'bpmn:SignalEventDefinition');
+
+  if (signalEventDefinition) {
+
+    // only allow on throw and end events
+    return (
+      getParent(parent, 'bpmn:IntermediateThrowEvent') ||
+      getParent(parent, 'bpmn:EndEvent')
+    );
+  }
+
+  return true;
+};
+
 module.exports = CamundaModdleExtension;
 
 // helpers //////////

diff --git a/resources/camunda.json b/resources/camunda.json
@@ -68,7 +68,8 @@
       ],
       "meta": {
         "allowedIn": [
-          "bpmn:CallActivity"
+          "bpmn:CallActivity",
+          "bpmn:SignalEventDefinition"
         ]
       }
     },

diff --git a/test/spec/extension.js b/test/spec/extension.js
@@ -366,6 +366,148 @@ describe('extension', function() {
   });
 
 
+  describe('camunda:In', function() {
+
+    it('should allow <camunda:In> on CallActivity', function() {
+
+      // given
+      var inOutBinding = moddle.create('camunda:In'),
+          extensionElements = moddle.create('bpmn:ExtensionElements'),
+          callActivity = moddle.create('bpmn:CallActivity');
+
+      extensionElements.$parent = callActivity;
+
+      callActivity.extensionElements = extensionElements;
+
+      // when
+      var canCopyProperty = camundaModdleExtension.canCopyProperty(inOutBinding, extensionElements);
+
+      // then
+      expect(canCopyProperty).not.to.be.false;
+    });
+
+
+    it('should allow <camunda:In> on SignalIntermediateThrowEvent', function() {
+
+      // given
+      var inOutBinding = moddle.create('camunda:In'),
+          extensionElements = moddle.create('bpmn:ExtensionElements'),
+          signalEventDefinition = moddle.create('bpmn:SignalEventDefinition'),
+          intermediateThrowEvent = moddle.create('bpmn:IntermediateThrowEvent');
+
+      extensionElements.$parent = signalEventDefinition;
+
+      signalEventDefinition.extensionElements = extensionElements;
+
+      signalEventDefinition.$parent = intermediateThrowEvent;
+
+      intermediateThrowEvent.eventDefinitions = [ signalEventDefinition ];
+
+      // when
+      var canCopyProperty = camundaModdleExtension.canCopyProperty(inOutBinding, extensionElements);
+
+      // then
+      expect(canCopyProperty).not.to.be.false;
+    });
+
+
+    it('should allow <camunda:In> on SignalEndEvent', function() {
+
+      // given
+      var inOutBinding = moddle.create('camunda:In'),
+          extensionElements = moddle.create('bpmn:ExtensionElements'),
+          signalEventDefinition = moddle.create('bpmn:SignalEventDefinition'),
+          endEvent = moddle.create('bpmn:EndEvent');
+
+      extensionElements.$parent = signalEventDefinition;
+
+      signalEventDefinition.extensionElements = extensionElements;
+
+      signalEventDefinition.$parent = endEvent;
+
+      endEvent.eventDefinitions = [ signalEventDefinition ];
+
+      // when
+      var canCopyProperty = camundaModdleExtension.canCopyProperty(inOutBinding, extensionElements);
+
+      // then
+      expect(canCopyProperty).not.to.be.false;
+    });
+
+
+    it('should NOT allow <camunda:In> on SignalStartEvent', function() {
+
+      // given
+      var inOutBinding = moddle.create('camunda:In'),
+          extensionElements = moddle.create('bpmn:ExtensionElements'),
+          signalEventDefinition = moddle.create('bpmn:SignalEventDefinition'),
+          startEvent = moddle.create('bpmn:StartEvent');
+
+      extensionElements.$parent = signalEventDefinition;
+
+      signalEventDefinition.extensionElements = extensionElements;
+
+      signalEventDefinition.$parent = startEvent;
+
+      startEvent.eventDefinitions = [ signalEventDefinition ];
+
+      // when
+      var canCopyProperty = camundaModdleExtension.canCopyProperty(inOutBinding, extensionElements);
+
+      // then
+      expect(canCopyProperty).to.be.false;
+    });
+
+
+    it('should NOT allow <camunda:In> on SignalIntermediateCatchEvent', function() {
+
+      // given
+      var inOutBinding = moddle.create('camunda:In'),
+          extensionElements = moddle.create('bpmn:ExtensionElements'),
+          signalEventDefinition = moddle.create('bpmn:SignalEventDefinition'),
+          intermediateCatchEvent = moddle.create('bpmn:IntermediateCatchEvent');
+
+      extensionElements.$parent = signalEventDefinition;
+
+      signalEventDefinition.extensionElements = extensionElements;
+
+      signalEventDefinition.$parent = intermediateCatchEvent;
+
+      intermediateCatchEvent.eventDefinitions = [ signalEventDefinition ];
+
+      // when
+      var canCopyProperty = camundaModdleExtension.canCopyProperty(inOutBinding, extensionElements);
+
+      // then
+      expect(canCopyProperty).to.be.false;
+    });
+
+
+    it('should NOT allow <camunda:In> on MessageIntermediateThrowEvent', function() {
+
+      // given
+      var inOutBinding = moddle.create('camunda:In'),
+          extensionElements = moddle.create('bpmn:ExtensionElements'),
+          messageEventDefinition = moddle.create('bpmn:MessageEventDefinition'),
+          intermediateCatchEvent = moddle.create('bpmn:IntermediateCatchEvent');
+
+      extensionElements.$parent = messageEventDefinition;
+
+      messageEventDefinition.extensionElements = extensionElements;
+
+      messageEventDefinition.$parent = intermediateCatchEvent;
+
+      intermediateCatchEvent.eventDefinitions = [ messageEventDefinition ];
+
+      // when
+      var canCopyProperty = camundaModdleExtension.canCopyProperty(inOutBinding, extensionElements);
+
+      // then
+      expect(canCopyProperty).to.be.false;
+    });
+  });
+
+
   describe('camunda:InputOutput', function() {
 
     it('should NOT allow on Gateway', function() {