bpmn-js 0.14.0 → 0.14.1

package/lib/features/rules/BpmnRules.js

@@ -2,6 +2,7 @@
 
 var find = require('lodash/collection/find'),
     any = require('lodash/collection/any'),
+    filter = require('lodash/collection/filter'),
     forEach = require('lodash/collection/forEach'),
     inherits = require('inherits');
 
@@ -91,6 +92,13 @@ BpmnRules.prototype.init = function() {
     return canAttach([ shape ], target, source, position) || canCreate(shape, target, source, position);
   });
 
+  this.addRule([ 'elements.delete' ], function(context) {
+
+    // do not allow deletion of labels
+    return filter(context.elements, function(e) {
+      return !isLabel(e);
+    });
+  });
 };
 
 BpmnRules.prototype.canConnectMessageFlow = canConnectMessageFlow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "scripts": {
     "test": "grunt test"

package/test/spec/features/context-pad/ContextPadProviderSpec.js

@@ -64,7 +64,7 @@ describe('features - context-pad', function() {
       inject(function (elementRegistry, contextPad, customRules) {
 
       // given
-      customRules.addRule('elements.delete', function() {
+      customRules.addRule('elements.delete', 1500, function() {
         return true;
       });
 
@@ -82,7 +82,7 @@ describe('features - context-pad', function() {
       inject(function(elementRegistry, contextPad, customRules) {
 
       // given
-      customRules.addRule('elements.delete', function() {
+      customRules.addRule('elements.delete', 1500, function() {
         return false;
       });
 
@@ -101,7 +101,7 @@ describe('features - context-pad', function() {
       // given
       var element = elementRegistry.get('StartEvent_1');
 
-      customRules.addRule('elements.delete', function(context) {
+      customRules.addRule('elements.delete', 1500, function(context) {
 
         // element array is actually passed
         expect(context.elements).to.eql([ element ]);
@@ -120,7 +120,7 @@ describe('features - context-pad', function() {
       inject(function(elementRegistry, contextPad, customRules) {
 
       // given
-      customRules.addRule('elements.delete', function(context) {
+      customRules.addRule('elements.delete', 1500, function(context) {
         return context.elements;
       });
 
@@ -138,7 +138,7 @@ describe('features - context-pad', function() {
       inject(function(elementRegistry, contextPad, customRules) {
 
       // given
-      customRules.addRule('elements.delete', function() {
+      customRules.addRule('elements.delete', 1500, function() {
         return [];
       });
 

package/test/spec/features/rules/BpmnRulesSpec.js

@@ -1317,4 +1317,29 @@ describe('features/modeling/rules - BpmnRules', function() {
 
   });
 
+
+  describe('labels', function() {
+
+    var testXML = require('./BpmnRules.process.bpmn');
+
+    beforeEach(bootstrapModeler(testXML, { modules: testModules }));
+
+
+    it('should filter labels', inject(function(elementRegistry, rules) {
+
+      // given
+      var startEventShape = elementRegistry.get('StartEvent_None'),
+          startEventLabel = startEventShape.label;
+
+      // when
+      var allowed = rules.allowed('elements.delete', {
+        elements: [ startEventShape, startEventLabel ]
+      });
+
+      // then
+      expect(allowed).to.eql([ startEventShape ]);
+    }));
+
+  });
+
 });

package/test/spec/features/snapping/BpmnSnappingSpec.js

@@ -374,10 +374,15 @@ describe('features/snapping - BpmnSnapping', function() {
 
   describe('on SubProcess resize', function() {
 
-
     var diagramXML = require('./BpmnSnapping.subProcess-resize.bpmn');
 
-    var testResizeModules = [ coreModule, resizeModule, rulesModule, snappingModule ];
+    var testResizeModules = [
+      coreModule,
+      modelingModule,
+      resizeModule,
+      rulesModule,
+      snappingModule
+    ];
 
     beforeEach(bootstrapModeler(diagramXML, { modules: testResizeModules }));
 
@@ -399,15 +404,20 @@ describe('features/snapping - BpmnSnapping', function() {
 
   describe('on TextAnnotation resize', function() {
 
-
     var diagramXML = require('./BpmnSnapping.textAnnotation-resize.bpmn');
 
-    var testResizeModules = [ coreModule, resizeModule, rulesModule, snappingModule ];
+    var testResizeModules = [
+      coreModule,
+      modelingModule,
+      resizeModule,
+      rulesModule,
+      snappingModule
+    ];
 
     beforeEach(bootstrapModeler(diagramXML, { modules: testResizeModules }));
 
 
-    it('should snap a TextAnnotation to minimum bounds', inject(function(elementRegistry, resize, dragging) {
+    it('should snap to minimum bounds', inject(function(elementRegistry, resize, dragging) {
 
       var textAnnotation = elementRegistry.get('TextAnnotation');