-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(timer-event): disallow cycle option for intermediate catch events
Related to camunda/camunda-modeler#501
- Loading branch information
1 parent
c1d5128
commit 6c75717
Showing
3 changed files
with
201 additions
and
159 deletions.
There are no files selected for viewing
282 changes: 143 additions & 139 deletions
282
lib/provider/bpmn/parts/implementation/TimerEventDefinition.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,139 +1,143 @@ | ||
| 'use strict'; | ||
|
|
||
| var elementHelper = require('../../../../helper/ElementHelper'), | ||
| cmdHelper = require('../../../../helper/CmdHelper'); | ||
|
|
||
| var entryFactory = require('../../../../factory/EntryFactory'); | ||
|
|
||
| /** | ||
| * Get the timer definition type for a given timer event definition. | ||
| * | ||
| * @param {ModdleElement<bpmn:TimerEventDefinition>} timer | ||
| * | ||
| * @return {string|undefined} the timer definition type | ||
| */ | ||
| function getTimerDefinitionType(timer) { | ||
| var timeDate = timer.get('timeDate'); | ||
| if (typeof timeDate !== 'undefined') { | ||
| return 'timeDate'; | ||
| } | ||
|
|
||
| var timeCycle = timer.get('timeCycle'); | ||
| if (typeof timeCycle !== 'undefined') { | ||
| return 'timeCycle'; | ||
| } | ||
|
|
||
| var timeDuration = timer.get('timeDuration'); | ||
| if (typeof timeDuration !== 'undefined') { | ||
| return 'timeDuration'; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Creates 'bpmn:FormalExpression' element. | ||
| * | ||
| * @param {ModdleElement} parent | ||
| * @param {string} body | ||
| * @param {BpmnFactory} bpmnFactory | ||
| * | ||
| * @return {ModdleElement<bpmn:FormalExpression>} a formal expression | ||
| */ | ||
| function createFormalExpression(parent, body, bpmnFactory) { | ||
| body = body || undefined; | ||
| return elementHelper.createElement('bpmn:FormalExpression', { body: body }, parent, bpmnFactory); | ||
| } | ||
|
|
||
| function TimerEventDefinition(group, element, bpmnFactory, timerEventDefinition) { | ||
|
|
||
| var selectOptions = [ | ||
| { value: 'timeDate', name: 'Date' }, | ||
| { value: 'timeDuration', name: 'Duration' }, | ||
| { value: 'timeCycle', name: 'Cycle' } | ||
| ]; | ||
|
|
||
| group.entries.push(entryFactory.selectBox({ | ||
| id: 'timer-event-definition-type', | ||
| label: 'Timer Definition Type', | ||
| selectOptions: selectOptions, | ||
| emptyParameter: true, | ||
| modelProperty: 'timerDefinitionType', | ||
|
|
||
| get: function(element, node) { | ||
| return { | ||
| timerDefinitionType: getTimerDefinitionType(timerEventDefinition) || '' | ||
| }; | ||
| }, | ||
|
|
||
| set: function(element, values) { | ||
| var props = { | ||
| timeDuration: undefined, | ||
| timeDate: undefined, | ||
| timeCycle: undefined | ||
| }; | ||
|
|
||
| var newType = values.timerDefinitionType; | ||
| if (values.timerDefinitionType) { | ||
| var oldType = getTimerDefinitionType(timerEventDefinition); | ||
|
|
||
| var value; | ||
| if (oldType) { | ||
| var definition = timerEventDefinition.get(oldType); | ||
| value = definition.get('body'); | ||
| } | ||
|
|
||
| props[newType] = createFormalExpression(timerEventDefinition, value, bpmnFactory); | ||
| } | ||
|
|
||
| return cmdHelper.updateBusinessObject(element, timerEventDefinition, props); | ||
| } | ||
|
|
||
| })); | ||
|
|
||
|
|
||
| group.entries.push(entryFactory.textField({ | ||
| id: 'timer-event-definition', | ||
| label: 'Timer Definition', | ||
| modelProperty: 'timerDefinition', | ||
|
|
||
| get: function(element, node) { | ||
| var type = getTimerDefinitionType(timerEventDefinition); | ||
| var definition = type && timerEventDefinition.get(type); | ||
| var value = definition && definition.get('body'); | ||
| return { | ||
| timerDefinition: value | ||
| }; | ||
| }, | ||
|
|
||
| set: function(element, values) { | ||
| var type = getTimerDefinitionType(timerEventDefinition); | ||
| var definition = type && timerEventDefinition.get(type); | ||
|
|
||
| if (definition) { | ||
| return cmdHelper.updateBusinessObject(element, definition, { | ||
| body: values.timerDefinition || undefined | ||
| }); | ||
| } | ||
| }, | ||
|
|
||
| validate: function(element) { | ||
| var type = getTimerDefinitionType(timerEventDefinition); | ||
| var definition = type && timerEventDefinition.get(type); | ||
| if (definition) { | ||
| var value = definition.get('body'); | ||
| if (!value) { | ||
| return { | ||
| timerDefinition: 'Must provide a value' | ||
| }; | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| hidden: function(element) { | ||
| return !getTimerDefinitionType(timerEventDefinition); | ||
| } | ||
|
|
||
| })); | ||
|
|
||
| } | ||
|
|
||
| module.exports = TimerEventDefinition; | ||
| 'use strict'; | ||
|
|
||
| var elementHelper = require('../../../../helper/ElementHelper'), | ||
| cmdHelper = require('../../../../helper/CmdHelper'), | ||
| is = require('bpmn-js/lib/util/ModelUtil').is; | ||
|
|
||
| var entryFactory = require('../../../../factory/EntryFactory'); | ||
|
|
||
| /** | ||
| * Get the timer definition type for a given timer event definition. | ||
| * | ||
| * @param {ModdleElement<bpmn:TimerEventDefinition>} timer | ||
| * | ||
| * @return {string|undefined} the timer definition type | ||
| */ | ||
| function getTimerDefinitionType(timer) { | ||
| var timeDate = timer.get('timeDate'); | ||
| if (typeof timeDate !== 'undefined') { | ||
| return 'timeDate'; | ||
| } | ||
|
|
||
| var timeCycle = timer.get('timeCycle'); | ||
| if (typeof timeCycle !== 'undefined') { | ||
| return 'timeCycle'; | ||
| } | ||
|
|
||
| var timeDuration = timer.get('timeDuration'); | ||
| if (typeof timeDuration !== 'undefined') { | ||
| return 'timeDuration'; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Creates 'bpmn:FormalExpression' element. | ||
| * | ||
| * @param {ModdleElement} parent | ||
| * @param {string} body | ||
| * @param {BpmnFactory} bpmnFactory | ||
| * | ||
| * @return {ModdleElement<bpmn:FormalExpression>} a formal expression | ||
| */ | ||
| function createFormalExpression(parent, body, bpmnFactory) { | ||
| body = body || undefined; | ||
| return elementHelper.createElement('bpmn:FormalExpression', { body: body }, parent, bpmnFactory); | ||
| } | ||
|
|
||
| function TimerEventDefinition(group, element, bpmnFactory, timerEventDefinition) { | ||
|
|
||
| var selectOptions = [ | ||
| { value: 'timeDate', name: 'Date' }, | ||
| { value: 'timeDuration', name: 'Duration' } | ||
| ]; | ||
|
|
||
| if (!is(element, 'bpmn:IntermediateCatchEvent')) { | ||
| selectOptions.push({ value: 'timeCycle', name: 'Cycle' }); | ||
| } | ||
|
|
||
| group.entries.push(entryFactory.selectBox({ | ||
| id: 'timer-event-definition-type', | ||
| label: 'Timer Definition Type', | ||
| selectOptions: selectOptions, | ||
| emptyParameter: true, | ||
| modelProperty: 'timerDefinitionType', | ||
|
|
||
| get: function(element, node) { | ||
| return { | ||
| timerDefinitionType: getTimerDefinitionType(timerEventDefinition) || '' | ||
| }; | ||
| }, | ||
|
|
||
| set: function(element, values) { | ||
| var props = { | ||
| timeDuration: undefined, | ||
| timeDate: undefined, | ||
| timeCycle: undefined | ||
| }; | ||
|
|
||
| var newType = values.timerDefinitionType; | ||
| if (values.timerDefinitionType) { | ||
| var oldType = getTimerDefinitionType(timerEventDefinition); | ||
|
|
||
| var value; | ||
| if (oldType) { | ||
| var definition = timerEventDefinition.get(oldType); | ||
| value = definition.get('body'); | ||
| } | ||
|
|
||
| props[newType] = createFormalExpression(timerEventDefinition, value, bpmnFactory); | ||
| } | ||
|
|
||
| return cmdHelper.updateBusinessObject(element, timerEventDefinition, props); | ||
| } | ||
|
|
||
| })); | ||
|
|
||
|
|
||
| group.entries.push(entryFactory.textField({ | ||
| id: 'timer-event-definition', | ||
| label: 'Timer Definition', | ||
| modelProperty: 'timerDefinition', | ||
|
|
||
| get: function(element, node) { | ||
| var type = getTimerDefinitionType(timerEventDefinition); | ||
| var definition = type && timerEventDefinition.get(type); | ||
| var value = definition && definition.get('body'); | ||
| return { | ||
| timerDefinition: value | ||
| }; | ||
| }, | ||
|
|
||
| set: function(element, values) { | ||
| var type = getTimerDefinitionType(timerEventDefinition); | ||
| var definition = type && timerEventDefinition.get(type); | ||
|
|
||
| if (definition) { | ||
| return cmdHelper.updateBusinessObject(element, definition, { | ||
| body: values.timerDefinition || undefined | ||
| }); | ||
| } | ||
| }, | ||
|
|
||
| validate: function(element) { | ||
| var type = getTimerDefinitionType(timerEventDefinition); | ||
| var definition = type && timerEventDefinition.get(type); | ||
| if (definition) { | ||
| var value = definition.get('body'); | ||
| if (!value) { | ||
| return { | ||
| timerDefinition: 'Must provide a value' | ||
| }; | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| hidden: function(element) { | ||
| return !getTimerDefinitionType(timerEventDefinition); | ||
| } | ||
|
|
||
| })); | ||
|
|
||
| } | ||
|
|
||
| module.exports = TimerEventDefinition; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.