fix(ReplaceMenuProvider): handle condition/default when morphing flows

* Remove conditionExpression when morphing to default flow
 * Remove default property when morphing to conditional flow

Closes #441, closes #442

lib/features/modeling/behavior/ReplaceConnectionBehavior.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var forEach = require('lodash/collection/forEach'),
+    find = require('lodash/collection/find'),
     inherits = require('inherits');
 
 var CommandInterceptor = require('diagram-js/lib/command/CommandInterceptor');
@@ -97,6 +98,27 @@ function ReplaceConnectionBehavior(eventBus, modeling, bpmnRules) {
     fixConnection(connection);
   });
 
+  this.postExecuted('element.updateProperties', function(event) {
+    var context = event.context,
+        properties = context.properties,
+        element = context.element,
+        businessObject = element.businessObject,
+        connection;
+
+    // remove condition expression when morphing to default flow
+    if (properties.default) {
+      connection = find(element.outgoing, { id: element.businessObject.default.id });
+
+      if (connection) {
+        modeling.updateProperties(connection, { conditionExpression: undefined });
+      }
+    }
+
+    // remove default property from source when morphing to conditional flow
+    if (properties.conditionExpression && businessObject.sourceRef.default === businessObject) {
+      modeling.updateProperties(element.source, { default: undefined });
+    }
+  });
 }
 
 inherits(ReplaceConnectionBehavior, CommandInterceptor);

lib/features/popup-menu/ReplaceMenuProvider.js

