Skip to content

Commit

Permalink
Merge pull request #1634 from ProcessMaker/FOUR-9351
Browse files Browse the repository at this point in the history
FOUR-9351: Timer control does not show any configuration option
  • Loading branch information
ryancooley authored Jul 20, 2023
2 parents e2d1a8e + 2f15aaa commit 4d6d6d7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/components/inspectors/IntermediateTimer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import DurationExpression from './DurationExpression';
import DateTimeExpression from './DateTimeExpression';
import CycleExpression from './CycleExpression';
import { DateTime } from 'luxon';
import { defaultDurationValue } from '@/components/nodes/intermediateTimerEvent';
import { defaultDurationTimerEvent } from '@/constants';
const types = {
timeDuration: 'DurationExpression',
Expand Down Expand Up @@ -61,7 +61,7 @@ export default {
methods: {
changeType(type) {
const defaultValue = (this.isDelayType(type) || this.isCycleType(type))
? defaultDurationValue
? defaultDurationTimerEvent
: DateTime
.local()
.toUTC()
Expand Down
5 changes: 2 additions & 3 deletions src/components/nodes/boundaryTimerEvent/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import cloneDeep from 'lodash/cloneDeep';
import interruptingToggleConfig from '../boundaryEvent/interruptingToggleInspector';
import advancedAccordionConfig from '@/components/inspectors/advancedAccordionConfig';
import documentationAccordionConfig from '@/components/inspectors/documentationAccordionConfig';

export const defaultDurationValue = 'PT1H';
import { defaultDurationTimerEvent } from '@/constants';

export const id = 'processmaker-modeler-boundary-timer-event';

Expand All @@ -24,7 +23,7 @@ export default merge(cloneDeep(boundaryEventConfig), {
eventDefinitions: [
moddle.create('bpmn:TimerEventDefinition', {
timeDuration: moddle.create('bpmn:Expression', {
body: defaultDurationValue,
body: defaultDurationTimerEvent,
}),
}),
],
Expand Down
4 changes: 2 additions & 2 deletions src/components/nodes/intermediateTimerEvent/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import nameConfigSettings from '@/components/inspectors/nameConfigSettings';
import advancedAccordionConfig from '@/components/inspectors/advancedAccordionConfig';
import documentationAccordionConfig from '@/components/inspectors/documentationAccordionConfig';
import defaultNames from '@/components/nodes/intermediateEvent/defaultNames';
import { defaultDurationTimerEvent } from '@/constants';

export const defaultDurationValue = 'PT1H';
const id = 'processmaker-modeler-intermediate-catch-timer-event';

export default {
Expand Down Expand Up @@ -67,7 +67,7 @@ export default {
eventDefinitions: [
moddle.create('bpmn:TimerEventDefinition', {
timeDuration: moddle.create('bpmn:Expression', {
body: defaultDurationValue,
body: defaultDurationTimerEvent,
}),
}),
],
Expand Down
1 change: 1 addition & 0 deletions src/constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const defaultDurationTimerEvent = 'PT1H';

0 comments on commit 4d6d6d7

Please sign in to comment.