sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(import): handle data associations on boundary import 

Closes #1170
This commit is contained in:
Niklas Kiefer 2019-08-19 10:05:51 +02:00 committed by merge-me[bot]
parent f4826b6039
commit 5a7d579d3a
3 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/import/BpmnTreeWalker.js
View File

@ -356,10 +356,6 @@ export default function BpmnTreeWalker(handler, translate) {
visitIfDi(dataObject, context); visitIfDi(dataObject, context);
} }
function handleBoundaryEvent(dataObject, context) {
visitIfDi(dataObject, context);
}
function handleLane(lane, context) { function handleLane(lane, context) {
deferred.push(function() { deferred.push(function() {
@ -398,7 +394,7 @@ export default function BpmnTreeWalker(handler, translate) {
}); });
} else if (is(e, 'bpmn:BoundaryEvent')) { } else if (is(e, 'bpmn:BoundaryEvent')) {
deferred.unshift(function() { deferred.unshift(function() {
handleBoundaryEvent(e, context); handleFlowNode(e, context);
}); });
} else if (is(e, 'bpmn:FlowNode')) { } else if (is(e, 'bpmn:FlowNode')) {
handleFlowNode(e, context); handleFlowNode(e, context);

26
test/spec/import/elements/AssociationSpec.data-association.bpmn
View File

@ -13,28 +13,44 @@
<bpmn2:sourceRef>DataObjectReference_1</bpmn2:sourceRef> <bpmn2:sourceRef>DataObjectReference_1</bpmn2:sourceRef>
</bpmn2:dataInputAssociation> </bpmn2:dataInputAssociation>
</bpmn2:task> </bpmn2:task>
<bpmn2:task id="Task_3" />
<bpmn2:boundaryEvent id="BoundaryEvent" attachedToRef="Task_3">
<bpmn2:dataOutputAssociation id="DataOutputAssociation_2">
<bpmn2:targetRef>DataObjectReference_1</bpmn2:targetRef>
</bpmn2:dataOutputAssociation>
</bpmn2:boundaryEvent>
</bpmn2:process> </bpmn2:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
<bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="Task_1"> <bpmndi:BPMNShape id="_BPMNShape_Task_1" bpmnElement="Task_1">
<dc:Bounds height="80.0" width="100.0" x="122.0" y="145.0"/> <dc:Bounds height="80.0" width="100.0" x="122.0" y="145.0"/>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_Task_3" bpmnElement="Task_2"> <bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="Task_2">
<dc:Bounds height="80.0" width="100.0" x="504.0" y="145.0"/> <dc:Bounds height="80.0" width="100.0" x="504.0" y="145.0"/>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_DataObjectReference_2" bpmnElement="DataObjectReference_1"> <bpmndi:BPMNShape id="_BPMNShape_DataObjectReference_1" bpmnElement="DataObjectReference_1">
<dc:Bounds height="50.0" width="36.0" x="341.0" y="27.0"/> <dc:Bounds height="50.0" width="36.0" x="341.0" y="27.0"/>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation" bpmnElement="DataOutputAssociation" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_DataObjectReference_2"> <bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation" bpmnElement="DataOutputAssociation" sourceElement="_BPMNShape_Task_1" targetElement="_BPMNShape_DataObjectReference_1">
<di:waypoint xsi:type="dc:Point" x="172.0" y="145.0"/> <di:waypoint xsi:type="dc:Point" x="172.0" y="145.0"/>
<di:waypoint xsi:type="dc:Point" x="172.0" y="52.0"/> <di:waypoint xsi:type="dc:Point" x="172.0" y="52.0"/>
<di:waypoint xsi:type="dc:Point" x="341.0" y="52.0"/> <di:waypoint xsi:type="dc:Point" x="341.0" y="52.0"/>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_DataInputAssociation" bpmnElement="DataInputAssociation" sourceElement="_BPMNShape_DataObjectReference_2" targetElement="_BPMNShape_Task_3"> <bpmndi:BPMNEdge id="BPMNEdge_DataInputAssociation" bpmnElement="DataInputAssociation" sourceElement="_BPMNShape_DataObjectReference_1" targetElement="_BPMNShape_Task_2">
<di:waypoint xsi:type="dc:Point" x="377.0" y="52.0"/> <di:waypoint xsi:type="dc:Point" x="377.0" y="52.0"/>
<di:waypoint xsi:type="dc:Point" x="554.0" y="52.0"/> <di:waypoint xsi:type="dc:Point" x="554.0" y="52.0"/>
<di:waypoint xsi:type="dc:Point" x="554.0" y="145.0"/> <di:waypoint xsi:type="dc:Point" x="554.0" y="145.0"/>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_Task_3" bpmnElement="Task_3">
<dc:Bounds x="230" y="150" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent" bpmnElement="BoundaryEvent">
<dc:Bounds x="280" y="132" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation_2" bpmnElement="DataOutputAssociation_2" sourceElement="_BPMNShape_BoundaryEvent" targetElement="_BPMNShape_DataObjectReference_1">
<di:waypoint xsi:type="dc:Point" x="302" y="132" />
<di:waypoint xsi:type="dc:Point" x="350" y="76" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane> </bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram> </bpmndi:BPMNDiagram>
</bpmn2:definitions> </bpmn2:definitions>

18
test/spec/import/elements/AssociationSpec.js
View File

@ -145,6 +145,24 @@ describe('import - associations', function() {
}); });
}); });
it('boundary event -> data object', function(done) {
var xml = require('./AssociationSpec.data-association.bpmn');
// given
bootstrapViewer(xml)(function(err) {
// then
expectRendered([
'DataOutputAssociation_2'
]);
done(err);
});
});
}); });
}); });