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

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

@@ -1,58 +1,21 @@
-import {
-  getExtensionElements
-} from 'bpmn-js-properties-panel/lib/helper/ExtensionElementsHelper';
+import { getExtensionElements } from './ExtensionElementsHelper';
 
-import elementHelper from 'bpmn-js-properties-panel/lib/helper/ElementHelper';
+import { createElement } from './ElementHelper';
 
 import {
   getBusinessObject,
   is
 } from 'bpmn-js/lib/util/ModelUtil';
 
-import {
-  nextId
-} from 'bpmn-js-properties-panel/lib/Utils';
-
-import {
-  find
-} from 'min-dash';
-
-const USER_TASK_FORM_PREFIX = 'userTaskForm_';
-
-
-export function getUserTaskForm(element, parent) {
+import { nextId } from './Utils';
 
-  const rootElement = parent || getRootElement(element);
-
-  // (1) get form definition from user task
-  const formDefinition = getFormDefinition(element);
-
-  if (!formDefinition) {
-    return;
-  }
+import { find } from 'min-dash';
 
-  const formKey = formDefinition.get('formKey');
+const USER_TASK_FORM_PREFIX = 'UserTaskForm_';
 
-  // (2) retrieve user task form via form key
-  const userTaskForm = findUserTaskForm(formKey, rootElement);
-
-  return userTaskForm;
-}
-
-export function getFormDefinition(element) {
-  const businessObject = getBusinessObject(element);
-
-  const formDefinitions = getExtensionElements(businessObject, 'zeebe:FormDefinition');
-
-  return formDefinitions[0];
-}
-
-export function createFormKey(formId) {
-  return 'camunda-forms:bpmn:' + formId;
-}
 
 export function createFormDefinition(properties, extensionElements, bpmnFactory) {
-  return elementHelper.createElement(
+  return createElement(
     'zeebe:FormDefinition',
     properties,
     extensionElements,
@@ -60,8 +23,16 @@ export function createFormDefinition(properties, extensionElements, bpmnFactory)
   );
 }
 
+export function createFormId() {
+  return nextId(USER_TASK_FORM_PREFIX);
+}
+
+export function createFormKey(formId) {
+  return `camunda-forms:bpmn:${ formId }`;
+}
+
 export function createUserTaskForm(properties, extensionElements, bpmnFactory) {
-  return elementHelper.createElement(
+  return createElement(
     'zeebe:UserTaskForm',
     properties,
     extensionElements,
@@ -69,19 +40,22 @@ export function createUserTaskForm(properties, extensionElements, bpmnFactory) {
   );
 }
 
-export function createFormId() {
-  return nextId(USER_TASK_FORM_PREFIX);
-}
+function findUserTaskForm(formKey, rootElement) {
+  const userTaskForms = getExtensionElements(rootElement, 'zeebe:UserTaskForm');
 
+  return find(userTaskForms, function(userTaskForm) {
+    const id = userTaskForm.get('zeebe:id');
 
-// helpers /////////////////////
+    return createFormKey(id) === formKey;
+  });
+}
 
-function findUserTaskForm(formKey, rootElement) {
-  const forms = getExtensionElements(rootElement, 'zeebe:UserTaskForm');
+export function getFormDefinition(element) {
+  const businessObject = getBusinessObject(element);
 
-  return find(forms, function(userTaskForm) {
-    return createFormKey(userTaskForm.id) === formKey;
-  });
+  const formDefinitions = getExtensionElements(businessObject, 'zeebe:FormDefinition');
+
+  return formDefinitions[ 0 ];
 }
 
 function getRootElement(element) {
@@ -93,4 +67,18 @@ function getRootElement(element) {
   }
 
   return parent;
+}
+
+export function getUserTaskForm(element, parent) {
+  const rootElement = parent || getRootElement(element);
+
+  const formDefinition = getFormDefinition(element);
+
+  if (!formDefinition) {
+    return;
+  }
+
+  const formKey = formDefinition.get('zeebe:formKey');
+
+  return findUserTaskForm(formKey, rootElement);
 }

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

@@ -1,156 +1,138 @@
 import {
-  getBusinessObject
+  getBusinessObject,
+  is
 } from 'bpmn-js/lib/util/ModelUtil';
 
-import {
-  isAny
-} from 'bpmn-js/lib/features/modeling/util/ModelingUtil';
+import { isAny } from 'bpmn-js/lib/features/modeling/util/ModelingUtil';
 
-import {
-  isZeebeServiceTask
-} from './ZeebeServiceTaskHelper';
+import { createElement } from './ElementHelper';
 
-import extensionElementsHelper from 'bpmn-js-properties-panel/lib/helper/ExtensionElementsHelper';
+import { isZeebeServiceTask } from './ZeebeServiceTaskHelper';
 
-import elementHelper from 'bpmn-js-properties-panel/lib/helper/ElementHelper';
 
+/**
+ * Get zeebe:IoMapping from an element.
+ *
+ * @param {djs.model.Base|ModdleElement} element
+ *
+ * @return {ModdleElement}
+ */
+export function getIoMapping(element) {
+  const businessObject = getBusinessObject(element);
 
-function getElements(bo, type, prop) {
-  const elems = extensionElementsHelper.getExtensionElements(bo, type);
-  return !prop ? elems : (elems[0] || {})[prop] || [];
-}
+  const extensionElements = businessObject.get('extensionElements');
 
-function getParameters(element, prop) {
-  const inputOutput = getInputOutput(element);
-  return (inputOutput && inputOutput.get(prop)) || [];
-}
+  if (!extensionElements) {
+    return;
+  }
 
-/**
-   * Get a inputOutput from the business object
-   *
-   * @param {djs.model.Base} element
-   *
-   * @return {ModdleElement} the inputOutput object
-   */
-export function getInputOutput(element) {
-  const bo = getBusinessObject(element);
-  return (getElements(bo, 'zeebe:IoMapping') || [])[0];
+  return extensionElements.get('values').find((value) => {
+    return is(value, 'zeebe:IoMapping');
+  });
 }
 
-
 /**
-   * Return all input parameters existing in the business object, and
-   * an empty array if none exist.
-   *
-   * @param  {djs.model.Base} element
-   *
-   * @return {Array} a list of input parameter objects
-   */
+ * Get zeebe:InputParameters from an element.
+ *
+ * @param  {djs.model.Base|ModdleElement} element
+ *
+ * @return {Array<ModdleElement>}
+ */
 export function getInputParameters(element) {
-  return getParameters.apply(this, [ element, 'inputParameters' ]);
+  const ioMapping = getIoMapping(element);
+
+  if (ioMapping) {
+    return ioMapping.get('zeebe:inputParameters');
+  }
+
+  return [];
 }
 
 /**
-   * Return all output parameters existing in the business object, and
-   * an empty array if none exist.
-   *
-   * @param  {djs.model.Base} element
-   *
-   * @return {Array} a list of output parameter objects
-   */
+ * Get zeebe:OutputParameters from an element.
+ *
+ * @param  {djs.model.Base|ModdleElement} element
+ *
+ * @return {Array<ModdleElement>}
+ */
 export function getOutputParameters(element) {
-  return getParameters.apply(this, [ element, 'outputParameters' ]);
+  const ioMapping = getIoMapping(element);
+
+  if (ioMapping) {
+    return ioMapping.get('zeebe:outputParameters');
+  }
+
+  return [];
 }
 
 /**
-   * Get a input parameter from the business object at given index
-   *
-   * @param {djs.model.Base} element
-   * @param {number} idx
-   *
-   * @return {ModdleElement} input parameter
-   */
-export function getInputParameter(element, idx) {
-  return getInputParameters(element)[idx];
+ * Get zeebe:Input at index.
+ *
+ * @param {djs.model.Base|ModdleElement} element
+ * @param {number} index
+ *
+ * @return {ModdleElement}
+ */
+export function getInputParameter(element, index) {
+  return getInputParameters(element)[ index ];
 }
 
 /**
-   * Get a output parameter from the business object at given index
-   *
-   * @param {djs.model.Base} element
-   * @param {number} idx
-   *
-   * @return {ModdleElement} output parameter
-   */
-export function getOutputParameter(element, idx) {
-  return getOutputParameters(element)[idx];
+ * Get zeebe:Output at index.
+ *
+ * @param {djs.model.Base|ModdleElement} element
+ * @param {number} index
+ *
+ * @return {ModdleElement}
+ */
+export function getOutputParameter(element, index) {
+  return getOutputParameters(element)[ index ];
 }
 
 /**
-   * Returns 'true' if the given element supports inputOutput
-   *
-   * @param {djs.model.Base} element
-   *
-   * @return {boolean} a boolean value
-   */
+ * Check whether element supports zeebe:Input or zeebe:Output.
+ *
+ * @param {djs.model.Base|ModdleElement} element
+ *
+ * @return {boolean}
+ */
 export function isInputOutputSupported(element) {
-  return areOutputParametersSupported(element) || areInputParametersSupported(element);
+  return areInputParametersSupported(element) || areOutputParametersSupported(element);
 }
 
 /**
-   * Returns 'true' if the given element supports input parameters
-   *
-   * @param {djs.model.Base} element
-   *
-   * @return {boolean} a boolean value
-   */
+ * Check whether element supports zeebe:Input.
+ *
+ * @param {djs.model.Base|ModdleElement} element
+ *
+ * @return {boolean}
+ */
 export function areInputParametersSupported(element) {
   return isAny(element, [
-    'bpmn:UserTask',
+    'bpmn:CallActivity',
     'bpmn:SubProcess',
-    'bpmn:CallActivity'
+    'bpmn:UserTask'
   ]) || isZeebeServiceTask(element);
 }
 
 /**
-   * Returns 'true' if the given element supports output parameters
-   *
-   * @param {djs.model.Base} element
-   *
-   * @return {boolean} a boolean value
-   */
+ * Check whether element supports zeebe:Output.
+ *
+ * @param {djs.model.Base|ModdleElement} element
+ *
+ * @return {boolean}
+ */
 export function areOutputParametersSupported(element) {
   return isAny(element, [
-    'zeebe:ZeebeServiceTask',
-    'bpmn:UserTask',
-    'bpmn:SubProcess',
-    'bpmn:ReceiveTask',
     'bpmn:CallActivity',
-    'bpmn:Event'
+    'bpmn:Event',
+    'bpmn:ReceiveTask',
+    'bpmn:SubProcess',
+    'bpmn:UserTask',
+    'zeebe:ZeebeServiceTask'
   ]);
 }
 
-export function createElement(type, parent, factory, properties) {
-  return elementHelper.createElement(type, properties, parent, factory);
-}
-
-export function createIOMapping(parent, bpmnFactory, properties) {
-  return createElement('zeebe:IoMapping', parent, bpmnFactory, properties);
-}
-
-/**
- * Get getter function for IOMapping parameters according to provided property name
- *
- * @param {string} property
- *
- * @returns {Function} Getter function for the IOMapping parameters according to provided property name
- */
-export function determineParamGetFunc(property) {
-  if (property == 'inputParameters') {
-    return getInputParameters;
-  }
-
-  if (property == 'outputParameters') {
-    return getOutputParameters;
-  }
+export function createIoMapping(parent, bpmnFactory, properties) {
+  return createElement('zeebe:IoMapping', properties, parent, bpmnFactory);
 }

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

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

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

@@ -1,24 +1,41 @@
 import {
+  getBusinessObject,
   is
 } from 'bpmn-js/lib/util/ModelUtil';
 
-import eventDefinitionHelper from 'bpmn-js-properties-panel/lib/helper/EventDefinitionHelper';
+import { forEach } from 'min-dash';
 
 
 export function isZeebeServiceTask(element) {
   if (!is(element, 'zeebe:ZeebeServiceTask')) return false;
 
   if (is(element, 'bpmn:EndEvent') || is(element, 'bpmn:IntermediateThrowEvent')) {
-    return !!eventDefinitionHelper.getMessageEventDefinition(element);
+    return !!getMessageEventDefinition(element);
   }
 
   return true;
 }
 
 export function isMessageEndEvent(element) {
-  return is(element, 'bpmn:EndEvent') && !!eventDefinitionHelper.getMessageEventDefinition(element);
+  return is(element, 'bpmn:EndEvent') && !!getMessageEventDefinition(element);
 }
 
 export function isMessageThrowEvent(element) {
-  return is(element, 'bpmn:IntermediateThrowEvent') && !!eventDefinitionHelper.getMessageEventDefinition(element);
-}
+  return is(element, 'bpmn:IntermediateThrowEvent') && !!getMessageEventDefinition(element);
+}
+
+function getMessageEventDefinition(element) {
+
+  var bo = getBusinessObject(element),
+      eventDefinition = null;
+
+  if (bo.eventDefinitions) {
+    forEach(bo.eventDefinitions, function(event) {
+      if (is(event, 'bpmn:MessageEventDefinition')) {
+        eventDefinition = event;
+      }
+    });
+  }
+
+  return eventDefinition;
+}

package/lib/camunda-platform/Modeler.js

@@ -4,12 +4,15 @@ import BaseModeler from '../base/Modeler';
 
 import modelingModule from './features/modeling';
 
-import propertiesProviderModule from 'bpmn-js-properties-panel/lib/provider/camunda';
-
 import camundaModdle from 'camunda-bpmn-moddle/resources/camunda.json';
 
 import camundaModdleExtension from 'camunda-bpmn-moddle/lib';
 
+import {
+  CamundaPlatformPropertiesProviderModule,
+  ElementTemplatesPropertiesProviderModule
+} from 'bpmn-js-properties-panel';
+
 
 /**
  *
@@ -33,7 +36,8 @@ inherits(Modeler, BaseModeler);
 Modeler.prototype._camundaPlatformModules = [
   camundaModdleExtension,
   modelingModule,
-  propertiesProviderModule
+  CamundaPlatformPropertiesProviderModule,
+  ElementTemplatesPropertiesProviderModule
 ];
 
 Modeler.prototype._modules = [].concat(

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

@@ -1,5 +1,3 @@
-import inherits from 'inherits';
-
 import {
   getBusinessObject,
   is
@@ -11,18 +9,19 @@ const HIGH_PRIORITY = 5000;
 
 
 /**
- * Camunda BPMN specific `camunda:errorEventDefinition` behavior.
- *
- * When `camunda:type` is set to something different than `external`
- * on an element, then `camunda:errorEventDefinition` extension elements
- * shall be removed.
+ * Camunda BPMN specific camunda:ErrorEventDefinition behavior.
  */
-export default function DeleteErrorEventDefinitionBehavior(eventBus) {
-
-  CommandInterceptor.call(this, eventBus);
-
-  this.executed([ 'properties-panel.update-businessobject', 'element.updateProperties' ],
-    HIGH_PRIORITY, function(context) {
+export default class DeleteErrorEventDefinitionBehavior extends CommandInterceptor {
+  constructor(eventBus, modeling) {
+    super(eventBus);
+
+    /**
+     * Remove camunda:ErrorEventDefinitions on camunda:type set to external.
+     */
+    this.postExecute([
+      'element.updateProperties',
+      'properties-panel.update-businessobject'
+    ], HIGH_PRIORITY, function(context) {
       const {
         element,
         oldProperties,
@@ -30,52 +29,30 @@ export default function DeleteErrorEventDefinitionBehavior(eventBus) {
       } = context;
 
       const businessObject = getBusinessObject(element),
-            extensionElements = businessObject.extensionElements;
+            extensionElements = businessObject.get('extensionElements');
 
-      // (1) Check whether behavior is suitable
-      if (
-        is(element, 'camunda:ExternalCapable') &&
-        extensionElements &&
-        externalTypeChanged(oldProperties, properties)
-      ) {
+      if (is(element, 'camunda:ExternalCapable')
+        && extensionElements
+        && externalTypeChanged(oldProperties, properties)) {
 
-        // (2) Delete camunda:ErrorEventDefinition elements and save them for revert
-        context.deletedErrorEventDefinitions = extensionElements.values;
+        const values = extensionElements.get('values').filter((element) => {
+          return !is(element, 'camunda:ErrorEventDefinition');
+        });
 
-        extensionElements.values = extensionElements.values.filter(
-          element => !is(element, 'camunda:ErrorEventDefinition')
-        );
+        modeling.updateModdleProperties(element, extensionElements, { values });
       }
-
     }, true);
 
-  this.reverted([ 'properties-panel.update-businessobject', 'element.updateProperties' ],
-    HIGH_PRIORITY, function({ context }) {
-      const {
-        element,
-        deletedErrorEventDefinitions: oldExtensionElements
-      } = context;
-
-      const businessObject = getBusinessObject(element);
-
-      // Only intercept the revert, if the behavior became active
-      if (oldExtensionElements) {
-        const extensionElements = businessObject.extensionElements;
-
-        extensionElements.values = oldExtensionElements;
-      }
-    });
+  }
 }
 
-
 DeleteErrorEventDefinitionBehavior.$inject = [
-  'eventBus'
+  'eventBus',
+  'modeling'
 ];
 
-inherits(DeleteErrorEventDefinitionBehavior, CommandInterceptor);
-
 
-// helper //////////////////
+// helpers //////////
 
 function externalTypeChanged(oldProperties, updatesProperties) {
   const {