[FEAT] Detect all Conditional events (#790)

docs/bpmn-support.adoc

@@ -168,6 +168,10 @@ The event definition can be defined on the event or on the definitions.
 |Signal Start Event
 |icon:check-circle-o[]
 |The stroke & icon width may be adjusted
+
+|Conditional Start Event
+|
+|
 |===
 
 
@@ -197,6 +201,10 @@ The event definition can be defined on the event or on the definitions.
 |Compensation Interrupting Start Event
 |icon:check-circle-o[]
 |The stroke & icon width may be adjusted
+
+|Conditional Interrupting Start Event
+|
+|
 |===
 
 
@@ -218,6 +226,10 @@ The event definition can be defined on the event or on the definitions.
 |Signal Non-interrupting Start Event
 |icon:check-circle-o[]
 |The stroke & icon width may be adjusted
+
+|Conditional Non-interrupting Start Event
+|
+|
 |===
 
 
@@ -243,6 +255,10 @@ The event definition can be defined on the event or on the definitions.
 |Link Intermediate Catch Event
 |icon:check-circle-o[]
 |The stroke & icon width may be adjusted
+
+|Conditional Intermediate Catch Event
+|
+|
 |===
 
 
@@ -305,6 +321,10 @@ The event definition can be defined on the event or on the definitions.
 |Cancel Interrupting Boundary Event
 |
 |
+
+|Conditional Interrupting Boundary Event
+|
+|
 |===
 
 
@@ -326,6 +346,10 @@ The event definition can be defined on the event or on the definitions.
 |Signal Non-interrupting Boundary Event
 |icon:check-circle-o[]
 |The stroke & icon width may be adjusted
+
+|Conditional Non-interrupting Boundary Event
+|
+|
 |===
 
 

src/component/mxgraph/shape/event-shapes.ts

@@ -77,6 +77,9 @@ abstract class EventShape extends mxEllipse {
     if (eventKind == ShapeBpmnEventKind.CANCEL) {
       c.setFillColor('deeppink');
       c.setFillAlpha(0.3);
+    } else if (eventKind == ShapeBpmnEventKind.CONDITIONAL) {
+      c.setFillColor('chartreuse');
+      c.setFillAlpha(0.3);
     }
   }
 

src/model/bpmn/internal/shape/ShapeBpmnEventKind.ts

@@ -55,4 +55,5 @@ export const supportedBpmnEventKinds = [
   ShapeBpmnEventKind.ERROR,
   ShapeBpmnEventKind.COMPENSATION,
   ShapeBpmnEventKind.CANCEL,
+  ShapeBpmnEventKind.CONDITIONAL,
 ];

test/e2e/mxGraph.model.test.ts

@@ -85,6 +85,16 @@ describe('mxGraph model', () => {
       label: 'Signal Start Event On Top',
       parentId: 'participant_1_id',
     });
+    expect('start_event_conditional_id').toBeStartEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      label: 'Conditional Start Event',
+      parentId: 'participant_1_id',
+    });
+    expect('start_event_conditional_on_top_id').toBeStartEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      label: 'Conditional Start Event On Top',
+      parentId: 'participant_1_id',
+    });
 
     // end event
     expect('end_event_terminate_id').toBeEndEvent({
@@ -232,12 +242,12 @@ describe('mxGraph model', () => {
     });
     expect('intermediate_catch_event_timer_id').toBeIntermediateCatchEvent({
       eventKind: ShapeBpmnEventKind.TIMER,
-      label: 'Timer Intermediate Catch Event',
+      label: 'Catch Timer Intermediate Event',
       parentId: 'participant_1_id',
     });
     expect('intermediate_catch_event_timer_on_top_id').toBeIntermediateCatchEvent({
       eventKind: ShapeBpmnEventKind.TIMER,
-      label: 'Timer Intermediate Catch Event On Top',
+      label: 'Catch Timer Intermediate Event On Top',
       parentId: 'participant_1_id',
     });
     expect('intermediate_catch_event_signal_id').toBeIntermediateCatchEvent({
@@ -260,6 +270,16 @@ describe('mxGraph model', () => {
       label: 'Catch Link Intermediate Event On Top',
       parentId: 'participant_1_id',
     });
+    expect('intermediate_catch_event_conditional_id').toBeIntermediateCatchEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      label: 'Catch Conditional Intermediate Event',
+      parentId: 'participant_1_id',
+    });
+    expect('intermediate_catch_event_conditional_on_top_id').toBeIntermediateCatchEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      label: 'Catch Conditional Intermediate Event On Top',
+      parentId: 'participant_1_id',
+    });
 
     // boundary event: interrupting
     expect('boundary_event_interrupting_message_id').toBeBoundaryEvent({
@@ -334,6 +354,18 @@ describe('mxGraph model', () => {
       label: 'Interrupting Cancel Boundary Intermediate Event On Top',
       parentId: 'receive_task_non_instantiating_id',
     });
+    expect('boundary_event_interrupting_conditional_id').toBeBoundaryEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      isInterrupting: true,
+      label: 'Interrupting Conditional Boundary Intermediate Event',
+      parentId: 'receive_task_instantiating_id',
+    });
+    expect('boundary_event_interrupting_conditional_on_top_id').toBeBoundaryEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      isInterrupting: true,
+      label: 'Interrupting Conditional Boundary Intermediate Event On Top',
+      parentId: 'receive_task_instantiating_id',
+    });
 
     // boundary event: non-interrupting
     expect('boundary_event_non_interrupting_message_id').toBeBoundaryEvent({
@@ -372,6 +404,18 @@ describe('mxGraph model', () => {
       label: 'Non-interrupting Signal Boundary Intermediate Event On Top',
       parentId: 'collapsed_call_activity_id',
     });
+    expect('boundary_event_non_interrupting_conditional_id').toBeBoundaryEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      isInterrupting: false,
+      label: 'Non-interrupting Conditional Boundary Intermediate Event',
+      parentId: 'collapsed_call_activity_with_loop_id',
+    });
+    expect('boundary_event_non_interrupting_conditional_on_top_id').toBeBoundaryEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      isInterrupting: false,
+      label: 'Non-interrupting Conditional Boundary Intermediate Event On Top',
+      parentId: 'collapsed_call_activity_with_loop_id',
+    });
 
     // Sub-process
     expect('expanded_embedded_sub_process_id').toBeSubProcess({
@@ -572,6 +616,18 @@ describe('mxGraph model', () => {
       parentId: 'expanded_event_sub_process_with_start_events_id',
       isInterrupting: true,
     });
+    expect('start_event_interrupting_conditional_id').toBeStartEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      label: 'Interrupting Conditional Start Event In Sub-Process',
+      parentId: 'expanded_event_sub_process_with_start_events_id',
+      isInterrupting: true,
+    });
+    expect('start_event_interrupting_conditional_on_top_id').toBeStartEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      label: 'Interrupting Conditional Start Event On Top In Sub-Process',
+      parentId: 'expanded_event_sub_process_with_start_events_id',
+      isInterrupting: true,
+    });
 
     // Non-interrupting Start Event
     expect('start_event_non_interrupting_message_id').toBeStartEvent({
@@ -610,6 +666,18 @@ describe('mxGraph model', () => {
       parentId: 'expanded_event_sub_process_with_start_events_id',
       isInterrupting: false,
     });
+    expect('start_event_non_interrupting_conditional_id').toBeStartEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      label: 'Non-interrupting Conditional Start Event In Sub-Process',
+      parentId: 'expanded_event_sub_process_with_start_events_id',
+      isInterrupting: false,
+    });
+    expect('start_event_non_interrupting_conditional_on_top_id').toBeStartEvent({
+      eventKind: ShapeBpmnEventKind.CONDITIONAL,
+      label: 'Non-interrupting Conditional Start Event On Top In Sub-Process',
+      parentId: 'expanded_event_sub_process_with_start_events_id',
+      isInterrupting: false,
+    });
 
     // Call Activity calling process
     // Expanded
