Skip to content

Commit 9a6aa44

Browse files
committed
feat: rename task listener event types
Related to camunda/camunda-modeler#4748
1 parent 711ced5 commit 9a6aa44

File tree

4 files changed

+46
-16
lines changed

4 files changed

+46
-16
lines changed

src/provider/zeebe/properties/TaskListener.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import {
66

77
import { ListenerType, Retries } from './shared/Listener';
88

9-
export const EVENT_TYPE = [ 'complete', 'assignment' ];
9+
export const EVENT_TYPE = [ 'completing', 'assigning' ];
1010

1111
export const EVENT_TO_LABEL = {
12-
complete: 'Complete',
13-
assignment: 'Assignment'
12+
completing: 'Completing',
13+
assigning: 'Assigning'
1414
};
1515

1616
export function TaskListenerEntries(props) {

src/provider/zeebe/properties/TaskListenersProps.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,15 @@ export function TaskListenersProps({ element, injector }) {
4646
const items = listeners.map((listener, index) => {
4747
const id = element.id + '-taskListener-' + index;
4848
const type = listener.get('type') || '<no type>';
49+
const eventType = listener.get('eventType');
50+
const label = translate('{eventType}: {type}', {
51+
eventType: EVENT_TO_LABEL[eventType] || eventType,
52+
type
53+
});
4954

5055
return {
5156
id,
52-
label: translate(`${EVENT_TO_LABEL[listener.get('eventType')]}: {type}`, { type }),
57+
label,
5358
entries: TaskListenerEntries({
5459
idPrefix: id,
5560
listener

test/spec/provider/zeebe/TaskListenerProps.bpmn

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<bpmn:userTask id="UserTask">
55
<bpmn:extensionElements>
66
<zeebe:taskListeners>
7-
<zeebe:taskListener eventType="assignment" retries="2" type="assign_listener" />
7+
<zeebe:taskListener eventType="assigning" retries="2" type="assign_listener" />
88
</zeebe:taskListeners>
99
<zeebe:userTask />
1010
</bpmn:extensionElements>
@@ -28,11 +28,6 @@
2828
</bpmn:userTask>
2929
<bpmn:boundaryEvent id="CompensationBoundaryEvent" attachedToRef="SubProcess">
3030
<bpmn:compensateEventDefinition id="Compensate" />
31-
<bpmn:extensionElements>
32-
<zeebe:taskListeners>
33-
<zeebe:taskListener eventType="assignment" retries="4" type="assign_listener" />
34-
</zeebe:taskListeners>
35-
</bpmn:extensionElements>
3631
</bpmn:boundaryEvent>
3732
<bpmn:exclusiveGateway id="Gateway">
3833
<bpmn:extensionElements>
@@ -47,12 +42,24 @@
4742
</bpmn:extensionElements>
4843
</bpmn:userTask>
4944
</bpmn:subProcess>
45+
<bpmn:userTask id="UserTaskLegacyEventTypes">
46+
<bpmn:extensionElements>
47+
<zeebe:taskListeners>
48+
<zeebe:taskListener eventType="assignment" retries="2" type="assign_listener_legacy" />
49+
<zeebe:taskListener eventType="complete" retries="2" type="complete_listener_legacy" />
50+
</zeebe:taskListeners>
51+
<zeebe:userTask />
52+
</bpmn:extensionElements>
53+
</bpmn:userTask>
5054
</bpmn:process>
5155
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
5256
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="ZeebePropertiesTest">
5357
<bpmndi:BPMNShape id="UserTask_di" bpmnElement="UserTask">
5458
<dc:Bounds x="160" y="400" width="100" height="80" />
5559
</bpmndi:BPMNShape>
60+
<bpmndi:BPMNShape id="UserTaskLegacyEventTypes_di" bpmnElement="UserTaskLegacyEventTypes">
61+
<dc:Bounds x="160" y="200" width="100" height="80" />
62+
</bpmndi:BPMNShape>
5663
<bpmndi:BPMNShape id="SubProcess_di" bpmnElement="SubProcess" isExpanded="true">
5764
<dc:Bounds x="160" y="510" width="350" height="200" />
5865
</bpmndi:BPMNShape>

test/spec/provider/zeebe/TaskListenerProps.spec.js

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,25 @@ describe('provider/zeebe - TaskListenerProps', function() {
137137
const label = domQuery('.bio-properties-panel-collapsible-entry-header-title', group);
138138

139139
// then
140-
expect(label).to.have.property('textContent', 'Assignment: assign_listener');
140+
expect(label).to.have.property('textContent', 'Assigning: assign_listener');
141+
}));
142+
143+
144+
it('should display label with exact value for unknown event type', inject(async function(elementRegistry, selection) {
145+
146+
// given
147+
const element = elementRegistry.get('UserTaskLegacyEventTypes');
148+
149+
await act(() => {
150+
selection.select(element);
151+
});
152+
153+
// when
154+
const group = getTaskListenersGroup(container);
155+
const label = domQuery('.bio-properties-panel-collapsible-entry-header-title', group);
156+
157+
// then
158+
expect(label).to.have.property('textContent', 'assignment: assign_listener_legacy');
141159
}));
142160

143161

@@ -270,7 +288,7 @@ describe('provider/zeebe - TaskListenerProps', function() {
270288
const listeners = getListeners(element);
271289
const newListener = listeners[listeners.length - 1];
272290

273-
expect(newListener).to.have.property('eventType', 'complete');
291+
expect(newListener).to.have.property('eventType', 'completing');
274292
})
275293
);
276294

@@ -289,13 +307,13 @@ describe('provider/zeebe - TaskListenerProps', function() {
289307
const input = domQuery('select', eventType);
290308

291309
// when
292-
changeInput(input, 'complete');
310+
changeInput(input, 'completing');
293311

294312
// then
295313
const listeners = getListeners(element);
296314
const listener = listeners[0];
297315

298-
expect(listener).to.have.property('eventType', 'complete');
316+
expect(listener).to.have.property('eventType', 'completing');
299317
}));
300318

301319

@@ -309,15 +327,15 @@ describe('provider/zeebe - TaskListenerProps', function() {
309327
const group = getTaskListenersGroup(container);
310328
const eventType = getEventType(group);
311329
const input = domQuery('select', eventType);
312-
changeInput(input, 'complete');
330+
changeInput(input, 'completing');
313331

314332
// when
315333
await act(() => {
316334
commandStack.undo();
317335
});
318336

319337
// then
320-
expect(input).to.have.property('value', 'assignment');
338+
expect(input).to.have.property('value', 'assigning');
321339
}));
322340
});
323341

0 commit comments

Comments
 (0)