feat(context-pads): trigger events on all elements

bpmn-io · Dec 15, 2023 · d0b7474 · d0b7474
1 parent 4de93b9
commit d0b7474
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 4 deletions.
diff --git a/lib/features/context-pads/ContextPads.js b/lib/features/context-pads/ContextPads.js
@@ -50,9 +50,8 @@ export default function ContextPads(
 
   this.registerHandler('bpmn:Activity', PauseHandler);
 
-  this.registerHandler('bpmn:StartEvent', TriggerHandler);
-  this.registerHandler('bpmn:IntermediateCatchEvent', TriggerHandler);
-  this.registerHandler('bpmn:BoundaryEvent', TriggerHandler);
+  this.registerHandler('bpmn:Event', TriggerHandler);
+  this.registerHandler('bpmn:Gateway', TriggerHandler);
   this.registerHandler('bpmn:Activity', TriggerHandler);
 
   eventBus.on(TOGGLE_MODE_EVENT, LOW_PRIORITY, context => {

diff --git a/lib/features/context-pads/handler/TriggerHandler.js b/lib/features/context-pads/handler/TriggerHandler.js
@@ -20,9 +20,15 @@ TriggerHandler.prototype.createContextPads = function(element) {
 TriggerHandler.prototype.createTriggerContextPad = function(element) {
 
   const contexts = () => {
-    return this._findSubscriptions({
+    const subscriptions = this._findSubscriptions({
       element
     });
+
+    const sortedSubscriptions = subscriptions.slice().sort((a, b) => {
+      return a.event.type === 'none' ? 1 : -1;
+    });
+
+    return sortedSubscriptions;
   };
 
   const html = `

diff --git a/test/spec/SimulationSpec.js b/test/spec/SimulationSpec.js
@@ -1485,6 +1485,94 @@ describe('simulation', function() {
     });
   });
 
+
+  describe('process', function() {
+
+    describe('implicit-start', function() {
+
+      const diagram = require('./implicit-start.bpmn');
+
+      beforeEach(bootstrapModeler(diagram, {
+        additionalModules: [
+          ModelerModule,
+          TestModule
+        ]
+      }));
+
+      beforeEach(inject(function(simulationSupport, simulationTrace) {
+        simulationSupport.toggleSimulation(true);
+
+        simulationTrace.start();
+      }));
+
+
+      it('should trigger typed event', async function() {
+
+        // when
+        triggerElement('MESSAGE_START');
+
+        // then
+        expectHistory([
+          'GATEWAY',
+          'TASK',
+          'END',
+          'ESCALATION_THROW',
+          'MESSAGE_START'
+        ]);
+      });
+
+
+      it('should trigger none event independently', async function() {
+
+        // when
+        triggerElement('NONE_START');
+
+        // then
+        expectHistory([
+          'GATEWAY',
+          'TASK',
+          'END',
+          'ESCALATION_THROW',
+          'NONE_START'
+        ]);
+      });
+
+    });
+
+
+    describe('implicit-start-no-event', function() {
+
+      const diagram = require('./implicit-start-no-event.bpmn');
+
+      beforeEach(bootstrapModeler(diagram, {
+        additionalModules: [
+          ModelerModule,
+          TestModule
+        ]
+      }));
+
+      beforeEach(inject(function(simulationSupport, simulationTrace) {
+        simulationSupport.toggleSimulation(true);
+
+        simulationTrace.start();
+      }));
+
+
+      it('should trigger task', async function() {
+
+        // when
+        triggerElement('TASK');
+
+        // then
+        expectHistory([
+          'TASK',
+          'OTHER_TASK'
+        ]);
+      });
+    });
+
+  });
+
 });
 
 

diff --git a/test/spec/implicit-start-no-event.bpmn b/test/spec/implicit-start-no-event.bpmn
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.18.0">
+  <bpmn:process id="Process_1" isExecutable="true">
+    <bpmn:task id="TASK" name="TASK" />
+    <bpmn:boundaryEvent id="BOUNDARY_EVENT" name="BOUNDARY_EVENT" attachedToRef="TASK" />
+    <bpmn:task id="OTHER_TASK" name="OTHER_TASK" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+      <bpmndi:BPMNShape id="TASK_di" bpmnElement="TASK">
+        <dc:Bounds x="160" y="220" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="OTHER_TASK_di" bpmnElement="OTHER_TASK">
+        <dc:Bounds x="160" y="80" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1f9q90w_di" bpmnElement="BOUNDARY_EVENT">
+        <dc:Bounds x="202" y="282" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="178" y="325" width="84" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/test/spec/implicit-start.bpmn b/test/spec/implicit-start.bpmn
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.18.0">
+  <bpmn:process id="Process_1" isExecutable="true">
+    <bpmn:startEvent id="OTHER_NONE_START" name="OTHER_NONE_START" />
+    <bpmn:startEvent id="MESSAGE_START" name="MESSAGE_START">
+      <bpmn:messageEventDefinition id="MessageEventDefinition_14fvqpn" />
+    </bpmn:startEvent>
+    <bpmn:exclusiveGateway id="GATEWAY" name="GATEWAY" />
+    <bpmn:task name="TASK" id="TASK" />
+    <bpmn:endEvent id="END" name="END" />
+    <bpmn:startEvent id="NONE_START" name="NONE_START" />
+    <bpmn:boundaryEvent id="BOUNDARY_EVENT" name="BOUNDARY_EVENT" attachedToRef="TASK" />
+    <bpmn:dataObjectReference id="DATA_OBJECT" name="DATA_OBJECT" dataObjectRef="DataObject_1ctuzy5" />
+    <bpmn:dataObject id="DataObject_1ctuzy5" />
+    <bpmn:dataStoreReference id="DATA_STORE" name="DATA_STORE" />
+    <bpmn:intermediateCatchEvent id="LINK_CATCH" name="LINK_CATCH">
+      <bpmn:linkEventDefinition id="LinkEventDefinition_0klzcqk" name="" />
+    </bpmn:intermediateCatchEvent>
+    <bpmn:intermediateThrowEvent id="ESCALATION_THROW" name="ESCALATION_THROW">
+      <bpmn:escalationEventDefinition id="EscalationEventDefinition_0azvpsn" />
+    </bpmn:intermediateThrowEvent>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+      <bpmndi:BPMNShape id="TASK_di" bpmnElement="TASK">
+        <dc:Bounds x="160" y="430" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="NONE_START_di" bpmnElement="NONE_START">
+        <dc:Bounds x="192" y="82" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="173" y="125" width="74" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="OTHER_NONE_START_di" bpmnElement="OTHER_NONE_START">
+        <dc:Bounds x="312" y="82" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="288" y="125" width="84" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_01yjga0_di" bpmnElement="MESSAGE_START">
+        <dc:Bounds x="192" y="202" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="169" y="245" width="82" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="END_di" bpmnElement="END">
+        <dc:Bounds x="312" y="202" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="318" y="245" width="24" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="GATEWAY_di" bpmnElement="GATEWAY" isMarkerVisible="true">
+        <dc:Bounds x="305" y="445" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="303" y="502" width="54" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DATA_OBJECT_di" bpmnElement="DATA_OBJECT">
+        <dc:Bounds x="402" y="445" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="381" y="502" width="78" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DATA_STORE_di" bpmnElement="DATA_STORE">
+        <dc:Bounds x="495" y="445" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="484" y="502" width="72" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0jrs9d9_di" bpmnElement="LINK_CATCH">
+        <dc:Bounds x="432" y="82" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="416" y="125" width="68" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_09bi8zx_di" bpmnElement="ESCALATION_THROW">
+        <dc:Bounds x="432" y="202" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="412" y="245" width="76" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1f9q90w_di" bpmnElement="BOUNDARY_EVENT">
+        <dc:Bounds x="202" y="492" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="178" y="535" width="84" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>