Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: disable NameProps on DataAssociations #566

Merged
merged 1 commit into from
Feb 7, 2022
Merged

fix: disable NameProps on DataAssociations #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/provider/bpmn/properties/NameProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function NameProps(props) {
element
} = props;

if (is(element, 'bpmn:Collaboration')) {
if (is(element, 'bpmn:Collaboration') || is(element, 'bpmn:DataAssociation')) {
return [];
}

Expand Down
21 changes: 17 additions & 4 deletions test/spec/provider/bpmn/NameProps.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="Process_1" isExecutable="false">
<bpmn:startEvent id="StartEvent_1" name="start" />
<bpmn:startEvent id="StartEvent_1" name="start">
<bpmn:dataOutputAssociation id="DataOutputAssociation_1">
<bpmn:targetRef>DataObjectReference_0rfd651</bpmn:targetRef>
</bpmn:dataOutputAssociation>
</bpmn:startEvent>
<bpmn:task id="Task_1" name="task" />
<bpmn:dataObjectReference id="DataObjectReference_0rfd651" dataObjectRef="DataObject_1dekmmy" />
<bpmn:dataObject id="DataObject_1dekmmy" />
<bpmn:textAnnotation id="TextAnnotation_1">
<bpmn:text>text for name</bpmn:text>
</bpmn:textAnnotation>
Expand All @@ -27,19 +33,26 @@
<bpmndi:BPMNShape id="TextAnnotation_11kvt4v_di" bpmnElement="TextAnnotation_1">
<dc:Bounds x="592" y="120" width="100" height="38" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="DataObjectReference_0rfd651_di" bpmnElement="DataObjectReference_0rfd651">
<dc:Bounds x="262" y="75" width="36" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="DataOutputAssociation_1_di" bpmnElement="DataOutputAssociation_1">
<di:waypoint x="269" y="235" />
<di:waypoint x="278" y="125" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Group_di" bpmnElement="Group_1">
<dc:Bounds x="196" y="313" width="188" height="154" />
<bpmndi:BPMNLabel>
<dc:Bounds x="276" y="320" width="29" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Group_1nhcwbc_di" bpmnElement="Group_2">
<dc:Bounds x="496" y="323" width="188" height="154" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_10y192l_di" bpmnElement="Association_10y192l">
<di:waypoint x="514" y="222" />
<di:waypoint x="613" y="158" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Group_1nhcwbc_di" bpmnElement="Group_2">
<dc:Bounds x="496" y="323" width="188" height="154" />
</bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
20 changes: 20 additions & 0 deletions test/spec/provider/bpmn/NameProps.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,26 @@ describe('provider/bpmn - NameProps', function() {
debounceInput: false
}));

describe('bpmn:DataAssociation#name', function() {

it('should not display', inject(async function(elementRegistry, selection) {

// given
const dataAssociation = elementRegistry.get('DataOutputAssociation_1');

await act(() => {
selection.select(dataAssociation);
});

// when
const nameInput = domQuery('input[name=name]', container);

// then
expect(nameInput).to.be.null;
}));

});


describe('bpmn:StartEvent#name', function() {

Expand Down