mm2fqE?Il)
z{kr|IkT6Vuz;9O#G(?ik5nzF&5$4H~#kAJa-f5;LjX{3!VC0cWk3DwPvF*h=w6&og6-S`SBFm~)P@{iOL%k;;>a!+
z7^O`uTR!eEQ_Fh+V4Y-Uh!f;_pEC|ww2k>gsP{z%E
z2a8!<+|+M>+NGQJ8m!}3?9~ci`t+u{r(>H$wUVe1{lmZJIl^IGO<+lg9ZBE}pp1|;
zw;<1ktkDx741B*;hDII?aTemI9S!4sdR!0#k0^vurymPN>7U;AZ#M(~Gk*Oa=C<0U
z-{3h<@k8DN2GO@3e1alB-2P&qXejMqe!Zx`-qZDR!otExW;_aEcbnYlUrHHO7*TuB
zLYVTW7{xVaEMCFph560SEJJD$%3dr?yHsW2%Xx^yVx$}1KY*Z+AIYkZqR|0R)`|=v
zaO&#xJO8=_ob(Dh>z7ye4
zs}7U%6=K9hmK@4l$M%`_DvMqT-7SMvbZ&nQL0^W3U`7CB+(4jd(pbP3B&C6^l=`#W
z5pq{3A?s-z_C(?sh`etrdkZ@NljO^W?&eyMk6=B=;!MxJm$0?qj-V;p*FSC6C&C3q
zK8u<=)IUAoQN_G4-su3#8cZEQ*&hni_I(S>1VZps6J?$5Aq9m|EHf;{h9G9QMu4~D
z3V6@_wQcEta7Pe3z(7GpbD)T=z?oBkg!WS4!41ccfBjacV<{l6@{^z|j}1H+DhC@R
z7d|`^QV2N!;MP|OyC1NVk*Q%6$6B4q!_9Ql;gWnR8+i2BuF4f;KS(pk
z&(R+W8|r&46Tg~?#Hvyu%h#!|j1M68u>RR0i;`PD?N}Kk_)3gZ?)UD1j*Mg7M49Ja
zpz>(Fg%s%_AR;)M5P(lT0m}Aog4G-LfIK_qrY~UwGCXgcF&RA0dVEn9_
zvIaCfz!uh7KJ?;w+h<)+?W;&IxmRhLOj&nhMyvy{B_Nw44TR#%oZpc=6SisC2^6*i
zg#57YkiPS$=z(4m+y(Yq*uZX_8OlZuusO7ZUf@eKqNG$H14b|c?tJpbr!3h}340;Y
zxbpz6tr!lRg27-3@VEcAV@KL*rH_c5JnQPsP|^RYVD#ZI?XeEmfhL;waSSMC4t7f4BYqztD02e&7C|6aR~s8vehZoNN(rxISJbw?tI*wn7YA00zk0
z36*~3=$eQC`pT0+kD9S~3-m1lp^Iql1-k-Mt?)WWj&*;aqWv>E4c^hPb(#wP=lzWT
z6K|?0HP)jyfST^LF`k=G`qx6zaAIs%J)rTCq5Lq_$
zCK>kT2(0}-mH&C+=KreqjLeX?v}y^|lm}RtjO*
z`83nhS%3CzB??NMH5xi`I15riAnT4)u234hO*Idkm8rqYZt;b8s6tc6cK>e-lf^-`
Y@6NGOBj*Xi+iNJSw*DWa-)-;y2ThO&d;kCd
From 38a81e195bb4054dc98f4dc36c1ddd562102d87f Mon Sep 17 00:00:00 2001
From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com>
Date: Wed, 23 Oct 2024 08:38:20 +0200
Subject: [PATCH 5/6] integration tests: update model-complete-semantic.bpmn +
add new tests
---
test/fixtures/bpmn/model-complete-semantic.bpmn | 9 +++++++++
test/integration/mxGraph.model.bpmn.elements.test.ts | 11 +++++++++++
2 files changed, 20 insertions(+)
diff --git a/test/fixtures/bpmn/model-complete-semantic.bpmn b/test/fixtures/bpmn/model-complete-semantic.bpmn
index 552b96d3a7..1f41297177 100644
--- a/test/fixtures/bpmn/model-complete-semantic.bpmn
+++ b/test/fixtures/bpmn/model-complete-semantic.bpmn
@@ -19,6 +19,10 @@
+
+
+
+
@@ -1933,6 +1937,9 @@
+
+
+
@@ -2001,6 +2008,8 @@
+
+
diff --git a/test/integration/mxGraph.model.bpmn.elements.test.ts b/test/integration/mxGraph.model.bpmn.elements.test.ts
index fb838a7a8e..4ccade0458 100644
--- a/test/integration/mxGraph.model.bpmn.elements.test.ts
+++ b/test/integration/mxGraph.model.bpmn.elements.test.ts
@@ -1437,6 +1437,13 @@ describe('mxGraph model - BPMN elements', () => {
align: 'left',
});
});
+ it('text annotations in collaboration', () => {
+ expect('text_annotation_in_collaboration_1').toBeTextAnnotation({
+ label: 'Text Annotation in collaboration',
+ parentId: getDefaultParentId(),
+ align: 'left',
+ });
+ });
it('groups', () => {
expect('Group_0_in_collaboration').toBeGroup({
@@ -1515,6 +1522,10 @@ describe('mxGraph model - BPMN elements', () => {
it('associations', () => {
expect('association_id').toBeAssociationFlow({ parentId: 'participant_1_id', verticalAlign: 'bottom' });
});
+
+ it('associations in collaboration', () => {
+ expect('association_in_collaboration_1').toBeAssociationFlow({ parentId: getDefaultParentId(), verticalAlign: 'bottom' });
+ });
});
it('Diagram with a not displayed pool (without shape) with elements', () => {
From 44e015674ac34f85b68b7d8cd706bbd1f6c5b81a Mon Sep 17 00:00:00 2001
From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:33:45 +0200
Subject: [PATCH 6/6] remove extra todo [skip ci]
---
src/component/parser/json/converter/utils.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/component/parser/json/converter/utils.ts b/src/component/parser/json/converter/utils.ts
index 7d02acd3e0..eb37dab1c8 100644
--- a/src/component/parser/json/converter/utils.ts
+++ b/src/component/parser/json/converter/utils.ts
@@ -136,7 +136,6 @@ interface CategoryValueData {
value?: string;
}
-// TODO review the name of the function: registerAssociationFlows?
export const convertAndRegisterAssociationFlows = (convertedElements: ConvertedElements, bpmnElements: TAssociation[] | TAssociation): void => {
for (const association of ensureIsArray(bpmnElements)) {
const direction = association.associationDirection as unknown as AssociationDirectionKind;