camunda-bpmn-js 0.13.0-alpha.0 → 0.13.0-alpha.3

package/lib/base/Modeler.js

@@ -9,10 +9,6 @@ import alignToOriginModule from '@bpmn-io/align-to-origin';
 
 import executableFixModule from 'bpmn-js-executable-fix';
 
-import signavioCompatModule from 'bpmn-js-signavio-compat';
-
-import disableCollapsedSubprocessModule from 'bpmn-js-disable-collapsed-subprocess';
-
 import {
   BpmnPropertiesPanelModule as propertiesPanelModule,
   BpmnPropertiesProviderModule as bpmnPropertiesProviderModule
@@ -41,8 +37,6 @@ Modeler.prototype._injectOriginModule = function(options) {
 Modeler.prototype._extensionModules = [
   minimapModule,
   executableFixModule,
-  signavioCompatModule,
-  disableCollapsedSubprocessModule,
   propertiesPanelModule,
   bpmnPropertiesProviderModule
 ];

package/lib/camunda-cloud/ElementTemplatesValidator.js

@@ -0,0 +1 @@
+export { CloudElementTemplatesValidator } from 'bpmn-js-properties-panel';

package/lib/camunda-cloud/Modeler.js

@@ -2,18 +2,24 @@ import inherits from 'inherits';
 
 import BaseModeler from '../base/Modeler';
 
+import disableCollapsedSubprocessModule from 'bpmn-js-disable-collapsed-subprocess';
+
 import modelingModule from './features/modeling';
 
 import paletteModule from './features/palette';
 
 import contextPadModule from './features/context-pad';
 
+import drilldownModule from './features/drilldown';
+
 import popupMenuModule from './features/popup-menu';
 
 import rulesModule from './features/rules';
 
 import {
-  ZeebePropertiesProviderModule as zeebePropertiesProviderModule
+  ZeebePropertiesProviderModule as zeebePropertiesProviderModule,
+  CloudElementTemplatesPropertiesProviderModule as cloudElementTemplatesPropertiesProvider,
+  ZeebeDescriptionProvider
 } from 'bpmn-js-properties-panel';
 
 import zeebeModdle from 'zeebe-bpmn-moddle/resources/zeebe.json';
@@ -32,6 +38,10 @@ export default function Modeler(options = {}) {
     moddleExtensions: {
       zeebe: zeebeModdle,
       ...options.moddleExtensions
+    },
+    propertiesPanel: {
+      description: ZeebeDescriptionProvider,
+      ...options.propertiesPanel
     }
   };
 
@@ -43,10 +53,13 @@ inherits(Modeler, BaseModeler);
 Modeler.prototype._camundaCloudModules = [
   modelingModule,
   contextPadModule,
+  disableCollapsedSubprocessModule,
+  drilldownModule,
   paletteModule,
   popupMenuModule,
   rulesModule,
   zeebePropertiesProviderModule,
+  cloudElementTemplatesPropertiesProvider,
   zeebeModdleExtension
 ];
 

package/lib/camunda-cloud/features/drilldown/index.js

@@ -0,0 +1,3 @@
+export default {
+  drilldownOverlayBehavior: [ 'value', null ],
+};

package/lib/camunda-cloud/features/modeling/behavior/CleanUpBusinessRuleTaskBehavior.js

@@ -1,84 +1,87 @@
 import {
+  getBusinessObject,
   is
 } from 'bpmn-js/lib/util/ModelUtil';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
+import { without } from 'min-dash';
+
+import { getExtensionElementsList } from '../../../../util/ExtensionElementsUtil';
+
 const HIGH_PRIORITY = 5000;
 
 
 /**
- * Zeebe BPMN behavior for ensuring that a BusinessRuleTask:
- * 1) Either has a taskDefinition ExtensionElement OR
- * 2) Or has a calledDecision ExtensionElement
- * 2.1) If it has a calledDecision ExtensionElement, it shall not have taskHeaders
+ * Zeebe BPMN behavior ensuring that bpmn:BusinessRuleTask only has one of the following:
+ *
+ * (1) zeebe:CalledDecision
+ * (2) zeebe:TaskDefinition and zeebe:TaskHeaders
  */
 export default class CleanUpBusinessRuleTaskBehavior extends CommandInterceptor {
-  constructor(eventBus, modeling) {
+  constructor(commandStack, eventBus) {
     super(eventBus);
 
     /**
-     * Remove zeebe:calledDecision when zeebe:taskDefinition is added
+     * Remove zeebe:CalledDecision if zeebe:TaskDefinition is about to be added.
      */
-    this.postExecute([
-      'properties-panel.update-businessobject-list',
-      'element.updateModdleProperties'
-    ] , HIGH_PRIORITY, function(context) {
+    this.preExecute('element.updateModdleProperties' , HIGH_PRIORITY, function(context) {
       const {
         element,
-        currentObject,
-        objectsToAdd,
         moddleElement,
         properties
       } = context;
 
-      // (1) map properties from both commands
-      const extensionElement = currentObject || moddleElement,
-            newValues = objectsToAdd || (properties && properties.values);
+      if (
+        !is(element, 'bpmn:BusinessRuleTask')
+        || !is(moddleElement, 'bpmn:ExtensionElements')
+        || !properties.values
+      ) {
+        return;
+      }
+
+      const calledDecision = getCalledDecision(element),
+            taskDefinition = getTaskDefinition(element);
 
-      // (2) check conditions and potentially update
       if (
-        is(element, 'bpmn:BusinessRuleTask')
-        && extensionElement
-        && is(extensionElement, 'bpmn:ExtensionElements')
-        && extensionElement.get('values').some((ele) => is(ele, 'zeebe:CalledDecision'))
-        && newValues
-        && newValues.some((ele) => is(ele, 'zeebe:TaskDefinition'))
+        calledDecision
+        && !taskDefinition
+        && properties.values.find(value => is(value, 'zeebe:CalledDecision'))
+        && properties.values.find(value => is(value, 'zeebe:TaskDefinition'))
       ) {
-        removeCalledDecision(element, extensionElement, modeling);
+        properties.values = without(properties.values, calledDecision);
       }
     }, true);
 
     /**
-     * Remove zeebe:taskDefinition and zeebe:taskHeaders when zeebe:calledDecision
+     * Remove zeebe:TaskDefinition and zeebe:TaskHeaders if zeebe:CalledDecision is about to be added.
      */
-    this.postExecute([
-      'properties-panel.update-businessobject-list',
-      'element.updateModdleProperties'
-    ] , HIGH_PRIORITY, function(context) {
+    this.preExecute('element.updateModdleProperties', HIGH_PRIORITY, function(context) {
       const {
         element,
-        currentObject,
-        objectsToAdd,
         moddleElement,
         properties
       } = context;
 
-      // (1) map properties from both commands
-      const extensionElement = currentObject || moddleElement,
-            newValues = objectsToAdd || (properties && properties.values);
+      if (
+        !is(element, 'bpmn:BusinessRuleTask')
+        || !is(moddleElement, 'bpmn:ExtensionElements')
+        || !properties.values
+      ) {
+        return;
+      }
+
+      const calledDecision = getCalledDecision(element),
+            taskDefinition = getTaskDefinition(element),
+            taskHeaders = getTaskHeaders(element);
 
-      // (2) check conditions and potentially update
       if (
-        is(element, 'bpmn:BusinessRuleTask')
-        && extensionElement
-        && is(extensionElement, 'bpmn:ExtensionElements')
-        && extensionElement.get('values').some(
-          (ele) => is(ele, 'zeebe:TaskDefinition') || is(ele, 'zeebe:TaskHeaders'))
-        && newValues
-        && newValues.some((ele) => is(ele, 'zeebe:CalledDecision'))
+        !calledDecision
+        && (taskDefinition || taskHeaders)
+        && properties.values.find(value => is(value, 'zeebe:CalledDecision'))
+        && properties.values.find(value => is(value, 'zeebe:TaskDefinition') || is(value, 'zeebe:TaskHeaders'))
       ) {
-        removeTaskDefintionAndHeaders(element, extensionElement, modeling);
+        properties.values = without(properties.values, (value) => value === taskDefinition || value === taskHeaders);
       }
     }, true);
 
@@ -86,27 +89,27 @@ export default class CleanUpBusinessRuleTaskBehavior extends CommandInterceptor
 }
 
 CleanUpBusinessRuleTaskBehavior.$inject = [
-  'eventBus',
-  'modeling'
+  'commandStack',
+  'eventBus'
 ];
 
 
-// helper ////////////////////
+// helpers //////////
 
-function removeFromExtensionElements(element, extensionElements, modeling, filterFun) {
-  const values = extensionElements.get('values').filter(filterFun);
+function getCalledDecision(element) {
+  const businessObject = getBusinessObject(element);
 
-  modeling.updateModdleProperties(element, extensionElements, {
-    values
-  });
+  return getExtensionElementsList(businessObject, 'zeebe:CalledDecision')[ 0 ];
 }
 
-function removeCalledDecision(element, extensionElements, modeling) {
-  removeFromExtensionElements(element, extensionElements, modeling,
-    (ele) => !is(ele, 'zeebe:CalledDecision'));
-}
+function getTaskDefinition(element) {
+  const businessObject = getBusinessObject(element);
 
-function removeTaskDefintionAndHeaders(element, extensionElements, modeling) {
-  removeFromExtensionElements(element, extensionElements, modeling,
-    (ele) => !is(ele, 'zeebe:TaskDefinition') && !is(ele, 'zeebe:TaskHeaders'));
+  return getExtensionElementsList(businessObject, 'zeebe:TaskDefinition')[ 0 ];
 }
+
+function getTaskHeaders(element) {
+  const businessObject = getBusinessObject(element);
+
+  return getExtensionElementsList(businessObject, 'zeebe:TaskHeaders')[ 0 ];
+}

package/lib/camunda-cloud/features/modeling/behavior/CreateZeebeCallActivityBehavior.js

@@ -57,7 +57,7 @@ export default class CreateZeebeCallActivityBehavior extends CommandInterceptor
         });
       } else if (!has(calledElement, 'propagateAllChildVariables')) {
 
-        // if zeebe:CalledElement exist set zeebe:propagateAllChildVariables to false
+        // set zeebe:propagateAllChildVariables to false if zeebe:CalledElement exists
         modeling.updateModdleProperties(shape, calledElement, {
           propagateAllChildVariables: false
         });

package/lib/camunda-cloud/features/modeling/behavior/RemoveAssignmentDefinitionBehavior.js

@@ -0,0 +1,51 @@
+import { is } from 'bpmn-js/lib/util/ModelUtil';
+
+import { getBusinessObject } from 'bpmn-js/lib/util/ModelUtil';
+
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+
+import { isUndefined } from 'min-dash';
+
+import { removeExtensionElements } from '../../../../util/ExtensionElementsUtil';
+
+const HIGH_PRIORITY = 5000;
+
+
+/**
+ * Zeebe BPMN behavior removing zeebe:AssignmentDefinition elements without
+ * zeebe:assignee and zeebe:candidateGroups.
+ */
+export default class CleanUpBusinessRuleTaskBehavior extends CommandInterceptor {
+  constructor(commandStack, eventBus) {
+    super(eventBus);
+
+    this.postExecuted('element.updateModdleProperties' , HIGH_PRIORITY, function(context) {
+      const {
+        element,
+        moddleElement
+      } = context;
+
+      if (!is(moddleElement, 'zeebe:AssignmentDefinition')) {
+        return;
+      }
+
+      const assignmentDefinition = moddleElement;
+
+      if (
+        is(element, 'bpmn:UserTask')
+          && isUndefined(assignmentDefinition.get('zeebe:assignee'))
+          && isUndefined(assignmentDefinition.get('zeebe:candidateGroups'))
+      ) {
+        const businessObject = getBusinessObject(element);
+
+        removeExtensionElements(element, businessObject, assignmentDefinition, commandStack);
+      }
+    }, true);
+
+  }
+}
+
+CleanUpBusinessRuleTaskBehavior.$inject = [
+  'commandStack',
+  'eventBus'
+];

package/lib/camunda-cloud/features/modeling/behavior/UpdatePropagateAllChildVariablesBehavior.js

@@ -1,3 +1,5 @@
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+
 import {
   getBusinessObject,
   is
@@ -14,31 +16,41 @@ import {
   getIoMapping
 } from '../../../helper/InputOutputHelper';
 
-import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+import {
+  removeExtensionElements
+} from '../../../../util/ExtensionElementsUtil';
 
 const HIGH_PRIORITY = 5000;
 
 
 /**
- * Zeebe BPMN behavior for updating zeebe:propagateAllChildVariables.
+ * Zeebe BPMN behavior for updating bpmn:CallActivity elements
+ * ensuring that only one of the following is true:
+ *
+ * (1) zeebe:propagateAllChildVariables of zeebe:CalledElement is set to true
+ * (2) zeebe:IoMapping extension element has zeebe:Output elements
  */
 export default class UpdatePropagateAllChildVariablesBehavior extends CommandInterceptor {
-  constructor(eventBus, modeling) {
+  constructor(commandStack, eventBus, modeling) {
     super(eventBus);
 
     /**
-     * Remove zeebe:OutputParameters when zeebe:propagateAllChildVariables is set to true.
+     * Remove zeebe:Output elements if zeebe:propagateAllChildVariables is set to true.
+     * Remove zeebe:IoMapping extension element if empty.
      */
-    this.postExecute('properties-panel.update-businessobject' , HIGH_PRIORITY, function(context) {
+    this.postExecute('element.updateModdleProperties' , HIGH_PRIORITY, function(context) {
       const {
         element,
-        properties
+        moddleElement,
+        properties = {}
       } = context;
 
+      const propagateAllChildVariables = properties.propagateAllChildVariables || properties[ 'zeebe:propagateAllChildVariables' ];
+
       if (
         !is(element, 'bpmn:CallActivity')
-        || !properties
-        || !!properties.propagateAllChildVariables === false
+        || !is(moddleElement, 'zeebe:CalledElement')
+        || !propagateAllChildVariables
       ) {
         return;
       }
@@ -57,53 +69,68 @@ export default class UpdatePropagateAllChildVariablesBehavior extends CommandInt
       });
 
       if (!inputParameters || !inputParameters.length) {
-        const businessObject = getBusinessObject(element),
-              extensionElements = businessObject.get('extensionElements');
-
-        const values = extensionElements.get('values').filter((element) => {
-          return !is(element, 'zeebe:IoMapping');
-        });
-
-        modeling.updateModdleProperties(element, extensionElements, {
-          values
-        });
+        removeExtensionElements(element, getBusinessObject(element), ioMapping, commandStack);
       }
     }, true);
 
 
     /**
-     * Set zeebe:propagateAllChildVariables to false on zeebe:Output added.
+     * Set zeebe:propagateAllChildVariables of zeebe:CalledElement to false if
+     * zeebe:Output or zeebe:IoMapping with zeebe:Output is added.
      */
-    this.postExecute('properties-panel.update-businessobject-list' , HIGH_PRIORITY, function(context) {
+    this.preExecute('element.updateModdleProperties' , HIGH_PRIORITY, function(context) {
       const {
-        currentObject,
         element,
-        objectsToAdd,
-        propertyName
+        moddleElement,
+        properties
       } = context;
 
-      if (!is(element, 'bpmn:CallActivity')
-        || !is(currentObject, 'zeebe:IoMapping')
-        || (propertyName !== 'outputParameters' && propertyName !== 'zeebe:outputParameters')
-        || !objectsToAdd
-        || !objectsToAdd.length
-        || !objectsToAdd.find((object) => is(object, 'zeebe:Output'))
-        || !isPropagateAllChildVariables(element)) {
+      if (
+        !is(element, 'bpmn:CallActivity')
+        || !isPropagateAllChildVariables(element)
+      ) {
         return;
       }
 
       const businessObject = getBusinessObject(element),
             calledElement = getCalledElement(businessObject);
 
-      modeling.updateModdleProperties(element, calledElement, {
-        'zeebe:propagateAllChildVariables': false
-      });
+      // (1) zeebe:IoMapping extension element with zeebe:Output added
+      if (
+        is(moddleElement, 'bpmn:ExtensionElements')
+        && properties.values
+      ) {
+        const ioMapping = properties.values.find((value) => is(value, 'zeebe:IoMapping'));
+
+        if (
+          ioMapping
+          && ioMapping.get('outputParameters').length
+          && !getIoMapping(element)
+        ) {
+          modeling.updateModdleProperties(element, calledElement, {
+            'zeebe:propagateAllChildVariables': false
+          });
+        }
+      }
+
+      // (2) zeebe:Output added
+      if (is(moddleElement, 'zeebe:IoMapping')) {
+        const outputParameters = properties.outputParameters || properties[ 'zeebe:outputParameters' ];
+
+        if (outputParameters && outputParameters.length) {
+          modeling.updateModdleProperties(element, calledElement, {
+            'zeebe:propagateAllChildVariables': false
+          });
+        }
+      }
+
     }, true);
 
   }
 }
 
 UpdatePropagateAllChildVariablesBehavior.$inject = [
+  'commandStack',
   'eventBus',
   'modeling'
 ];

package/lib/camunda-cloud/features/modeling/behavior/index.js

@@ -1,24 +1,24 @@
-import CleanUpAssignmentDefinitionBehavior from './CleanUpAssignmentDefinitionBehavior';
 import CleanUpBusinessRuleTaskBehavior from './CleanUpBusinessRuleTaskBehavior';
 import CreateZeebeBoundaryEventBehavior from './CreateZeebeBoundaryEventBehavior';
 import CreateZeebeCallActivityBehavior from './CreateZeebeCallActivityBehavior';
-import UpdatePropagateAllChildVariablesBehavior from './UpdatePropagateAllChildVariablesBehavior';
 import FormDefinitionBehavior from './FormDefinitionBehavior';
+import RemoveAssignmentDefinitionBehavior from './RemoveAssignmentDefinitionBehavior';
+import UpdatePropagateAllChildVariablesBehavior from './UpdatePropagateAllChildVariablesBehavior';
 
 
 export default {
   __init__: [
-    'cleanUpAssignmentDefinitionBehavior',
     'cleanUpBusinessRuleTaskBehavior',
     'createZeebeBoundaryEventBehavior',
     'createZeebeCallActivityBehavior',
-    'updatePropagateAllChildVariablesBehavior',
-    'formDefinitionBehavior'
+    'formDefinitionBehavior',
+    'removeAssignmentDefinitionBehavior',
+    'updatePropagateAllChildVariablesBehavior'
   ],
-  cleanUpAssignmentDefinitionBehavior: [ 'type', CleanUpAssignmentDefinitionBehavior ],
   cleanUpBusinessRuleTaskBehavior: [ 'type', CleanUpBusinessRuleTaskBehavior ],
   createZeebeBoundaryEventBehavior: [ 'type', CreateZeebeBoundaryEventBehavior ],
   createZeebeCallActivityBehavior: [ 'type', CreateZeebeCallActivityBehavior ],
-  updatePropagateAllChildVariablesBehavior: [ 'type', UpdatePropagateAllChildVariablesBehavior ],
-  formDefinitionBehavior: [ 'type', FormDefinitionBehavior ]
+  formDefinitionBehavior: [ 'type', FormDefinitionBehavior ],
+  removeAssignmentDefinitionBehavior: [ 'type', RemoveAssignmentDefinitionBehavior ],
+  updatePropagateAllChildVariablesBehavior: [ 'type', UpdatePropagateAllChildVariablesBehavior ]
 };

package/lib/camunda-cloud/helper/CalledElementHelper.js

@@ -2,7 +2,7 @@ import { has } from 'min-dash';
 
 import { getOutputParameters } from './InputOutputHelper';
 
-import { getExtensionElements } from './ExtensionElementsHelper';
+import { getExtensionElementsList } from '../../util/ExtensionElementsUtil';
 
 import {
   getBusinessObject,
@@ -19,7 +19,7 @@ import {
  */
 function getPropagateAllChildVariablesDefault(element) {
   if (!is(element, 'bpmn:CallActivity')) {
-    return;
+    return false;
   }
 
   const outputParameters = getOutputParameters(element);
@@ -45,7 +45,7 @@ export function getCalledElement(element) {
 export function getCalledElements(element) {
   const businessObject = getBusinessObject(element);
 
-  return getExtensionElements(businessObject, 'zeebe:CalledElement');
+  return getExtensionElementsList(businessObject, 'zeebe:CalledElement');
 }
 
 /**
@@ -58,14 +58,14 @@ export function getCalledElements(element) {
  */
 export function isPropagateAllChildVariables(element) {
   if (!is(element, 'bpmn:CallActivity')) {
-    return;
+    return false;
   }
 
   const businessObject = getBusinessObject(element),
         calledElement = getCalledElement(businessObject);
 
   if (calledElement && has(calledElement, 'propagateAllChildVariables')) {
-    return calledElement.get('propagateAllChildVariables');
+    return calledElement.get('propagateAllChildVariables') || false;
   } else {
     return getPropagateAllChildVariablesDefault(element);
   }

package/lib/camunda-cloud/helper/FormsHelper.js

@@ -1,4 +1,4 @@
-import { getExtensionElements } from './ExtensionElementsHelper';
+import { getExtensionElementsList } from '../../util/ExtensionElementsUtil';
 
 import { createElement } from './ElementHelper';
 
@@ -41,9 +41,9 @@ export function createUserTaskForm(properties, extensionElements, bpmnFactory) {
 }
 
 function findUserTaskForm(formKey, rootElement) {
-  const userTaskForms = getExtensionElements(rootElement, 'zeebe:UserTaskForm');
+  const userTaskForms = getExtensionElementsList(rootElement, 'zeebe:UserTaskForm');
 
-  return find(userTaskForms, function(userTaskForm) {
+  return find(userTaskForms, (userTaskForm) => {
     const id = userTaskForm.get('zeebe:id');
 
     return createFormKey(id) === formKey;
@@ -53,7 +53,7 @@ function findUserTaskForm(formKey, rootElement) {
 export function getFormDefinition(element) {
   const businessObject = getBusinessObject(element);
 
-  const formDefinitions = getExtensionElements(businessObject, 'zeebe:FormDefinition');
+  const formDefinitions = getExtensionElementsList(businessObject, 'zeebe:FormDefinition');
 
   return formDefinitions[ 0 ];
 }

package/lib/camunda-cloud/helper/Utils.js

@@ -4,7 +4,7 @@ import Ids from 'ids';
  * generate a semantic id with given prefix
  */
 export function nextId(prefix) {
-  const ids = new Ids([32,32,1]);
+  const ids = new Ids([ 32,32,1 ]);
 
   return ids.nextPrefixed(prefix);
 }

package/lib/camunda-platform/features/modeling/behavior/DeleteErrorEventDefinitionBehavior.js

@@ -1,45 +1,47 @@
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+
 import {
   getBusinessObject,
   is
 } from 'bpmn-js/lib/util/ModelUtil';
 
-import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+import {
+  getExtensionElementsList,
+  removeExtensionElements
+} from '../../../../util/ExtensionElementsUtil';
 
 const HIGH_PRIORITY = 5000;
 
 
 /**
- * Camunda BPMN specific camunda:ErrorEventDefinition behavior.
+ * Camunda BPMN specific behavior ensuring camunda:ErrorEventDefinition extension elements are removed
+ * if type of e.g. bpmn:ServiceTask is set to something other than external.
  */
 export default class DeleteErrorEventDefinitionBehavior extends CommandInterceptor {
-  constructor(eventBus, modeling) {
+  constructor(commandStack, eventBus) {
     super(eventBus);
 
-    /**
-     * Remove camunda:ErrorEventDefinitions on camunda:type set to external.
-     */
     this.postExecute([
       'element.updateProperties',
-      'properties-panel.update-businessobject'
+      'element.updateModdleProperties'
     ], HIGH_PRIORITY, function(context) {
       const {
         element,
-        oldProperties,
+        moddleElement,
         properties
       } = context;
 
-      const businessObject = getBusinessObject(element),
-            extensionElements = businessObject.get('extensionElements');
+      const businessObject = moddleElement || getBusinessObject(element);
 
       if (is(element, 'camunda:ExternalCapable')
-        && extensionElements
-        && externalTypeChanged(oldProperties, properties)) {
-
-        const values = extensionElements.get('values').filter((element) => {
-          return !is(element, 'camunda:ErrorEventDefinition');
-        });
-
-        modeling.updateModdleProperties(element, extensionElements, { values });
+        && is(businessObject, 'camunda:ExternalCapable')
+        && properties[ 'camunda:type' ] !== 'external'
+      ) {
+        const errorEventDefinitions = getExtensionElementsList(businessObject, 'camunda:ErrorEventDefinition');
+
+        if (errorEventDefinitions.length) {
+          removeExtensionElements(element, businessObject, errorEventDefinitions, commandStack);
+        }
       }
     }, true);
 
@@ -47,21 +49,6 @@ export default class DeleteErrorEventDefinitionBehavior extends CommandIntercept
 }
 
 DeleteErrorEventDefinitionBehavior.$inject = [
-  'eventBus',
-  'modeling'
-];
-
-
-// helpers //////////
-
-function externalTypeChanged(oldProperties, updatesProperties) {
-  const {
-    'camunda:type': oldType
-  } = oldProperties;
-
-  const {
-    'camunda:type': newType
-  } = updatesProperties;
-
-  return oldType === 'external' && newType !== 'external';
-}
+  'commandStack',
+  'eventBus'
+];