@@ -931,10 +999,12 @@ describe('mxGraph model', () => {
     // boundary event: interrupting
     expect('boundary_event_interrupting_message_id').not.toBeCell();
     expect('boundary_event_interrupting_timer_id').not.toBeCell();
+    expect('boundary_event_interrupting_conditional_id').not.toBeCell();
 
     // boundary event: non-interrupting
     expect('boundary_event_non_interrupting_message_id').not.toBeCell();
     expect('boundary_event_non_interrupting_timer_id').not.toBeCell();
+    expect('boundary_event_non_interrupting_conditional_id').not.toBeCell();
   });
 
   it('bpmn element shape should have coordinates relative to the pool when no lane', async () => {

test/fixtures/bpmn/model-badly-attached-elements.bpmn

@@ -13,6 +13,12 @@
     <semantic:boundaryEvent attachedToRef="nothing" cancelActivity="false" name="Boundary Intermediate Event Non-nterrupting Timer" id="boundary_event_non_interrupting_timer_id">
       <semantic:timerEventDefinition/>
     </semantic:boundaryEvent>
+    <semantic:boundaryEvent attachedToRef="nothing" cancelActivity="true" name="Boundary Intermediate Event Interrupting Conditional" id="boundary_event_interrupting_conditional_id">
+      <semantic:conditionalEventDefinition/>
+    </semantic:boundaryEvent>
+    <semantic:boundaryEvent attachedToRef="nothing" cancelActivity="false" name="Boundary Intermediate Event Non-nterrupting Conditional" id="boundary_event_non_interrupting_conditional_id">
+      <semantic:conditionalEventDefinition/>
+    </semantic:boundaryEvent>
   </semantic:process>
   <bpmndi:BPMNDiagram documentation="" id="Trisotech_Visio-_6" name="A.1.0" resolution="96.00000267028808">
     <bpmndi:BPMNPlane bpmnElement="WFP-6-">