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

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

@@ -1,32 +1,27 @@
-import inherits from 'inherits';
-
 import {
   getBusinessObject,
   is
 } from 'bpmn-js/lib/util/ModelUtil';
 
-import {
-  find
-} from 'min-dash';
-
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
-const HIGH_PRIORITY = 15000;
+const HIGH_PRIORITY = 5000;
 
 
 /**
- * Camunda BPMN specific `camunda:FailedJobRetryTimeCycle` behavior.
- *
- * When `camunda:asyncAfter` or `camunda:asyncBefore` are set to false
- * on an element, then `camunda:FailedJobRetryTimeCycle` shall be removed. This ensures
- * that the BPMN diagram XML reflects the behavior of Camunda Platform engine.
+ * Camunda BPMN specific camunda:FailedJobRetryTimeCycle behavior.
  */
-export default function DeleteRetryTimeCycleBehavior(eventBus) {
-
-  CommandInterceptor.call(this, eventBus);
-
-  this.executed([ 'properties-panel.update-businessobject', 'element.updateProperties' ],
-    HIGH_PRIORITY, function(context) {
+export default class DeleteRetryTimeCycleBehavior extends CommandInterceptor {
+  constructor(eventBus, modeling) {
+    super(eventBus);
+
+    /**
+     * Remove camunda:FailedJobRetryTimeCycle if camunda:asyncAfter or camunda:asyncBefore is set to false.
+     */
+    this.postExecute([
+      'element.updateProperties',
+      'properties-panel.update-businessobject'
+    ], HIGH_PRIORITY, function(context) {
       const {
         element,
         properties
@@ -35,92 +30,55 @@ export default function DeleteRetryTimeCycleBehavior(eventBus) {
       const businessObject = getBusinessObject(element),
             extensionElements = businessObject.extensionElements;
 
-      // (1.1) Execute if...
-      if (is(element, 'camunda:AsyncCapable') && // ...asyncCapable
-        properties && // ...properties updated
-        (properties['camunda:asyncBefore'] === false || // ...update async (1)
-          properties['camunda:asyncAfter'] === false) && // ...update async (2)
-        (extensionElements && extensionElements.values.length) && // ...we have extensionElements
-        (extensionElements.values.find(ele => is(ele, 'camunda:FailedJobRetryTimeCycle'))) && // ...we have retryTimeCycle
-        !getTimerEventDefinition(element) // ...we don't have a TimerEventDefinition
+      if (
+        !is(element, 'camunda:AsyncCapable')
+        || (properties[ 'camunda:asyncBefore' ] !== false && properties[ 'camunda:asyncAfter' ] !== false)
+        || !extensionElements
+        || !extensionElements.get('values').length
+        || !extensionElements.get('values').find((value) => is(value, 'camunda:FailedJobRetryTimeCycle'))
+        || getTimerEventDefinition(element)
+        || isAsyncBefore(businessObject)
+        || isAsyncAfter(businessObject)
       ) {
-
-        // (1.2) ... but don't execute if one async is still true
-        if (isAsyncBefore(businessObject) || isAsyncAfter(businessObject)) {
-          return;
-        }
-
-        // (2) Delete the camunda:FailedJobRetryTimeCycle and save them for revert
-        context.deleteRetryCycleOldExtElements = extensionElements.values;
-
-        extensionElements.values = extensionElements.values.filter(
-          ele => !is(ele, 'camunda:FailedJobRetryTimeCycle'));
+        return;
       }
 
-    }, true);
-
-  this.reverted([ 'properties-panel.update-businessobject', 'element.updateProperties' ],
-    HIGH_PRIORITY, function({ context }) {
-      const {
-        element,
-        deleteRetryCycleOldExtElements: oldExtensionElements
-      } = context;
-
-      const businessObject = getBusinessObject(element);
+      const values = extensionElements.get('values').filter((element) => {
+        return !is(element, 'camunda:FailedJobRetryTimeCycle');
+      });
 
-      // Only intercept the revert, if the behavior became active
-      if (oldExtensionElements) {
-        const extensionElements = businessObject.extensionElements;
+      modeling.updateModdleProperties(element, extensionElements, { values });
+    }, true);
 
-        extensionElements.values = oldExtensionElements;
-      }
-    });
+  }
 }
 
-
 DeleteRetryTimeCycleBehavior.$inject = [
-  'eventBus'
+  'eventBus',
+  'modeling'
 ];
 
-inherits(DeleteRetryTimeCycleBehavior, CommandInterceptor);
 
+// helpers //////////
 
-// helper //////////////////
-
-/**
- * Returns true if the attribute 'camunda:asyncBefore' is set
- * to true.
- *
- * @param  {ModdleElement} bo
- *
- * @return {boolean} a boolean value
- */
-function isAsyncBefore(bo) {
-  return !!(bo.get('camunda:asyncBefore') || bo.get('camunda:async'));
+function isAsyncBefore(businessObject) {
+  return !!(businessObject.get('camunda:asyncBefore') || businessObject.get('camunda:async'));
 }
 
-/**
- * Returns true if the attribute 'camunda:asyncAfter' is set
- * to true.
- *
- * @param  {ModdleElement} bo
- *
- * @return {boolean} a boolean value
- */
-function isAsyncAfter(bo) {
-  return !!bo.get('camunda:asyncAfter');
+function isAsyncAfter(businessObject) {
+  return !!businessObject.get('camunda:asyncAfter');
 }
 
 function getTimerEventDefinition(element) {
   return getEventDefinition(element, 'bpmn:TimerEventDefinition');
 }
 
-function getEventDefinition(element, eventType) {
+function getEventDefinition(element, type) {
   const businessObject = getBusinessObject(element);
 
   const eventDefinitions = businessObject.get('eventDefinitions') || [];
 
-  return find(eventDefinitions, function(definition) {
-    return is(definition, eventType);
+  return eventDefinitions.find((eventDefinition) => {
+    return is(eventDefinition, type);
   });
 }

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

@@ -1,5 +1,3 @@
-import inherits from 'inherits';
-
 import {
   getBusinessObject,
   is
@@ -7,22 +5,23 @@ import {
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
-const HIGH_PRIORITY = 15000;
+const HIGH_PRIORITY = 5000;
 
 
 /**
- * Camunda BPMN specific `camunda:exclusive` behavior.
- *
- * When `camunda:asyncAfter` or `camunda:asyncBefore` are set to false
- * on an element, then `camunda:exclusive` shall be set to true. This ensures
- * that the BPMN diagram XML reflects the behavior of Camunda Platform engine.
+ * Camunda BPMN specific camunda:exclusive behavior.
  */
-export default function UpdateCamundaExclusiveBehavior(eventBus) {
-
-  CommandInterceptor.call(this, eventBus);
-
-  this.preExecute([ 'properties-panel.update-businessobject', 'element.updateProperties' ],
-    HIGH_PRIORITY, function(context) {
+export default class UpdateCamundaExclusiveBehavior extends CommandInterceptor {
+  constructor(eventBus) {
+    super(eventBus);
+
+    /**
+     * Set camunda:exclusive to true on camunda:asyncBefore or camunda:asyncAfter set to false.
+     */
+    this.preExecute([
+      'element.updateProperties',
+      'properties-panel.update-businessobject'
+    ], HIGH_PRIORITY, function(context) {
       const {
         element,
         properties
@@ -30,70 +29,37 @@ export default function UpdateCamundaExclusiveBehavior(eventBus) {
 
       const businessObject = getBusinessObject(element);
 
-      // (1.1) Execute if...
-      if (is(element, 'camunda:AsyncCapable') && // ...asyncCapable
-          properties && // ...properties updated
-          (properties['camunda:asyncBefore'] === false || // ...update async before or (1)
-            properties['camunda:asyncAfter'] === false) && // ...update async after (2)
-          !isExclusive(businessObject) // ...is currently not exclusive
+      if (!is(element, 'camunda:AsyncCapable')
+        || (properties[ 'camunda:asyncBefore' ] !== false && properties[ 'camunda:asyncAfter' ] !== false)
+        || isExclusive(businessObject)
+        || (isAsyncAfter(businessObject) && properties[ 'camunda:asyncAfter' ] !== false)
+        || (isAsyncBefore(businessObject) && properties[ 'camunda:asyncBefore' ] !== false)
+        || (properties[ 'camunda:asyncBefore' ] === true || properties[ 'camunda:asyncAfter' ] === true)
       ) {
-
-        // (1.2) ...but don't execute if...
-        if ((isAsyncAfter(businessObject) && properties['camunda:asyncAfter'] !== false) || // ...asyncAfter will stay
-            (isAsyncBefore(businessObject) && properties['camunda:asyncBefore'] !== false) || // ...asyncBefore will stay
-            (properties['camunda:asyncBefore'] || properties['camunda:asyncAfter']) // one is set to true
-        ) {
-          return;
-        }
-
-        // (2) Update the context
-        properties['camunda:exclusive'] = true;
+        return;
       }
+
+      properties[ 'camunda:exclusive' ] = true;
     }, true);
-}
 
+  }
+}
 
 UpdateCamundaExclusiveBehavior.$inject = [
   'eventBus'
 ];
 
-inherits(UpdateCamundaExclusiveBehavior, CommandInterceptor);
-
 
-// helper //////////////////
+// helpers //////////
 
-/**
- * Returns true if the attribute 'camunda:asyncBefore' is set
- * to true.
- *
- * @param  {ModdleElement} bo
- *
- * @return {boolean} a boolean value
- */
-function isAsyncBefore(bo) {
-  return !!(bo.get('camunda:asyncBefore') || bo.get('camunda:async'));
+function isAsyncBefore(businessObject) {
+  return !!(businessObject.get('camunda:asyncBefore') || businessObject.get('camunda:async'));
 }
 
-/**
- * Returns true if the attribute 'camunda:asyncAfter' is set
- * to true.
- *
- * @param  {ModdleElement} bo
- *
- * @return {boolean} a boolean value
- */
-function isAsyncAfter(bo) {
-  return !!bo.get('camunda:asyncAfter');
+function isAsyncAfter(businessObject) {
+  return !!businessObject.get('camunda:asyncAfter');
 }
 
-/**
-* Returns true if the attribute 'camunda:exclusive' is set
-* to true.
-*
-* @param  {ModdleElement} bo
-*
-* @return {boolean} a boolean value
-*/
-function isExclusive(bo) {
-  return !!bo.get('camunda:exclusive');
+function isExclusive(businessObject) {
+  return !!businessObject.get('camunda:exclusive');
 }

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

@@ -1,88 +1,54 @@
-import inherits from 'inherits';
+import { getBusinessObject } from 'bpmn-js/lib/util/ModelUtil';
 
 import {
-  getBusinessObject,
-  is
-} from 'bpmn-js/lib/util/ModelUtil';
+  getInputOutput,
+  isInputOutputEmpty
+} from '../../../helper/InputOutputHelper';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
 /**
- * Camunda BPMN specific `camunda:inputOutput` behavior.
+ * Camunda BPMN specific camunda:InputOutput behavior.
  */
-export default function UpdateInputOutputBehavior(eventBus, modeling) {
-
-  CommandInterceptor.call(this, eventBus);
-
-  this.postExecute([
-    'element.updateProperties',
-    'element.updateModdleProperties',
-    'properties-panel.update-businessobject-list'
-  ], function(context) {
-    const {
-      element,
-      oldProperties,
-      propertyName
-    } = context;
-
-    const businessObject = getBusinessObject(element);
-    const inputOutput = getInputOutput(businessObject);
-    const extensionElements = businessObject.get('extensionElements');
-
-    // do not apply if inputOutput got recently added
-    if (!oldProperties && propertyName === 'values') {
-      return;
-    }
-
-    // remove camunda:inputOutput if there are no input/output parameters anymore
-    if (inputOutput && isEmpty(inputOutput)) {
-      const filtered = extensionElements.values.filter(function(element) {
-        return element !== inputOutput;
-      });
-
-      modeling.updateModdleProperties(element, extensionElements, {
-        values: filtered
-      });
-    }
-  }, true);
+export default class UpdateInputOutputBehavior extends CommandInterceptor {
+  constructor(eventBus, modeling) {
+    super(eventBus);
+
+    /**
+     * Remove empty camunda:InputOutput on update.
+     */
+    this.postExecute([
+      'element.updateProperties',
+      'element.updateModdleProperties',
+      'properties-panel.update-businessobject-list'
+    ], function(context) {
+      const {
+        element,
+        oldProperties,
+        propertyName
+      } = context;
+
+      const businessObject = getBusinessObject(element),
+            inputOutput = getInputOutput(businessObject),
+            extensionElements = businessObject.get('extensionElements');
+
+      // do not remove newly added camunda:InputOutput
+      if (!oldProperties && propertyName === 'values') {
+        return;
+      }
+
+      if (inputOutput && isInputOutputEmpty(inputOutput)) {
+        const values = extensionElements.get('values').filter(function(element) {
+          return element !== inputOutput;
+        });
+
+        modeling.updateModdleProperties(element, extensionElements, { values });
+      }
+    }, true);
+  }
 }
 
-
 UpdateInputOutputBehavior.$inject = [
   'eventBus',
   'modeling'
-];
-
-inherits(UpdateInputOutputBehavior, CommandInterceptor);
-
-
-// helper //////////////////
-
-function getInputParameters(inputOutput) {
-  return inputOutput.get('inputParameters');
-}
-
-function getOutputParameters(inputOutput) {
-  return inputOutput.get('outputParameters');
-}
-
-function getInputOutput(businessObject) {
-  const extensionElements = businessObject.get('extensionElements');
-
-  if (!extensionElements) {
-    return;
-  }
-
-  const values = extensionElements.get('values');
-
-  return values.find((value) => {
-    return is(value, 'camunda:InputOutput');
-  });
-}
-
-function isEmpty(inputOutput) {
-  const inputParameters = getInputParameters(inputOutput);
-  const outputParameters = getOutputParameters(inputOutput);
-
-  return inputParameters.length === 0 && outputParameters.length === 0;
-}
+];

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

@@ -1,12 +1,6 @@
-import inherits from 'inherits';
+import { is } from 'bpmn-js/lib/util/ModelUtil';
 
-import {
-  is
-} from 'bpmn-js/lib/util/ModelUtil';
-
-import {
-  has
-} from 'min-dash';
+import { has } from 'min-dash';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
@@ -14,41 +8,42 @@ const HIGH_PRIORITY = 5000;
 
 
 /**
- * Camunda BPMN specific `camunda:resultVariable` behavior.
- *
- * When `camunda:resultVariable` is removed from a service task like element
- * `camunda:mapDecisionResult` for the element will be cleaned up.
+ * Camunda BPMN specific camunda:resultVariable behavior.
  */
-export default function UpdateResultVariableBehavior(eventBus) {
-
-  CommandInterceptor.call(this, eventBus);
-
-  this.preExecute([ 'properties-panel.update-businessobject', 'element.updateProperties' ],
-    HIGH_PRIORITY, function(context) {
+export default class UpdateResultVariableBehavior extends CommandInterceptor {
+  constructor(eventBus) {
+    super(eventBus);
+
+    /**
+     * Remove camunda:mapDecisionResult on camunda:resultVariable removed.
+     */
+    this.preExecute([
+      'element.updateProperties',
+      'properties-panel.update-businessobject'
+    ], HIGH_PRIORITY, function(context) {
       const {
         element,
         properties
       } = context;
 
       if (
-        is(element, 'camunda:DmnCapable') &&
-        has(properties, 'camunda:resultVariable') &&
-        isEmpty(properties['camunda:resultVariable'])
+        is(element, 'camunda:DmnCapable')
+        && has(properties, 'camunda:resultVariable')
+        && isEmpty(properties[ 'camunda:resultVariable' ])
       ) {
-        properties['camunda:mapDecisionResult'] = null;
+        properties[ 'camunda:mapDecisionResult' ] = null;
       }
     }, true);
-}
 
+  }
+}
 
 UpdateResultVariableBehavior.$inject = [
   'eventBus'
 ];
 
-inherits(UpdateResultVariableBehavior, CommandInterceptor);
-
 
-// helper //////////////////
+// helpers //////////
 
 function isEmpty(value) {
   return value == undefined || value === '';

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

@@ -1,18 +1,24 @@
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
-import { isUndefined } from 'min-dash';
+import {
+  has,
+  isUndefined
+} from 'min-dash';
 
 
 /**
- * Camunda BPMN specific user task forms behavior ensuring that only one of the following options is configured:
- *
- * 1. embedded, external or Camunda forms using camunda:formKey
- * 2. Camunda forms using camunda:formRef
+ * Camunda BPMN specific user task forms behavior.
  */
 export default class UserTaskFormsBehavior extends CommandInterceptor {
   constructor(eventBus) {
     super(eventBus);
 
+    /**
+     * Ensure that only one of the following options is configured:
+     *
+     * 1. embedded, external or Camunda forms using camunda:formKey
+     * 2. Camunda forms using camunda:formRef
+     */
     this.preExecute([
       'element.updateProperties',
       'element.updateModdleProperties',
@@ -26,13 +32,13 @@ export default class UserTaskFormsBehavior extends CommandInterceptor {
         context.element.businessObject
       );
 
-      if ('camunda:formKey' in properties) {
+      if (has(properties, 'camunda:formKey')) {
         Object.assign(properties, {
           'camunda:formRef': undefined,
           'camunda:formRefBinding': undefined,
           'camunda:formRefVersion': undefined
         });
-      } else if ('camunda:formRef' in properties) {
+      } else if (has(properties, 'camunda:formRef')) {
         Object.assign(properties, {
           'camunda:formKey': undefined
         });
@@ -44,21 +50,21 @@ export default class UserTaskFormsBehavior extends CommandInterceptor {
           });
         }
 
-        if (!('camunda:formRefBinding' in properties) && isUndefined(businessObject.get('camunda:formRefBinding'))) {
+        if (!has(properties, 'camunda:formRefBinding') && isUndefined(businessObject.get('camunda:formRefBinding'))) {
           Object.assign(properties, {
             'camunda:formRefBinding': 'latest'
           });
         }
       }
 
-      if ('camunda:formRefBinding' in properties && properties[ 'camunda:formRefBinding' ] !== 'version') {
+      if (has(properties, 'camunda:formRefBinding') && properties[ 'camunda:formRefBinding' ] !== 'version') {
         Object.assign(properties, {
           'camunda:formRefVersion': undefined
         });
       }
     }, true);
+
   }
 }
 
-
 UserTaskFormsBehavior.$inject = [ 'eventBus' ];

package/lib/camunda-platform/helper/InputOutputHelper.js

@@ -0,0 +1,29 @@
+import { is } from 'bpmn-js/lib/util/ModelUtil';
+
+
+export function getInputOutput(businessObject) {
+  const extensionElements = businessObject.get('extensionElements');
+
+  if (!extensionElements) {
+    return;
+  }
+
+  return extensionElements.get('values').find((value) => {
+    return is(value, 'camunda:InputOutput');
+  });
+}
+
+export function getInputParameters(inputOutput) {
+  return inputOutput.get('inputParameters');
+}
+
+export function getOutputParameters(inputOutput) {
+  return inputOutput.get('outputParameters');
+}
+
+export function isInputOutputEmpty(inputOutput) {
+  const inputParameters = getInputParameters(inputOutput);
+  const outputParameters = getOutputParameters(inputOutput);
+
+  return !inputParameters.length && !outputParameters.length;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camunda-bpmn-js",
-  "version": "0.11.5",
+  "version": "0.13.0-alpha.0",
   "description": "Embeddable Camunda modeling distributions based on bpmn-js",
   "main": "lib/index.js",
   "scripts": {
@@ -40,10 +40,11 @@
   "license": "MIT",
   "dependencies": {
     "@bpmn-io/align-to-origin": "^0.7.0",
-    "bpmn-js": "^8.8.2",
+    "@bpmn-io/properties-panel": "~0.10.0",
+    "bpmn-js": "^8.8.3",
     "bpmn-js-disable-collapsed-subprocess": "^0.1.3",
     "bpmn-js-executable-fix": "^0.1.3",
-    "bpmn-js-properties-panel": "^0.46.0",
+    "bpmn-js-properties-panel": "~1.0.0-alpha.0",
     "bpmn-js-signavio-compat": "^1.2.3",
     "camunda-bpmn-moddle": "^6.1.1",
     "diagram-js": "^7.5.0",
@@ -51,7 +52,7 @@
     "diagram-js-origin": "^1.3.2",
     "inherits": "^2.0.4",
     "min-dash": "^3.7.0",
-    "zeebe-bpmn-moddle": "^0.8.0"
+    "zeebe-bpmn-moddle": "^0.10.0"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.1.0",
@@ -75,7 +76,7 @@
     "karma-sinon-chai": "^2.0.2",
     "karma-webpack": "^5.0.0",
     "min-dom": "^3.1.3",
-    "mocha": "^8.2.1",
+    "mocha": "^9.1.3",
     "mocha-test-container-support": "^0.2.0",
     "npm-run-all": "^4.1.5",
     "puppeteer": "^8.0.0",

package/styles/base-modeler.css

@@ -1,4 +1,4 @@
 @import './diagram-js.css';
 @import './bpmn-font/css/bpmn-embedded.css';
 @import './diagram-js-minimap.css';
-@import './bpmn-js-properties-panel.css';
+@import './properties-panel.css';

package/styles/camunda-platform-modeler.css

@@ -1 +1,2 @@
-@import './base-modeler.css';
+@import './base-modeler.css';
+@import './element-templates.css';