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

fix(paste): set correct parent on data associations 

Closes camunda/camunda-modeler#296
This commit is contained in:
Vladimirs Katusenoks 2016-05-20 12:40:15 +02:00
parent 8c32e2d238
commit 80d62b9873
3 changed files with 94 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/features/copy-paste/BpmnCopyPaste.js
View File

@ -86,28 +86,34 @@ function BpmnCopyPaste(bpmnFactory, eventBus, copyPaste, clipboard, moddle, canv
var descriptor = context.descriptor, var descriptor = context.descriptor,
createdElements = context.createdElements, createdElements = context.createdElements,
parent = descriptor.parent, parent = descriptor.parent,
businessObject, eventDefinitions, newEventDefinition, rootElement, rootElement = canvas.getRootElement(),
conditionExpression, loopCharacteristics, businessObject,
source, target, canConnect; eventDefinitions,
newEventDefinition,
conditionExpression,
loopCharacteristics,
source,
target,
canConnect;
if (descriptor.type === 'label') { if (descriptor.type === 'label') {
return; return;
} }
if (is(parent, 'bpmn:Process')) { if (is(parent, 'bpmn:Process')) {
rootElement = canvas.getRootElement();
descriptor.parent = is(rootElement, 'bpmn:Collaboration') ? rootElement : parent; descriptor.parent = is(rootElement, 'bpmn:Collaboration') ? rootElement : parent;
} }
if (descriptor.type === 'bpmn:DataOutputAssociation' ||
descriptor.type === 'bpmn:DataInputAssociation' ||
descriptor.type === 'bpmn:MessageFlow') {
descriptor.parent = rootElement;
}
if (is(parent, 'bpmn:Lane')) { if (is(parent, 'bpmn:Lane')) {
descriptor.parent = parent.parent; descriptor.parent = parent.parent;
} }
if (descriptor.type === 'bpmn:MessageFlow') {
descriptor.parent = canvas.getRootElement();
}
// make sure that the correct type of connection is created // make sure that the correct type of connection is created
if (descriptor.waypoints) { if (descriptor.waypoints) {
source = createdElements[descriptor.source]; source = createdElements[descriptor.source];

61
test/fixtures/bpmn/features/copy-paste/data-associations.bpmn vendored Normal file
View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="0.7.0-dev">
<bpmn:collaboration id="Collaboration_09rf7ug">
<bpmn:participant id="Participant_Output" processRef="Process_Output" />
<bpmn:participant id="Participant_Input" processRef="Process_Input" />
</bpmn:collaboration>
<bpmn:process id="Process_Output" isExecutable="false">
<bpmn:task id="Task_17elucr">
<bpmn:dataOutputAssociation id="DataOutputAssociation_0bncpb8">
<bpmn:targetRef>DataStoreReference_1muhdww</bpmn:targetRef>
</bpmn:dataOutputAssociation>
</bpmn:task>
<bpmn:dataStoreReference id="DataStoreReference_1muhdww" />
</bpmn:process>
<bpmn:process id="Process_Input" isExecutable="false">
<bpmn:dataStoreReference id="DataStoreReference_0q26vzn" />
<bpmn:task id="Task_10pzi8y">
<bpmn:property id="Property_0l7g57i" name="__targetRef_placeholder" />
<bpmn:dataInputAssociation id="DataInputAssociation_1sf5ecg">
<bpmn:sourceRef>DataStoreReference_0q26vzn</bpmn:sourceRef>
<bpmn:targetRef>Property_0l7g57i</bpmn:targetRef>
</bpmn:dataInputAssociation>
</bpmn:task>
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_09rf7ug">
<bpmndi:BPMNShape id="Participant_166hvof_di" bpmnElement="Participant_Output">
<dc:Bounds x="302" y="60" width="600" height="250" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_17elucr_di" bpmnElement="Task_17elucr">
<dc:Bounds x="416" y="100" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="DataStoreReference_1muhdww_di" bpmnElement="DataStoreReference_1muhdww">
<dc:Bounds x="746" y="216" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="726" y="266" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="DataOutputAssociation_0bncpb8_di" bpmnElement="DataOutputAssociation_0bncpb8">
<di:waypoint xsi:type="dc:Point" x="516" y="157" />
<di:waypoint xsi:type="dc:Point" x="746" y="233" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Participant_1duzt5k_di" bpmnElement="Participant_Input">
<dc:Bounds x="302" y="354" width="600" height="250" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="DataStoreReference_0q26vzn_di" bpmnElement="DataStoreReference_0q26vzn">
<dc:Bounds x="758" y="491" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="738" y="541" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_10pzi8y_di" bpmnElement="Task_10pzi8y">
<dc:Bounds x="426" y="375" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="DataInputAssociation_1sf5ecg_di" bpmnElement="DataInputAssociation_1sf5ecg">
<di:waypoint xsi:type="dc:Point" x="758" y="508" />
<di:waypoint xsi:type="dc:Point" x="526" y="431" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>

19
test/spec/features/copy-paste/BpmnCopyPasteSpec.js
View File

@ -22,7 +22,8 @@ describe('features/copy-paste', function() {
var basicXML = require('../../../fixtures/bpmn/features/copy-paste/basic.bpmn'), var basicXML = require('../../../fixtures/bpmn/features/copy-paste/basic.bpmn'),
collaborationXML = require('../../../fixtures/bpmn/features/copy-paste/collaboration.bpmn'), collaborationXML = require('../../../fixtures/bpmn/features/copy-paste/collaboration.bpmn'),
collaborationMultipleXML = require('../../../fixtures/bpmn/features/copy-paste/collaboration-multiple.bpmn'); collaborationMultipleXML = require('../../../fixtures/bpmn/features/copy-paste/collaboration-multiple.bpmn'),
collaborationAssociations = require('../../../fixtures/bpmn/features/copy-paste/data-associations.bpmn');
function integrationTest(ids) { function integrationTest(ids) {
@ -435,6 +436,22 @@ describe('features/copy-paste', function() {
}); });
describe('data associations', function() {
beforeEach(bootstrapModeler(collaborationAssociations, { modules: testModules }));
describe('integration', function() {
it('participant with OutputDataAssociation', inject(integrationTest([ 'Participant_Output' ])));
it('participant with InputDataAssociation', inject(integrationTest([ 'Participant_Input' ])));
});
});
}); });