feat: add more data in the internal model for the link events by csouchet · Pull Request #2924 · process-analytics/bpmn-visualization-js

csouchet · 2023-10-12T15:11:29Z

Add sourceIds & targetId properties in the internal model for the link events.

ℹ️ In the BPMN specification, the link event definition can refer to another link event definition as either a source or a target.

Since the user of the library doesn't have this information, we internally calculate the ID of the event associated with this other link event definition to set as either source or target in ShapeBpmnSemantic.

Covers #2855

github-actions · 2023-10-12T15:12:49Z

♻️ PR Preview 5c42362 has been successfully destroyed since this PR has been closed.

_{🤖 By surge-preview}

github-actions · 2023-10-12T15:12:58Z

♻️ PR Preview 5c42362 has been successfully destroyed since this PR has been closed.

_{🤖 By surge-preview}

csouchet · 2023-10-12T15:15:36Z

+    ['event with eventDefinitionRef attribute', EventDefinitionOn.DEFINITIONS],
+    ['event with eventDefinition object', EventDefinitionOn.EVENT],
+  ] as [string, EventDefinitionOn][])(`%s`, (titleSuffix: string, eventDefinitionOn: EventDefinitionOn) => {
+    it(`should convert with one source and one target, ${titleSuffix}`, () => {


On definitions

{ "definitions": { "targetNamespace": "", "collaboration": { "id": "collaboration_id_0" }, "process": { "id": "0", "intermediateThrowEvent": { "id": "source_id", "eventDefinitionRef": "link_source_id" }, "intermediateCatchEvent": { "id": "target_id", "eventDefinitionRef": "link_target_id" } }, "BPMNDiagram": { "name": "process 0", "BPMNPlane": { "BPMNShape": [ { "id": "shape_source_id", "bpmnElement": "source_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } }, { "id": "shape_target_id", "bpmnElement": "target_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } } ] } }, "linkEventDefinition": [ { "id": "link_source_id", "target": "link_target_id" }, { "id": "link_target_id", "source": "link_source_id" } ] } }

On event

{ "definitions": { "targetNamespace": "", "collaboration": { "id": "collaboration_id_0" }, "process": { "id": "0", "intermediateThrowEvent": { "id": "source_id", "linkEventDefinition": { "id": "link_source_id", "target": "link_target_id" } }, "intermediateCatchEvent": { "id": "target_id", "linkEventDefinition": { "id": "link_target_id", "source": "link_source_id" } } }, "BPMNDiagram": { "name": "process 0", "BPMNPlane": { "BPMNShape": [ { "id": "shape_source_id", "bpmnElement": "source_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } }, { "id": "shape_target_id", "bpmnElement": "target_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } } ] } } } }

csouchet · 2023-10-12T15:16:57Z

+      });
+    });
+
+    it(`should convert with several sources, ${titleSuffix}`, () => {


On definitions

{ "definitions": { "targetNamespace": "", "collaboration": { "id": "collaboration_id_0" }, "process": { "id": "0", "intermediateThrowEvent": [ { "id": "source_1_id", "eventDefinitionRef": "link_source_1_id" }, { "id": "source_2_id", "eventDefinitionRef": "link_source_2_id" } ], "intermediateCatchEvent": { "id": "target_id", "eventDefinitionRef": "link_target_id" } }, "BPMNDiagram": { "name": "process 0", "BPMNPlane": { "BPMNShape": [ { "id": "shape_source_1_id", "bpmnElement": "source_1_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } }, { "id": "shape_source_2_id", "bpmnElement": "source_2_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } }, { "id": "shape_target_id", "bpmnElement": "target_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } } ] } }, "linkEventDefinition": [ { "id": "link_source_1_id", "target": "link_target_id" }, { "id": "link_source_2_id", "target": "link_target_id" }, { "id": "link_target_id", "source": [ "link_source_1_id", "link_source_2_id" ] } ] } }

On event

{ "definitions": { "targetNamespace": "", "collaboration": { "id": "collaboration_id_0" }, "process": { "id": "0", "intermediateThrowEvent": [ { "id": "source_1_id", "linkEventDefinition": { "id": "link_source_1_id", "target": "link_target_id" } }, { "id": "source_2_id", "linkEventDefinition": { "id": "link_source_2_id", "target": "link_target_id" } } ], "intermediateCatchEvent": { "id": "target_id", "linkEventDefinition": { "id": "link_target_id", "source": [ "link_source_1_id", "link_source_2_id" ] } } }, "BPMNDiagram": { "name": "process 0", "BPMNPlane": { "BPMNShape": [ { "id": "shape_source_1_id", "bpmnElement": "source_1_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } }, { "id": "shape_source_2_id", "bpmnElement": "source_2_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } }, { "id": "shape_target_id", "bpmnElement": "target_id", "Bounds": { "x": 362, "y": 232, "width": 36, "height": 45 } } ] } } } }

- ShapeBpmnIntermediateCatchEvent with 'sourceIds' property - ShapeBpmnIntermediateThrowEvent with 'targetId' property

sonarqubecloud · 2023-10-13T06:17:30Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

100.0% Coverage
0.0% Duplication

csouchet added enhancement New feature or request depends on another PR ⚠️ Pull request depending on another one. The depending must be merged first labels Oct 12, 2023

csouchet mentioned this pull request Oct 12, 2023

feat: add link event data in ShapeBpmnSemantic #2911

Merged

csouchet commented Oct 12, 2023

View reviewed changes

tbouffard changed the title ~~feat(internal model): add more data in the internal model for the link events~~ feat: add more data in the internal model for the link events Oct 12, 2023

tbouffard mentioned this pull request Oct 12, 2023

refactor: internally store more data of event definitions #2923

Merged

csouchet and others added 7 commits October 13, 2023 07:57

Introduce in internal model for events:

c0cd5bf

- ShapeBpmnIntermediateCatchEvent with 'sourceIds' property - ShapeBpmnIntermediateThrowEvent with 'targetId' property

add unit tests when parsing Link events with sourceIds & targetId

0160af9

convert sourceIds and targetId properties during Json parsing

684e415

simplify the storage of the event definitions

0ae7ca7

Update internal-model image

53297a5

Simplify ShapeUtil method (only return boolean)

7256178

Simplify ShapeUtil.isCatchEvent method (only return boolean)

5c42362

tbouffard force-pushed the 2855-add_sourceIds_&_targetId_properties_on_internal_model_for_Link_events branch from 55a6864 to 5c42362 Compare October 13, 2023 06:13

tbouffard removed the depends on another PR ⚠️ Pull request depending on another one. The depending must be merged first label Oct 13, 2023

tbouffard marked this pull request as ready for review October 13, 2023 06:21

tbouffard approved these changes Oct 13, 2023

View reviewed changes

tbouffard merged commit 85c8b20 into master Oct 13, 2023

tbouffard deleted the 2855-add_sourceIds_&_targetId_properties_on_internal_model_for_Link_events branch October 13, 2023 06:23

tbouffard added the BPMN diagram usability Something about the way we can interact with BPMN diagrams label Oct 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: add more data in the internal model for the link events#2924

feat: add more data in the internal model for the link events#2924
tbouffard merged 7 commits into
masterfrom
2855-add_sourceIds_&_targetId_properties_on_internal_model_for_Link_events

csouchet commented Oct 12, 2023 •

edited by tbouffard

Loading

Uh oh!

github-actions Bot commented Oct 12, 2023 •

edited

Loading

Uh oh!

github-actions Bot commented Oct 12, 2023 •

edited

Loading

Uh oh!

csouchet Oct 12, 2023 •

edited

Loading

Uh oh!

csouchet Oct 12, 2023 •

edited

Loading

Uh oh!

sonarqubecloud Bot commented Oct 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

csouchet commented Oct 12, 2023 • edited by tbouffard Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Oct 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Oct 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

csouchet Oct 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

On definitions

On event

Uh oh!

csouchet Oct 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

On definitions

On event

Uh oh!

sonarqubecloud Bot commented Oct 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

csouchet commented Oct 12, 2023 •

edited by tbouffard

Loading

github-actions Bot commented Oct 12, 2023 •

edited

Loading

github-actions Bot commented Oct 12, 2023 •

edited

Loading

csouchet Oct 12, 2023 •

edited

Loading

On `definitions`

On `event`

csouchet Oct 12, 2023 •

edited

Loading

On `definitions`

On `event`