@@ -297,7 +297,8 @@ ReplaceMenuProvider.prototype._createSequenceFlowEntries = function (element, re
         }
         // conditional flows
         if ((is(businessObject.sourceRef, 'bpmn:ExclusiveGateway') ||
-           is(businessObject.sourceRef, 'bpmn:InclusiveGateway')) &&
+           is(businessObject.sourceRef, 'bpmn:InclusiveGateway') ||
+           is(businessObject.sourceRef, 'bpmn:Activity')) &&
            businessObject.sourceRef.default === businessObject) {
 
           return menuEntries.push(self._createMenuEntry(entry, element, function() {

test/spec/features/popup-menu/ReplaceMenuProviderSpec.js

@@ -1001,10 +1001,115 @@ describe('features/replace-menu', function() {
       }));
 
 
+      it('should morph DefaultFlow into a SequenceFlow [task]', inject(function(elementRegistry, popupMenu) {
+        // given
+        var sequenceFlow = elementRegistry.get('SequenceFlow_15f5knn'),
+            entries;
+
+        openPopup(sequenceFlow);
+
+        entries = getEntries(popupMenu);
+
+        triggerAction(entries, 'replace-with-default-flow');
+
+        // when
+        openPopup(sequenceFlow);
+
+        entries = getEntries(popupMenu);
+
+        triggerAction(entries, 'replace-with-sequence-flow');
+
+        var task = elementRegistry.get('Task_1ei94kl');
+
+        // then
+        expect(task.businessObject.default).to.not.exist;
+      }));
+
+
+      it('should morph DefaultFlow into a SequenceFlow [task] -> undo',
+        inject(function(elementRegistry, popupMenu, commandStack) {
+        // given
+        var sequenceFlow = elementRegistry.get('SequenceFlow_15f5knn'),
+            entries;
+
+        openPopup(sequenceFlow);
+
+        entries = getEntries(popupMenu);
+
+        triggerAction(entries, 'replace-with-default-flow');
+
+        // when
+        openPopup(sequenceFlow);
+
+        entries = getEntries(popupMenu);
+
+        triggerAction(entries, 'replace-with-sequence-flow');
+
+        commandStack.undo();
+
+        var task = elementRegistry.get('Task_1ei94kl');
+
+        // then
+        expect(task.businessObject.default).to.equal(sequenceFlow.businessObject);
+      }));
+
+
+      it('should morph DefaultFlow into a ConditionalFlow [task]', inject(function(elementRegistry, popupMenu) {
+        // given
+        var sequenceFlow = elementRegistry.get('SequenceFlow_15f5knn'),
+            task = elementRegistry.get('Task_1ei94kl'),
+            entries;
+
+        openPopup(sequenceFlow);
+
+        entries = getEntries(popupMenu);
+
+        triggerAction(entries, 'replace-with-default-flow');
+
+        // when
+        openPopup(sequenceFlow);
+
+        entries = getEntries(popupMenu);
+
+        triggerAction(entries, 'replace-with-conditional-flow');
+
+        // then
+        expect(task.businessObject.default).to.not.exist;
+      }));
+
+
+      it('should morph DefaultFlow into a ConditionalFlow [task] -> undo',
+        inject(function(elementRegistry, popupMenu, commandStack) {
+        // given
+        var sequenceFlow = elementRegistry.get('SequenceFlow_15f5knn'),
+            task = elementRegistry.get('Task_1ei94kl'),
+            entries;
+
+        openPopup(sequenceFlow);
+
+        entries = getEntries(popupMenu);
+
+        triggerAction(entries, 'replace-with-default-flow');
+
+        // when
+        openPopup(sequenceFlow);
+
+        entries = getEntries(popupMenu);
+
+        triggerAction(entries, 'replace-with-conditional-flow');
+
+        commandStack.undo();
+
+        // then
+        expect(task.businessObject.default).to.equal(sequenceFlow.businessObject);
+      }));
+
+
       it('should replace SequenceFlow with DefaultFlow [gateway] -> undo',
         inject(function(elementRegistry, popupMenu, commandStack) {
         // given
-        var sequenceFlow = elementRegistry.get('SequenceFlow_3');
+        var sequenceFlow = elementRegistry.get('SequenceFlow_3'),
+            gateway = elementRegistry.get('ExclusiveGateway_1');
 
         // when
         openPopup(sequenceFlow);
@@ -1015,8 +1120,6 @@ describe('features/replace-menu', function() {
 
         commandStack.undo();
 
-        var gateway = elementRegistry.get('ExclusiveGateway_1');
-
         // then
         expect(gateway.businessObject.default).to.not.exist;
       }));
@@ -1247,11 +1350,15 @@ describe('features/replace-menu', function() {
       }));
 
 
-      it('should keep DefaultFlow when morphing Task -> undo',
-        inject(function(elementRegistry, bpmnReplace, popupMenu, commandStack) {
+      it('should remove any conditionExpression when morphing to DefaultFlow',
+        inject(function(elementRegistry, modeling, popupMenu, moddle) {
         // given
-        var sequenceFlow = elementRegistry.get('SequenceFlow_15f5knn'),
-            task = elementRegistry.get('Task_1ei94kl');
+        var sequenceFlow = elementRegistry.get('SequenceFlow_3'),
+            exclusiveGateway = elementRegistry.get('ExclusiveGateway_1');
+
+        var conditionExpression = moddle.create('bpmn:FormalExpression', { body: '' });
+
+        modeling.updateProperties(sequenceFlow, { conditionExpression: conditionExpression });
 
         // when
         openPopup(sequenceFlow);
@@ -1259,16 +1366,37 @@ describe('features/replace-menu', function() {
         var entries = getEntries(popupMenu);
 
         // trigger DefaultFlow replacement
-        var replaceDefaultFlow = find(entries, { id: 'replace-with-default-flow' });
+        triggerAction(entries, 'replace-with-default-flow');
 
-        replaceDefaultFlow.action();
+        // then
+        expect(exclusiveGateway.businessObject.default).to.equal(sequenceFlow.businessObject);
+        expect(sequenceFlow.businessObject.conditionExpression).to.not.exist;
+      }));
 
-        bpmnReplace.replaceElement(task, { type: 'bpmn:SendTask'});
+
+      it('should remove any conditionExpression when morphing to DefaultFlow -> undo',
+        inject(function(elementRegistry, modeling, popupMenu, moddle, commandStack) {
+        // given
+        var sequenceFlow = elementRegistry.get('SequenceFlow_3'),
+            exclusiveGateway = elementRegistry.get('ExclusiveGateway_1');
+
+        var conditionExpression = moddle.create('bpmn:FormalExpression', { body: '' });
+
+        modeling.updateProperties(sequenceFlow, { conditionExpression: conditionExpression });
+
+        // when
+        openPopup(sequenceFlow);
+
+        var entries = getEntries(popupMenu);
+
+        // trigger DefaultFlow replacement
+        entries[0].action();
 
         commandStack.undo();
 
         // then
-        expect(task.businessObject.default).to.equal(sequenceFlow.businessObject);
+        expect(exclusiveGateway.businessObject.default).to.not.exist;
+        expect(sequenceFlow.businessObject.conditionExpression).to.equal(conditionExpression);
       }));
 
     });