fix: event references are not lost when switching elements

Closes #2249, 1906
Related to: camunda/camunda-modeler#4863

Author: abdul99ahad

lib/features/copy-paste/ModdleCopy.js

@@ -12,6 +12,8 @@ import {
 
 import { is } from '../../util/ModelUtil';
 
+import { hasAnyEventDefinition } from '../../util/DiUtil';
+
 var DISALLOWED_PROPERTIES = [
   'artifacts',
   'dataInputAssociations',
@@ -198,8 +200,16 @@ ModdleCopy.prototype.copyProperty = function(property, parent, propertyName, clo
 
   var propertyDescriptor = this._moddle.getPropertyDescriptor(parent, propertyName);
 
-  // do NOT copy references
+  // do NOT copy references except given event definitions
   if (propertyDescriptor.isReference) {
+    if (hasAnyEventDefinition(parent, [
+      'bpmn:ErrorEventDefinition',
+      'bpmn:EscalationEventDefinition',
+      'bpmn:MessageEventDefinition',
+      'bpmn:SignalEventDefinition'
+    ])) {
+      return property;
+    }
     return;
   }
 

lib/util/DiUtil.js

@@ -5,7 +5,8 @@ import {
 } from './ModelUtil';
 
 import {
-  some
+  some,
+  isArray
 } from 'min-dash';
 
 /**
@@ -120,3 +121,19 @@ export function hasEscalationEventDefinition(element) {
 export function hasCompensateEventDefinition(element) {
   return hasEventDefinition(element, 'bpmn:CompensateEventDefinition');
 }
+
+/**
+ * @param {ModdleElement} moddleElement
+ * @param {string[]} types
+ *
+ * @return {boolean}
+ */
+export function hasAnyEventDefinition(moddleElement, types) {
+  if (!isArray(types)) {
+    types = [ types ];
+  }
+
+  return some(types, function(type) {
+    return is(moddleElement, type);
+  });
+}

test/spec/features/modeling/behavior/BoundaryEventBehaviorSpec.js

@@ -64,7 +64,7 @@ describe('features/modeling/behavior - boundary event', function() {
   });
 
 
-  describe.skip('should keep root element reference on replace', function() {
+  describe('should keep root element reference on replace', function() {
 
     describe('interrupting to non-interrupting', function() {
 
@@ -85,7 +85,7 @@ describe('features/modeling/behavior - boundary event', function() {
         });
 
         // then
-        expect(getReferencedRootElement(nonInterruptingBoundaryEvent, 'messageRef')).to.equal(message);
+        expectRefEquals(interruptingBoundaryEvent, nonInterruptingBoundaryEvent, 'messageRef');
       }));
 
 
@@ -106,7 +106,7 @@ describe('features/modeling/behavior - boundary event', function() {
         });
 
         // then
-        expect(getReferencedRootElement(nonInterruptingBoundaryEvent, 'escalationRef')).to.equal(escalation);
+        expectRefEquals(interruptingBoundaryEvent, nonInterruptingBoundaryEvent, 'escalationRef');
       }));
 
 
@@ -127,7 +127,7 @@ describe('features/modeling/behavior - boundary event', function() {
         });
 
         // then
-        expect(getReferencedRootElement(nonInterruptingBoundaryEvent, 'errorRef')).to.equal(error);
+        expectRefEquals(interruptingBoundaryEvent, nonInterruptingBoundaryEvent, 'errorRef');
       }));
 
 
@@ -148,7 +148,7 @@ describe('features/modeling/behavior - boundary event', function() {
         });
 
         // then
-        expect(getReferencedRootElement(nonInterruptingBoundaryEvent, 'signalRef')).to.equal(signal);
+        expectRefEquals(interruptingBoundaryEvent, nonInterruptingBoundaryEvent, 'signalRef');
       }));
 
     });
@@ -173,7 +173,7 @@ describe('features/modeling/behavior - boundary event', function() {
         });
 
         // then
-        expect(getReferencedRootElement(nonInterruptingBoundaryEvent, 'messageRef')).to.equal(message);
+        expectRefEquals(interruptingBoundaryEvent, nonInterruptingBoundaryEvent, 'messageRef');
       }));
 
     });
@@ -190,4 +190,13 @@ function getReferencedRootElement(element, propertyName) {
       eventDefinition = businessObject.eventDefinitions[ 0 ];
 
   return eventDefinition.get(propertyName);
+}
+
+function expectRefEquals(element, newElement, propertyName) {
+  const previousRefElement = getReferencedRootElement(element, propertyName);
+  const newRefElement = getReferencedRootElement(newElement, propertyName);
+
+  // expect name to be same
+  expect(previousRefElement).to.equal(newRefElement);
+
 }