feat(bpmn-layouter): layout loops

Closes #824
bpmn-io · Jul 11, 2018 · 51599e9 · 51599e9
1 parent 504e37a
commit 51599e9
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 9 deletions.
diff --git a/lib/features/modeling/BpmnLayouter.js b/lib/features/modeling/BpmnLayouter.js
@@ -236,6 +236,12 @@ BpmnLayouter.prototype.layoutConnection = function(connection, hints) {
     }
   }
 
+  if (source === target) {
+    manhattanOptions = {
+      preferredLayouts: [ 'r:b' ]
+    };
+  }
+
   if (manhattanOptions) {
 
     manhattanOptions = assign(manhattanOptions, hints);

diff --git a/lib/features/rules/BpmnRules.js b/lib/features/rules/BpmnRules.js
@@ -378,15 +378,6 @@ function canConnect(source, target, connection) {
     return null;
   }
 
-  // See https://github.com/bpmn-io/bpmn-js/issues/178
-  // as a workround we disallow connections with same
-  // target and source element.
-  // This rule must be removed if a auto layout for this
-  // connections is implemented.
-  if (isSame(source, target)) {
-    return false;
-  }
-
   if (!is(connection, 'bpmn:DataAssociation')) {
 
     if (canConnectMessageFlow(source, target)) {

diff --git a/test/spec/features/modeling/layout/LayoutSequenceFlowSpec.js b/test/spec/features/modeling/layout/LayoutSequenceFlowSpec.js
@@ -31,6 +31,31 @@ describe('features/modeling - layout', function() {
   });
 
 
+  describe('loops', function() {
+
+    var diagramXML = require('./LayoutSequenceFlowSpec.flowElements.bpmn');
+
+    beforeEach(bootstrapModeler(diagramXML, { modules: Modeler.prototype._modules }));
+
+
+    it('should layout loop', function() {
+
+      // when
+      var connection = connect('Task_1', 'Task_1');
+
+      // then
+      expect(connection).to.have.waypoints([
+        { original: { x: 332, y: 220 }, x: 382, y: 220 },
+        { x: 402, y: 220 },
+        { x: 402, y: 280 },
+        { x: 332, y: 280 },
+        { original: { x: 332, y: 220 }, x: 332, y: 260 }
+      ]);
+    });
+
+  });
+
+
   describe('boundary events', function() {
 
     var diagramXML = require('./LayoutSequenceFlowSpec.boundaryEvents.bpmn');

diff --git a/test/spec/features/rules/BpmnRulesSpec.js b/test/spec/features/rules/BpmnRulesSpec.js
@@ -328,6 +328,17 @@ describe('features/modeling/rules - BpmnRules', function() {
       });
     }));
 
+
+    it('connect Task -> Task', inject(function() {
+
+      expectCanConnect('Task', 'Task', {
+        sequenceFlow: true,
+        messageFlow: false,
+        association: false,
+        dataAssociation: false
+      });
+    }));
+
   });