camunda-bpmn-js 3.4.0 → 3.5.0

package/dist/camunda-cloud-modeler.development.js

@@ -51905,7 +51905,7 @@
 
     // during connect user might move mouse out of canvas
     // https://github.com/bpmn-io/bpmn-js/issues/1033
-    if (getRootElement$4(source) && !getRootElement$4(target)) {
+    if (getRootElement$3(source) && !getRootElement$3(target)) {
       return false;
     }
 
@@ -52017,7 +52017,7 @@
    *
    * @return {Element|null}
    */
-  function getRootElement$4(element) {
+  function getRootElement$3(element) {
     return getParent$1(element, 'bpmn:Process') || getParent$1(element, 'bpmn:Collaboration');
   }
 
@@ -110850,7 +110850,7 @@
 
 
   function getVariablesForElement(element, additionalExtractors = []) {
-    return getVariablesForScope$1(getScope$2(element), getRootElement$3(element), additionalExtractors);
+    return getVariablesForScope$1(getScope$2(element), getRootElement$2(element), additionalExtractors);
   }
 
   function getScope$2(element) {
@@ -110863,7 +110863,7 @@
     return bo.id;
   }
 
-  function getRootElement$3(element) {
+  function getRootElement$2(element) {
     const businessObject = getBusinessObject$1(element);
 
     if (is$4(businessObject, 'bpmn:Participant')) {
@@ -113555,16 +113555,16 @@
     });
   }
   function isMessageSupported$1(element) {
-    return is$6(element, 'bpmn:ReceiveTask') || isAny$1(element, ['bpmn:StartEvent', 'bpmn:EndEvent', 'bpmn:IntermediateThrowEvent', 'bpmn:BoundaryEvent', 'bpmn:IntermediateCatchEvent']) && !!getMessageEventDefinition$1(element);
+    return is$6(element, 'bpmn:ReceiveTask') || isAny$1(element, ['bpmn:StartEvent', 'bpmn:EndEvent', 'bpmn:IntermediateThrowEvent', 'bpmn:BoundaryEvent', 'bpmn:IntermediateCatchEvent']) && !!getMessageEventDefinition$2(element);
   }
-  function getMessageEventDefinition$1(element) {
+  function getMessageEventDefinition$2(element) {
     if (is$6(element, 'bpmn:ReceiveTask')) {
       return getBusinessObject$2(element);
     }
     return getEventDefinition$1(element, 'bpmn:MessageEventDefinition');
   }
   function getMessage$1(element) {
-    const messageEventDefinition = getMessageEventDefinition$1(element);
+    const messageEventDefinition = getMessageEventDefinition$2(element);
     return messageEventDefinition && messageEventDefinition.get('messageRef');
   }
   function getLinkEventDefinition(element) {
@@ -114595,7 +114595,7 @@
     const bpmnFactory = useService('bpmnFactory');
     const commandStack = useService('commandStack');
     const translate = useService('translate');
-    const messageEventDefinition = getMessageEventDefinition$1(element);
+    const messageEventDefinition = getMessageEventDefinition$2(element);
     const getValue = () => {
       const message = getMessage$1(element);
       if (message) {
@@ -116102,7 +116102,7 @@
   function isZeebeServiceTask(element) {
     if (!is$6(element, 'zeebe:ZeebeServiceTask')) return false;
     if (is$6(element, 'bpmn:EndEvent') || is$6(element, 'bpmn:IntermediateThrowEvent')) {
-      return !!getMessageEventDefinition$1(element);
+      return !!getMessageEventDefinition$2(element);
     }
 
     // BusinessRuleTask and ScriptTask are ServiceTasks only if they have a TaskDefinition
@@ -116113,10 +116113,10 @@
     return true;
   }
   function isMessageEndEvent(element) {
-    return is$6(element, 'bpmn:EndEvent') && !!getMessageEventDefinition$1(element);
+    return is$6(element, 'bpmn:EndEvent') && !!getMessageEventDefinition$2(element);
   }
   function isMessageThrowEvent(element) {
-    return is$6(element, 'bpmn:IntermediateThrowEvent') && !!getMessageEventDefinition$1(element);
+    return is$6(element, 'bpmn:IntermediateThrowEvent') && !!getMessageEventDefinition$2(element);
   }
 
   // helper ////////////////
@@ -116796,7 +116796,7 @@
       debounce
     });
   }
-  const USER_TASK_FORM_PREFIX$1 = 'userTaskForm_';
+  const USER_TASK_FORM_PREFIX = 'userTaskForm_';
   function FormHelper(bpmnFactory, commandStack) {
     function getFormDefinition(element) {
       const businessObject = getBusinessObject$2(element);
@@ -116944,7 +116944,7 @@
       return 'camunda-forms:bpmn:' + formId;
     }
     function createFormId() {
-      return nextId$1(USER_TASK_FORM_PREFIX$1);
+      return nextId$1(USER_TASK_FORM_PREFIX);
     }
     function resolveFormId(formKey) {
       return formKey.split(':')[2];
@@ -117729,7 +117729,7 @@
       }
 
       // (2) ensure subscription
-      let subscription = getSubscription(element);
+      let subscription = getSubscription$1(element);
       if (!subscription) {
         subscription = createElement$3('zeebe:Subscription', {}, extensionElements, bpmnFactory);
         commands.push({
@@ -117790,10 +117790,10 @@
     return false;
   }
   function getCorrelationKey(element) {
-    const subscription = getSubscription(element);
+    const subscription = getSubscription$1(element);
     return subscription ? subscription.get('correlationKey') : '';
   }
-  function getSubscription(element) {
+  function getSubscription$1(element) {
     const message = getMessage$1(element);
     const subscriptions = getSubscriptions(message);
     return subscriptions[0];
@@ -120527,6 +120527,83 @@
     return find$2(values, value => is$6(value, 'zeebe:IoMapping'));
   }
 
+  /**
+   * Zeebe BPMN behavior ensuring that zeebe:subscription is removed from bpmn:Message
+   * when it has no properties anymore.
+   */
+  class CleanUpSubscriptionBehavior extends CommandInterceptor$1 {
+    constructor(eventBus, commandStack) {
+      super(eventBus);
+
+      this.postExecuted([
+        'element.updateProperties',
+        'element.updateModdleProperties'
+      ], context => {
+        const element = context.shape || context.newShape || context.element;
+
+        if (element.labelTarget) {
+          return;
+        }
+
+        if (!is$6(element, 'bpmn:Event')) {
+          return;
+        }
+
+        const messageEventDefinition = getMessageEventDefinition$1(element);
+
+        if (!messageEventDefinition) {
+          return;
+        }
+
+        const message = messageEventDefinition.get('messageRef');
+
+        if (!message) {
+          return;
+        }
+
+        const subscription = getSubscription(message);
+
+        if (!subscription) {
+          return;
+        }
+
+        if (!hasNoProperties(subscription)) {
+          return;
+        }
+
+        removeExtensionElements(element, message, subscription, commandStack);
+      }, true);
+    }
+  }
+
+  CleanUpSubscriptionBehavior.$inject = [
+    'eventBus',
+    'commandStack'
+  ];
+
+
+  // helpers //////////
+
+  function getMessageEventDefinition$1(event) {
+    const businessObject = getBusinessObject$2(event);
+
+    return businessObject.get('eventDefinitions').find(eventDefinition => {
+      return is$6(eventDefinition, 'bpmn:MessageEventDefinition');
+    });
+  }
+
+  function getSubscription(message) {
+    return getExtensionElementsList$1(message, 'zeebe:Subscription')[ 0 ];
+  }
+
+  function hasNoProperties(element) {
+    const descriptor = element.$descriptor;
+
+    return descriptor.properties.every(property => {
+      return element.get(property.name) === undefined;
+    });
+  }
+
   function getTimerEventDefinition(element) {
     const businessObject = getBusinessObject$2(element);
 
@@ -121039,56 +121116,58 @@
     return ids.nextPrefixed(prefix);
   }
 
-  const USER_TASK_FORM_PREFIX = 'UserTaskForm_';
+  const FORM_KEY_PREFIX = 'camunda-forms:bpmn:',
+        USER_TASK_FORM_ID_PREFIX = 'UserTaskForm_';
+
+  function getFormDefinition(element) {
+    const businessObject = getBusinessObject$2(element);
 
+    const formDefinitions = getExtensionElementsList$1(businessObject, 'zeebe:FormDefinition');
 
-  function createFormDefinition(properties, extensionElements, bpmnFactory) {
-    return createElement$2(
-      'zeebe:FormDefinition',
-      properties,
-      extensionElements,
-      bpmnFactory
-    );
+    return formDefinitions[ 0 ];
   }
 
-  function createFormId() {
-    return getPrefixedId(USER_TASK_FORM_PREFIX);
-  }
+  function getUserTaskForm(element, options = {}) {
+    let {
+      formKey,
+      rootElement
+    } = options;
 
-  function createFormKey(formId) {
-    return `camunda-forms:bpmn:${ formId }`;
-  }
+    rootElement = rootElement || getRootElement$1(element);
 
-  function createUserTaskForm(properties, extensionElements, bpmnFactory) {
-    return createElement$2(
-      'zeebe:UserTaskForm',
-      properties,
-      extensionElements,
-      bpmnFactory
-    );
-  }
+    if (!formKey) {
+      const formDefinition = getFormDefinition(element);
 
-  function findUserTaskForm(formKey, rootElement) {
-    const userTaskForms = getExtensionElementsList$1(rootElement, 'zeebe:UserTaskForm');
+      if (!formDefinition) {
+        return;
+      }
+
+      formKey = formDefinition.get('formKey');
+    }
 
-    return find$2(userTaskForms, (userTaskForm) => {
-      const id = userTaskForm.get('zeebe:id');
+    const userTaskForms = getExtensionElementsList$1(rootElement, 'zeebe:UserTaskForm');
 
-      return createFormKey(id) === formKey;
+    return userTaskForms.find(userTaskForm => {
+      return userTaskFormIdToFormKey(userTaskForm.get('id')) === formKey;
     });
   }
 
-  function getFormDefinition(element) {
-    const businessObject = getBusinessObject$2(element);
+  function userTaskFormIdToFormKey(userTaskFormId) {
+    return `${ FORM_KEY_PREFIX }${ userTaskFormId }`;
+  }
 
-    const formDefinitions = getExtensionElementsList$1(businessObject, 'zeebe:FormDefinition');
+  function isUserTaskFormKey(formKey) {
+    return formKey && formKey.startsWith(FORM_KEY_PREFIX);
+  }
 
-    return formDefinitions[ 0 ];
+  function createUserTaskFormId() {
+    return getPrefixedId(USER_TASK_FORM_ID_PREFIX);
   }
 
-  function getRootElement$2(element) {
-    var businessObject = getBusinessObject$2(element),
-        parent = businessObject;
+  function getRootElement$1(element) {
+    const businessObject = getBusinessObject$2(element);
+
+    let parent = businessObject;
 
     while (parent.$parent && !is$6(parent, 'bpmn:Process')) {
       parent = parent.$parent;
@@ -121097,27 +121176,29 @@
     return parent;
   }
 
-  function getUserTaskForm(element, parent) {
-    const rootElement = parent || getRootElement$2(element);
-
-    const formDefinition = getFormDefinition(element);
-
-    if (!formDefinition) {
-      return;
-    }
-
-    const formKey = formDefinition.get('zeebe:formKey');
-
-    return findUserTaskForm(formKey, rootElement);
-  }
-
   /**
-   * Zeebe BPMN specific form definition behavior.
+   * Zeebe BPMN specific forms behavior.
    */
-  class FormDefinitionBehavior extends CommandInterceptor$1 {
+  class FormsBehavior extends CommandInterceptor$1 {
     constructor(bpmnFactory, eventBus, modeling) {
       super(eventBus);
 
+      function removeUserTaskForm(element, moddleElement, userTaskForm) {
+        const extensionElements = moddleElement.get('extensionElements');
+
+        const values = without(extensionElements.get('values'), userTaskForm);
+
+        modeling.updateModdleProperties(element, extensionElements, {
+          values
+        });
+
+        if (!values.length) {
+          modeling.updateModdleProperties(element, moddleElement, {
+            extensionElements: undefined
+          });
+        }
+      }
+
       /**
        * Remove zeebe:UserTaskForm on user task removed.
        */
@@ -121129,19 +121210,13 @@
 
         const rootElement = getRootElement$1(oldParent);
 
-        const userTaskForm = getUserTaskForm(shape, rootElement);
+        const userTaskForm = getUserTaskForm(shape, { rootElement });
 
         if (!is$6(shape, 'bpmn:UserTask') || !userTaskForm) {
           return;
         }
 
-        const rootExtensionElements = rootElement.get('extensionElements');
-
-        const values = rootExtensionElements.get('values').filter((element) => {
-          return element !== userTaskForm;
-        });
-
-        modeling.updateModdleProperties(shape, rootExtensionElements, { values });
+        removeUserTaskForm(shape, rootElement, userTaskForm);
       }, true);
 
 
@@ -121180,9 +121255,11 @@
         });
 
         // (3) create new form definition
-        const formId = createFormId();
+        const userTaskFormId = createUserTaskFormId();
 
-        const newFormDefinition = createFormDefinition({ formKey: createFormKey(formId) }, extensionElements, bpmnFactory);
+        const newFormDefinition = createElement$2('zeebe:FormDefinition', {
+          formKey: userTaskFormIdToFormKey(userTaskFormId)
+        }, extensionElements, bpmnFactory);
 
         values = [
           ...values,
@@ -121194,8 +121271,8 @@
         });
 
         // (4) create new user task form
-        const userTaskForm = createUserTaskForm({
-          id: formId,
+        const userTaskForm = createElement$2('zeebe:UserTaskForm', {
+          id: userTaskFormId,
           body: oldUserTaskForm ? oldUserTaskForm.get('body') : ''
         }, rootExtensionElements, bpmnFactory);
 
@@ -121207,27 +121284,88 @@
         });
       }, true);
 
+
+      /**
+       * Ensure that a user task only has one of the following:
+       *
+       * 1. zeebe:FormDefinition with zeebe:formId (linked Camunda form)
+       * 2. zeebe:FormDefinition with zeebe:formKey in the format of camunda-forms:bpmn:UserTaskForm_1 (embedded Camunda form)
+       * 3. zeebe:FormDefinition with zeebe:formKey (custom form)
+       */
+      this.preExecute('element.updateModdleProperties', function(context) {
+        const {
+          moddleElement,
+          properties
+        } = context;
+
+        if (is$6(moddleElement, 'zeebe:FormDefinition')) {
+          if ('formId' in properties) {
+            properties.formKey = undefined;
+          } else if ('formKey' in properties) {
+            properties.formId = undefined;
+          }
+        }
+      }, true);
+
+      /**
+       * Clean up user task form after form key or definition is removed. Clean up
+       * empty extension elements after form definition is removed.
+       */
+      this.postExecute('element.updateModdleProperties', function(context) {
+        const {
+          element,
+          moddleElement,
+          oldProperties
+        } = context;
+
+        if (is$6(moddleElement, 'zeebe:FormDefinition')) {
+          const formKey = moddleElement.get('formKey');
+
+          if (!formKey || !isUserTaskFormKey(formKey)) {
+            const userTaskForm = getUserTaskForm(element, { formKey: oldProperties.formKey });
+
+            if (userTaskForm) {
+              removeUserTaskForm(element, getRootElement$1(element), userTaskForm);
+            }
+          }
+        } else if (isExtensionElementRemoved(context, 'zeebe:FormDefinition')) {
+          const formDefinition = oldProperties.values.find(value => is$6(value, 'zeebe:FormDefinition'));
+
+          const userTaskForm = getUserTaskForm(element, { formKey: formDefinition.get('formKey') });
+
+          if (userTaskForm) {
+            removeUserTaskForm(element, getRootElement$1(element), userTaskForm);
+          }
+
+          if (!moddleElement.get('values').length) {
+            modeling.updateProperties(element, {
+              extensionElements: undefined
+            });
+          }
+        }
+      }, true);
+
     }
   }
 
-  FormDefinitionBehavior.$inject = [
+  FormsBehavior.$inject = [
     'bpmnFactory',
     'eventBus',
     'modeling'
   ];
 
+  function isExtensionElementRemoved(context, type) {
+    const {
+      moddleElement,
+      oldProperties,
+      properties
+    } = context;
 
-  // helpers //////////////
-
-  function getRootElement$1(element) {
-    var businessObject = getBusinessObject$2(element),
-        parent = businessObject;
-
-    while (parent.$parent && !is$6(parent, 'bpmn:Process')) {
-      parent = parent.$parent;
-    }
-
-    return parent;
+    return is$6(moddleElement, 'bpmn:ExtensionElements')
+      && 'values' in oldProperties
+      && 'values' in properties
+      && oldProperties.values.find(value => is$6(value, type))
+      && !properties.values.find(value => is$6(value, type));
   }
 
   const HIGH_PRIORITY$5 = 5000;
@@ -121434,22 +121572,24 @@
     __init__: [
       'cleanUpBusinessRuleTaskBehavior',
       'cleanUpEndEventBehavior',
+      'cleanUpSubscriptionBehavior',
       'cleanUpTimerExpressionBehavior',
       'copyPasteBehavior',
       'createZeebeCallActivityBehavior',
       'deleteParticipantBehaviour',
-      'formDefinitionBehavior',
+      'formsBehavior',
       'removeAssignmentDefinitionBehavior',
       'removeTaskScheduleBehavior',
       'updatePropagateAllChildVariablesBehavior'
     ],
     cleanUpBusinessRuleTaskBehavior: [ 'type', CleanUpBusinessRuleTaskBehavior ],
     cleanUpEndEventBehavior: [ 'type', CleanUpEndEventBehavior ],
+    cleanUpSubscriptionBehavior: [ 'type', CleanUpSubscriptionBehavior ],
     cleanUpTimerExpressionBehavior: [ 'type', CleanUpTimerExpressionBehavior ],
     copyPasteBehavior: [ 'type', ZeebeModdleExtension ],
     createZeebeCallActivityBehavior: [ 'type', CreateZeebeCallActivityBehavior ],
     deleteParticipantBehaviour: [ 'type', DeleteParticipantBehaviour ],
-    formDefinitionBehavior: [ 'type', FormDefinitionBehavior ],
+    formsBehavior: [ 'type', FormsBehavior ],
     removeAssignmentDefinitionBehavior: [ 'type', RemoveAssignmentDefinitionBehavior ],
     removeTaskScheduleBehavior: [ 'type', RemoveTaskScheduleBehavior ],
     updatePropagateAllChildVariablesBehavior: [ 'type', UpdatePropagateAllChildVariablesBehavior ]