bpmn-js 16.3.0 → 16.3.2

package/lib/features/modeling/behavior/CompensateBoundaryEventBehavior.js

@@ -11,7 +11,8 @@ import { hasEventDefinition, isEventSubProcess } from '../../../util/DiUtil';
  */
 
 /**
- *
+ * Behavior ensuring that only a single compensation activity is connected to a
+ * compensation boundary event when connecting, reconnecting or replacing shapes.
  *
  * @param {import('diagram-js/lib/core/EventBus').default} eventBus
  * @param {import('../Modeling').default} modeling
@@ -29,7 +30,7 @@ export default function CompensateBoundaryEventBehavior(eventBus, modeling, bpmn
   this.postExecuted('element.updateProperties', handlePropertiesUpdate, true);
 
   /**
-   * Given a connection from boundary event is removed, remove the forCompensation property.
+   * Given a connection from boundary event is removed, remove the `isForCompensation` property.
    */
   function handleConnectionRemoval(context) {
     const source = context.source,
@@ -41,15 +42,16 @@ export default function CompensateBoundaryEventBehavior(eventBus, modeling, bpmn
   }
 
   /**
-   * Add forCompensation property and make sure only a single compensation activity is connected.
+   * Add `isForCompensation` property and make sure only a single compensation activity is connected.
    */
   function handleNewConnection(context) {
-    const source = context.source,
+    const connection = context.connection,
+          source = context.source,
           target = context.target;
 
-    if (isCompensationBoundaryEvent(source) && canBeForCompensation(target)) {
+    if (isCompensationBoundaryEvent(source) && isForCompensationAllowed(target)) {
       addIsForCompensationProperty(target);
-      removeExistingAssociation(source);
+      removeExistingAssociations(source, [ connection ]);
     }
   }
 
@@ -68,7 +70,7 @@ export default function CompensateBoundaryEventBehavior(eventBus, modeling, bpmn
       }
 
       // newTarget perspective
-      if (isCompensationBoundaryEvent(source) && canBeForCompensation(newTarget)) {
+      if (isCompensationBoundaryEvent(source) && isForCompensationAllowed(newTarget)) {
         addIsForCompensationProperty(newTarget);
       }
     }
@@ -78,9 +80,9 @@ export default function CompensateBoundaryEventBehavior(eventBus, modeling, bpmn
     const { element } = context;
 
     if (isForCompensation(element)) {
-      removeIllegalConnections(element);
+      removeDisallowedConnections(element);
       removeAttachments(element);
-    } else if (canBeForCompensation(element)) {
+    } else if (isForCompensationAllowed(element)) {
       removeIncomingCompensationAssociations(element);
     }
   }
@@ -90,13 +92,15 @@ export default function CompensateBoundaryEventBehavior(eventBus, modeling, bpmn
    * and remove the potential candidates for connection replacement to have a single compensation activity.
    */
   function handleReplacement(context) {
-    const { targetElement } = context.hints || {},
-          { oldShape } = context;
+    const {
+      newData,
+      oldShape
+    } = context;
 
     // from compensate boundary event
     if (isCompensationBoundaryEvent(context.oldShape) &&
-      targetElement.eventDefinitionType !== 'bpmn:CompensateEventDefinition' ||
-      targetElement.type !== 'bpmn:BoundaryEvent'
+      newData.eventDefinitionType !== 'bpmn:CompensateEventDefinition' ||
+      newData.type !== 'bpmn:BoundaryEvent'
     ) {
       const targetConnection = oldShape.outgoing.find(
         ({ target }) => isForCompensation(target)
@@ -110,11 +114,11 @@ export default function CompensateBoundaryEventBehavior(eventBus, modeling, bpmn
     // to compensate boundary event
     else if (
       !isCompensationBoundaryEvent(context.oldShape) &&
-      targetElement.eventDefinitionType === 'bpmn:CompensateEventDefinition' &&
-      targetElement.type === 'bpmn:BoundaryEvent'
+      newData.eventDefinitionType === 'bpmn:CompensateEventDefinition' &&
+      newData.type === 'bpmn:BoundaryEvent'
     ) {
       const targetConnection = oldShape.outgoing.find(
-        ({ target }) => canBeForCompensation(target)
+        ({ target }) => isForCompensationAllowed(target)
       );
 
       if (targetConnection && targetConnection.target) {
@@ -141,7 +145,7 @@ export default function CompensateBoundaryEventBehavior(eventBus, modeling, bpmn
     modeling.updateProperties(target, { isForCompensation: undefined });
   }
 
-  function removeIllegalConnections(element) {
+  function removeDisallowedConnections(element) {
 
     for (const connection of element.incoming) {
       if (!bpmnRules.canConnect(connection.source, element)) {
@@ -156,9 +160,11 @@ export default function CompensateBoundaryEventBehavior(eventBus, modeling, bpmn
     }
   }
 
-  function removeExistingAssociation(boundaryEvent) {
+  function removeExistingAssociations(boundaryEvent, ignoredAssociations) {
     const associations = boundaryEvent.outgoing.filter(connection => is(connection, 'bpmn:Association'));
-    const associationsToRemove = associations.filter(association => isForCompensation(association.target));
+    const associationsToRemove = associations.filter(association => {
+      return isForCompensation(association.target) && !ignoredAssociations.includes(association);
+    });
 
     // remove existing associations
     associationsToRemove.forEach(association => modeling.removeConnection(association));
@@ -211,6 +217,6 @@ function isCompensationBoundaryEvent(element) {
     hasEventDefinition(element, 'bpmn:CompensateEventDefinition');
 }
 
-function canBeForCompensation(element) {
+function isForCompensationAllowed(element) {
   return element && is(element, 'bpmn:Activity') && !isEventSubProcess(element);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "16.3.0",
+  "version": "16.3.2",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [