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

feat(modeling/UpdateProperties): unclaim old business object id

This commit is contained in:
Kristin Polenz 2015-10-05 13:35:10 +02:00 committed by Nico Rehwaldt
parent 6d86dc9e27
commit 188487ebdc
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/features/modeling/cmd/UpdatePropertiesHandler.js
View File

@ -18,11 +18,12 @@ var DEFAULT_FLOW = 'default',
* Use respective diagram-js provided handlers if you would * Use respective diagram-js provided handlers if you would
* like to perform automated modeling. * like to perform automated modeling.
*/ */
function UpdatePropertiesHandler(elementRegistry) { function UpdatePropertiesHandler(elementRegistry, moddle) {
this._elementRegistry = elementRegistry; this._elementRegistry = elementRegistry;
this._moddle = moddle;
} }
UpdatePropertiesHandler.$inject = [ 'elementRegistry' ]; UpdatePropertiesHandler.$inject = [ 'elementRegistry', 'moddle' ];
module.exports = UpdatePropertiesHandler; module.exports = UpdatePropertiesHandler;
@ -63,13 +64,16 @@ UpdatePropertiesHandler.prototype.execute = function(context) {
throw new Error('element required'); throw new Error('element required');
} }
var elementRegistry = this._elementRegistry; var elementRegistry = this._elementRegistry,
ids = this._moddle.ids;
var businessObject = element.businessObject, var businessObject = element.businessObject,
properties = context.properties, properties = context.properties,
oldProperties = context.oldProperties || getProperties(businessObject, keys(properties)); oldProperties = context.oldProperties || getProperties(businessObject, keys(properties));
if (ID in properties) { if (ID in properties) {
ids.unclaim(businessObject[ID]);
elementRegistry.updateId(element, properties[ID]); elementRegistry.updateId(element, properties[ID]);
} }
@ -113,14 +117,18 @@ UpdatePropertiesHandler.prototype.execute = function(context) {
UpdatePropertiesHandler.prototype.revert = function(context) { UpdatePropertiesHandler.prototype.revert = function(context) {
var element = context.element, var element = context.element,
properties = context.properties,
oldProperties = context.oldProperties, oldProperties = context.oldProperties,
businessObject = element.businessObject, businessObject = element.businessObject,
elementRegistry = this._elementRegistry; elementRegistry = this._elementRegistry,
ids = this._moddle.ids;
// update properties // update properties
setProperties(businessObject, oldProperties); setProperties(businessObject, oldProperties);
if (ID in oldProperties) { if (ID in properties) {
ids.unclaim(properties[ID]);
elementRegistry.updateId(element, oldProperties[ID]); elementRegistry.updateId(element, oldProperties[ID]);
} }

2
package.json
View File

@ -53,7 +53,7 @@
"karma-sinon-chai": "~0.3.0", "karma-sinon-chai": "~0.3.0",
"load-grunt-tasks": "^0.3.0", "load-grunt-tasks": "^0.3.0",
"mocha": "^2.2.5", "mocha": "^2.2.5",
"mocha-test-container-support": "~0.1.0", "mocha-test-container-support": "0.2.0",
"source-map-concat": "^0.4.0", "source-map-concat": "^0.4.0",
"stringify": "^3.1.0", "stringify": "^3.1.0",
"sinon": "~1.14.1", "sinon": "~1.14.1",

8
test/spec/features/modeling/UpdatePropertiesSpec.js
View File

@ -122,11 +122,15 @@ describe('features/modeling - update properties', function() {
// given // given
var flowConnection = elementRegistry.get('SequenceFlow_1'); var flowConnection = elementRegistry.get('SequenceFlow_1');
var ids = flowConnection.businessObject.$model.ids;
// when // when
modeling.updateProperties(flowConnection, { id: 'FOO_BAR' }); modeling.updateProperties(flowConnection, { id: 'FOO_BAR' });
// then // then
expect(ids.assigned('FOO_BAR')).to.exist;
expect(ids.assigned('SequenceFlow_1')).to.be.false;
expect(flowConnection.businessObject.id).to.equal('FOO_BAR'); expect(flowConnection.businessObject.id).to.equal('FOO_BAR');
expect(flowConnection.id).to.equal('FOO_BAR'); expect(flowConnection.id).to.equal('FOO_BAR');
})); }));
@ -222,12 +226,16 @@ describe('features/modeling - update properties', function() {
// given // given
var flowConnection = elementRegistry.get('SequenceFlow_1'); var flowConnection = elementRegistry.get('SequenceFlow_1');
var ids = flowConnection.businessObject.$model.ids;
// when // when
modeling.updateProperties(flowConnection, { id: 'FOO_BAR' }); modeling.updateProperties(flowConnection, { id: 'FOO_BAR' });
commandStack.undo(); commandStack.undo();
// then // then
expect(ids.assigned('FOO_BAR')).to.be.false;
expect(ids.assigned('SequenceFlow_1')).to.exist;
expect(flowConnection.businessObject.id).to.equal('SequenceFlow_1'); expect(flowConnection.businessObject.id).to.equal('SequenceFlow_1');
expect(flowConnection.id).to.equal('SequenceFlow_1'); expect(flowConnection.id).to.equal('SequenceFlow_1');
})); }));