sartography/bpmn-js
1
0
Fork 0
mirror of https://github.com/sartography/bpmn-js.git synced 2025-01-11 17:44:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(replace): add switch between DataStore and DataObject in replace menu

Browse Source 
Closes #1372
This commit is contained in:
Alexis Zeghers 2020-11-18 11:39:01 +01:00 committed by fake-join[bot]
parent d252ba2b9b
commit 1ccba5c5e6
8 changed files with 234 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/features/popup-menu/ReplaceMenuProvider.js
View File

@ -77,6 +77,14 @@ ReplaceMenuProvider.prototype.getEntries = function(element) {
var differentType = isDifferentType(element);
if (is(businessObject, 'bpmn:DataObjectReference')) {
return this._createEntries(element, replaceOptions.DATA_OBJECT_REFERENCE);
}
if (is(businessObject, 'bpmn:DataStoreReference')) {
return this._createEntries(element, replaceOptions.DATA_STORE_REFERENCE);
}
// start events outside sub processes
if (is(businessObject, 'bpmn:StartEvent') && !is(businessObject.$parent, 'bpmn:SubProcess')) {

16
lib/features/replace/BpmnReplace.js
View File

@ -84,6 +84,7 @@ export default function BpmnReplace(
moddleCopy,
modeling,
replace,
rules,
selection
) {
@ -221,6 +222,11 @@ export default function BpmnReplace(
newElement.height = elementFactory._getDefaultSize(newBusinessObject).height;
}
if (!rules.allowed('shape.resize', { shape: newBusinessObject })) {
newElement.height = elementFactory._getDefaultSize(newBusinessObject).height;
newElement.width = elementFactory._getDefaultSize(newBusinessObject).width;
}
newBusinessObject.name = oldBusinessObject.name;
// retain default flow's reference between inclusive <-> exclusive gateways and activities
@ -247,6 +253,15 @@ export default function BpmnReplace(
newElement.host = target.host;
}
// The DataStoreReference element is 14px wider than the DataObjectReference element
// This ensures that they stay centered on the x axis when replaced
if (
newElement.type === 'bpmn:DataStoreReference' ||
newElement.type === 'bpmn:DataObjectReference'
) {
newElement.x = element.x + (element.width - newElement.width) / 2;
}
newElement.di = {};
// fill and stroke will be set to DI
@ -273,6 +288,7 @@ BpmnReplace.$inject = [
'moddleCopy',
'modeling',
'replace',
'rules',
'selection'
];

22
lib/features/replace/ReplaceOptions.js
View File

@ -537,6 +537,28 @@ export var TASK = [
}
];
export var DATA_OBJECT_REFERENCE = [
{
label: 'Data Store Reference',
actionName: 'replace-with-data-store-reference',
className: 'bpmn-icon-data-store',
target: {
type: 'bpmn:DataStoreReference'
}
}
];
export var DATA_STORE_REFERENCE = [
{
label: 'Data Object Reference',
actionName: 'replace-with-data-object-reference',
className: 'bpmn-icon-data-object',
target: {
type: 'bpmn:DataObjectReference'
}
}
];
export var BOUNDARY_EVENT = [
{
label: 'Message Boundary Event',

2
lib/util/DiUtil.js
View File

@ -15,7 +15,7 @@ export function isExpanded(element) {
}
if (is(element, 'bpmn:SubProcess')) {
return !!getBusinessObject(element).di.isExpanded;
return getBusinessObject(element).di && !!getBusinessObject(element).di.isExpanded;
}
if (is(element, 'bpmn:Participant')) {

15
test/fixtures/bpmn/features/replace/data-object.bpmn → test/fixtures/bpmn/features/replace/data-elements.bpmn vendored
View File

@ -4,20 +4,19 @@
<bpmn:dataObjectReference id="DataObjectReference_1" dataObjectRef="DataObject" />
<bpmn:dataObject id="DataObject" />
<bpmn:dataObjectReference id="DataObjectReference_2" dataObjectRef="DataObject" />
<bpmn:dataStoreReference id="DataStoreReference_1" dataStoreRef="DataStore" />
<bpmn:dataStore id="DataStore" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process">
<bpmndi:BPMNShape id="DataObjectReference_1_di" bpmnElement="DataObjectReference_1">
<dc:Bounds x="201" y="184" width="36" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="174" y="234" width="90" height="20" />
</bpmndi:BPMNLabel>
<dc:Bounds x="200" y="200" width="36" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="DataObjectReference_2_di" bpmnElement="DataObjectReference_2">
<dc:Bounds x="301" y="184" width="36" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="274" y="234" width="90" height="20" />
</bpmndi:BPMNLabel>
<dc:Bounds x="300" y="200" width="36" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="DataStoreReference_1_di" bpmnElement="DataStoreReference_1">
<dc:Bounds x="400" y="200" width="50" height="50" />
</bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>

6
test/spec/features/context-pad/ContextPadProviderSpec.js
View File

@ -265,7 +265,7 @@ describe('features - context-pad', function() {
expectContextPadEntries('DataStoreReference', [
'connect',
'append.text-annotation',
'!replace',
'replace',
'!append.end-event'
]);
}));
@ -489,11 +489,11 @@ describe('features - context-pad', function() {
// given
var rootShape = canvas.getRootElement(),
dataStore = elementFactory.createShape({ type: 'bpmn:DataStoreReference' }),
group = elementFactory.createShape({ type: 'bpmn:Group' }),
replaceMenu;
// when
create.start(canvasEvent({ x: 0, y: 0 }), dataStore);
create.start(canvasEvent({ x: 0, y: 0 }), group);
dragging.move(canvasEvent({ x: 50, y: 50 }));
dragging.hover({ element: rootShape });

49
test/spec/features/popup-menu/ReplaceMenuProviderSpec.js
View File

@ -29,7 +29,7 @@ describe('features/popup-menu - replace menu provider', function() {
var diagramXMLMarkers = require('../../../fixtures/bpmn/draw/activity-markers-simple.bpmn'),
diagramXMLReplace = require('../../../fixtures/bpmn/features/replace/01_replace.bpmn'),
diagramXMLDataObject = require('../../../fixtures/bpmn/features/replace/data-object.bpmn');
diagramXMLDataElements = require('../../../fixtures/bpmn/features/replace/data-elements.bpmn');
var testModules = [
coreModule,
@ -50,9 +50,10 @@ describe('features/popup-menu - replace menu provider', function() {
});
};
describe('data object - collection marker', function() {
beforeEach(bootstrapModeler(diagramXMLDataObject, { modules: testModules }));
beforeEach(bootstrapModeler(diagramXMLDataElements, { modules: testModules }));
it('should toggle on', inject(function(elementRegistry) {
@ -1202,6 +1203,50 @@ describe('features/popup-menu - replace menu provider', function() {
});
describe('data object', function() {
beforeEach(bootstrapModeler(diagramXMLDataElements, { modules: testModules }));
it('should only contain data store reference', inject(function(elementRegistry) {
// given
var dataObjectReference = elementRegistry.get('DataObjectReference_1');
// when
openPopup(dataObjectReference);
// then
expect(queryEntries()).to.have.length(2);
expect(queryEntry('toggle-is-collection')).to.exist;
expect(queryEntry('replace-with-data-store-reference')).to.exist;
expect(queryEntry('replace-with-data-object-reference')).to.be.null;
}));
});
describe('data store', function() {
beforeEach(bootstrapModeler(diagramXMLDataElements, { modules: testModules }));
it('should only contain data object reference', inject(function(elementRegistry) {
// given
var dataStoreReference = elementRegistry.get('DataStoreReference_1');
// when
openPopup(dataStoreReference);
// then
expect(queryEntries()).to.have.length(1);
expect(queryEntry('toggle-is-collection')).to.be.null;
expect(queryEntry('replace-with-data-store-reference')).to.be.null;
expect(queryEntry('replace-with-data-object-reference')).to.exist;
}));
});
});

130
test/spec/features/replace/BpmnReplaceSpec.js
View File

@ -1648,6 +1648,136 @@ describe('features/replace - bpmn replace', function() {
});
describe('center', function() {
var diagramXML = require('../../../fixtures/bpmn/features/replace/data-elements.bpmn');
var testModules = [
modelingModule,
coreModule
];
beforeEach(bootstrapModeler(diagramXML, {
modules: testModules
}));
describe('data store reference to data object reference', function() {
it('should center on replace', inject(function(bpmnReplace, elementRegistry) {
// given
var dataStoreReference = elementRegistry.get('DataStoreReference_1');
var positionX = dataStoreReference.x;
// when
bpmnReplace.replaceElement(dataStoreReference, { type: 'bpmn:DataObjectReference' });
var dataObjectReference = elementRegistry.get('DataStoreReference_1');
var newPositionX = positionX + (dataStoreReference.width - dataObjectReference.width) / 2;
// then
expect(dataObjectReference.x).to.eql(newPositionX);
}));
it('should undo', inject(function(bpmnReplace, commandStack, elementRegistry) {
// given
var dataStoreReference = elementRegistry.get('DataStoreReference_1');
var positionX = dataStoreReference.x;
bpmnReplace.replaceElement(dataStoreReference, { type: 'bpmn:DataObjectReference' });
// when
commandStack.undo();
// then
expect(elementRegistry.get('DataStoreReference_1').x).to.eql(positionX);
}));
it('should redo', inject(function(bpmnReplace, commandStack, elementRegistry) {
// given
var dataStoreReference = elementRegistry.get('DataStoreReference_1');
var positionX = dataStoreReference.x;
bpmnReplace.replaceElement(dataStoreReference, { type: 'bpmn:DataObjectReference' });
commandStack.undo();
// when
commandStack.redo();
var dataObjectReference = elementRegistry.get('DataStoreReference_1');
var newPositionX = positionX + (dataStoreReference.width - dataObjectReference.width) / 2;
// then
expect(dataObjectReference.x).to.eql(newPositionX);
}));
});
describe('data object reference to data store reference', function() {
it('should center on replace', inject(function(bpmnReplace, elementRegistry) {
// given
var dataObjectReference = elementRegistry.get('DataObjectReference_1');
var positionX = dataObjectReference.x;
// when
bpmnReplace.replaceElement(dataObjectReference, { type: 'bpmn:DataStoreReference' });
var dataStoreReference = elementRegistry.get('DataObjectReference_1');
var newPositionX = positionX + (dataObjectReference.width - dataStoreReference.width) / 2;
// then
expect(dataStoreReference.x).to.eql(newPositionX);
}));
it('should undo', inject(function(bpmnReplace, commandStack, elementRegistry) {
// given
var dataObjectReference = elementRegistry.get('DataObjectReference_1');
var positionX = dataObjectReference.x;
bpmnReplace.replaceElement(dataObjectReference, { type: 'bpmn:DataStoreReference' });
// when
commandStack.undo();
// then
expect(elementRegistry.get('DataObjectReference_1').x).to.eql(positionX);
}));
it('should redo', inject(function(bpmnReplace, commandStack, elementRegistry) {
// given
var dataObjectReference = elementRegistry.get('DataObjectReference_1');
var positionX = dataObjectReference.x;
bpmnReplace.replaceElement(dataObjectReference, { type: 'bpmn:DataStoreReference' });
commandStack.undo();
// when
commandStack.redo();
var dataStoreReference = elementRegistry.get('DataObjectReference_1');
var newPositionX = positionX + (dataObjectReference.width - dataStoreReference.width) / 2;
// then
expect(dataStoreReference.x).to.eql(newPositionX);
}));
});
});
});