fix(modeling): do not remove sequence flow condition on type change

* do not remove sequence flow condition when changing type to intermediate catch Closes #1199
bpmn-io · Sep 27, 2019 · b290078 · b290078
1 parent 2e80209
commit b290078
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/features/modeling/BpmnUpdater.js b/lib/features/modeling/BpmnUpdater.js
@@ -19,6 +19,10 @@ import {
   is
 } from '../../util/ModelUtil';
 
+import {
+  isAny
+} from './util/ModelingUtil';
+
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
 /**
@@ -248,10 +252,13 @@ export default function BpmnUpdater(
 
     // on reconnectEnd -> conditional flow
     if (oldTarget && (businessObject.conditionExpression) &&
-        !(is(newTarget, 'bpmn:Activity') ||
-          is(newTarget, 'bpmn:EndEvent') ||
-          is(newTarget, 'bpmn:Gateway') ||
-          is(newTarget, 'bpmn:IntermediateThrowEvent'))) {
+        !isAny(newTarget, [
+          'bpmn:Activity',
+          'bpmn:EndEvent',
+          'bpmn:Gateway',
+          'bpmn:IntermediateThrowEvent',
+          'bpmn:IntermediateCatchEvent'
+        ])) {
       context.conditionExpression = businessObject.conditionExpression;
       businessObject.conditionExpression = undefined;
     }

diff --git a/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js b/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js
@@ -1817,7 +1817,8 @@ describe('features/popup-menu - replace menu provider', function() {
       [
         'bpmn:Activity',
         'bpmn:EndEvent',
-        'bpmn:IntermediateThrowEvent'
+        'bpmn:IntermediateThrowEvent',
+        'bpmn:IntermediateCatchEvent'
       ].forEach(function(type) {
 
         it('should keep ConditionalFlow when changing target to ' + type,