fix: show variableEvents for conditional intermediate catch events

Author: jarekdanielak

src/provider/zeebe/properties/EventConditionProps.js

@@ -44,22 +44,7 @@ export function EventConditionProps(props) {
     return [];
   }
 
-  // `variableEvents` are not applicable for root-level events
-  if (!is(element.parent, 'bpmn:SubProcess')) {
-    return [
-      {
-        id: 'condition',
-        component: Condition,
-        isEdited: isFeelEntryEdited
-      },
-      {
-        id: 'variableNames',
-        component: VariableNames,
-      },
-    ];
-  }
-
-  return [
+  const entries = [
     {
       id: 'condition',
       component: Condition,
@@ -69,11 +54,16 @@ export function EventConditionProps(props) {
       id: 'variableNames',
       component: VariableNames,
     },
-    {
+  ];
+
+  if (is(element.parent, 'bpmn:SubProcess') || is(element, 'bpmn:IntermediateCatchEvent')) {
+    entries.push({
       id: 'variableEvents',
       component: VariableEvents,
-    }
-  ];
+    });
+  }
+
+  return entries;
 }
 
 /**

test/spec/provider/zeebe/EventConditionProps.bpmn

@@ -16,14 +16,13 @@
         <bpmn:condition xsi:type="bpmn:tFormalExpression">=foo &lt; bar</bpmn:condition>
       </bpmn:conditionalEventDefinition>
     </bpmn:startEvent>
-    <bpmn:startEvent id="Event_3">
-      <bpmn:conditionalEventDefinition id="ConditionalEventDefinition_16we37r">
-      </bpmn:conditionalEventDefinition>
-    </bpmn:startEvent>
+    <bpmn:intermediateCatchEvent id="Event_3">
+      <bpmn:conditionalEventDefinition id="ConditionalEventDefinition_02j8kp2" />
+    </bpmn:intermediateCatchEvent>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1dd1gi1">
-      <bpmndi:BPMNShape id="BPMNShape_04nb8mn" bpmnElement="Event_3">
+      <bpmndi:BPMNShape id="Event_1dwo39y_di" bpmnElement="Event_3">
         <dc:Bounds x="152" y="232" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1q8hsrq_di" bpmnElement="Activity_01gjpl1" isExpanded="true">

test/spec/provider/zeebe/EventConditionProps.spec.js

@@ -214,7 +214,7 @@ describe('provider/zeebe - EventConditionProps', function() {
 
   describe('zeebe:ConditionalFilter#variableEvents', function() {
 
-    it('should display', inject(async function(elementRegistry, selection) {
+    it('should display inside subprocess', inject(async function(elementRegistry, selection) {
 
       // given
       const element = elementRegistry.get('Event_2');
@@ -233,7 +233,26 @@ describe('provider/zeebe - EventConditionProps', function() {
     }));
 
 
-    it('should not display on root level', inject(async function(elementRegistry, selection) {
+    it('should display for intermediate catch event', inject(async function(elementRegistry, selection) {
+
+      // given
+      const element = elementRegistry.get('Event_3');
+
+      // when
+      await act(() => {
+        selection.select(element);
+      });
+
+      const createCheckbox = domQuery('input[name=variableEvents-create]', container);
+      const updateCheckbox = domQuery('input[name=variableEvents-update]', container);
+
+      // then
+      expect(createCheckbox).to.exist;
+      expect(updateCheckbox).to.exist;
+    }));
+
+
+    it('should not display on process start event', inject(async function(elementRegistry, selection) {
 
       // given
       const element = elementRegistry.get('Event_1');