Skip to content

Fix execution log order and move waiting states #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philippfromme merged 11 commits into from
Mar 30, 2026
Merged

Fix execution log order and move waiting states #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c86fdfc
fix(log): sort execution log entries by causal order
philippfromme Mar 26, 2026
7a99de3
fix(log): do not show active entries for completed items
philippfromme Mar 26, 2026
c5528c7
chore(log): remove timestamp override in favor of causal sorting
philippfromme Mar 27, 2026
2eb9bd1
chore: update example
philippfromme Mar 27, 2026
b3448c0
refactor(log): replace magic numbers with named constants
philippfromme Mar 27, 2026
d3dd021
fix(log): show waiting states outside of log
philippfromme Mar 28, 2026
f54f2a3
fix: clarify user task instance
philippfromme Mar 30, 2026
beab61a
chore(CHANGELOG): update
philippfromme Mar 30, 2026
064a16b
fix: use insertion index as final tiebreaker
philippfromme Mar 30, 2026
10e3887
fix(log): consider containment order
philippfromme Mar 30, 2026
f74fd56
chore: simplify
philippfromme Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ ___Note:__ Yet to be released changes appear here._

## 4.0.0

* `FIX`: show CTAs for child elements inside subprocesses ([#92](https://github.com/camunda/task-testing/pull/92))
* `FIX`: show waiting states for child elements inside subprocesses ([#92](https://github.com/camunda/task-testing/pull/92))
* `FIX`: fix execution log order by using causal ordering for state entries and related entries with same timestamp ([#91](https://github.com/camunda/task-testing/pull/91))
* `FIX`: move waiting states out of log so they are always visible when existing ([#91](https://github.com/camunda/task-testing/pull/91))

### Breaking Changes

Expand Down
17 changes: 9 additions & 8 deletions demo/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import 'camunda-bpmn-js/dist/assets/camunda-cloud-modeler.css';

import TaskTesting from '../lib';

import diagram from './fixtures/diagram.bpmn';
import form from './fixtures/form.form';
import diagram1 from './fixtures/diagram_1.bpmn';
import diagram2 from './fixtures/diagram_2.bpmn';
import form1 from './fixtures/form_1.form';
import connectorTemplates from './fixtures/connectorTemplates.json';
import defaultConfig from './fixtures/config';

Expand Down Expand Up @@ -57,7 +58,7 @@ function App() {

useEffect(() => {
async function importXml() {
await modeler.importXML(diagram);
await modeler.importXML(diagram1);

modeler.get('canvas').zoom('fit-viewport');
}
Expand All @@ -76,11 +77,11 @@ function App() {
const deploy = useCallback(async () => {
const { xml } = await modeler.saveXML();

const resources = [ { name: 'diagram.bpmn', content: xml } ];

if (form) {
resources.push({ name: 'form.form', content: form });
}
const resources = [
{ name: 'diagram_1.bpmn', content: xml },
{ name: 'diagram_2.bpmn', content: diagram2 },
{ name: 'form.form', content: form1 }
];

const response = await fetch('/api/deploy', {
method: 'POST',
Expand Down
58 changes: 39 additions & 19 deletions demo/fixtures/diagram.bpmn → demo/fixtures/diagram_1.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0jc2nqw" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.44.0-dev" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.8.0">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0jc2nqw" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.45.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.8.0">
<bpmn:process id="Process_TaskTesting" isExecutable="true">
<bpmn:boundaryEvent id="TimerBoundaryNonInterrupting" name="1 second" cancelActivity="false" attachedToRef="ServiceTask_3">
<bpmn:outgoing>Flow_0nufm4k</bpmn:outgoing>
Expand Down Expand Up @@ -294,13 +294,25 @@
</bpmn:scriptTask>
</bpmn:adHocSubProcess>
<bpmn:endEvent id="Event_05uneqm">
<bpmn:incoming>Flow_0xcmxua</bpmn:incoming>
<bpmn:incoming>Flow_0vs7ni0</bpmn:incoming>
</bpmn:endEvent>
<bpmn:startEvent id="Event_0zpa9tc">
<bpmn:outgoing>Flow_0ek248u</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:sequenceFlow id="Flow_0ek248u" sourceRef="Event_0zpa9tc" targetRef="AdHocSubProcess_2" />
<bpmn:sequenceFlow id="Flow_0xcmxua" sourceRef="AdHocSubProcess_2" targetRef="Event_05uneqm" />
<bpmn:sequenceFlow id="Flow_0xcmxua" sourceRef="AdHocSubProcess_2" targetRef="Activity_098dliy" />
<bpmn:sequenceFlow id="Flow_0vs7ni0" sourceRef="Activity_098dliy" targetRef="Event_05uneqm" />
<bpmn:callActivity id="Activity_098dliy" name="Call activity">
<bpmn:extensionElements>
<zeebe:calledElement processId="Process_TaskTestingChild" propagateAllChildVariables="false" />
<zeebe:ioMapping>
<zeebe:input source="=1" target="callActivityInput" />
<zeebe:output source="=scriptTaskResult" target="callActivityOutput" />
</zeebe:ioMapping>
</bpmn:extensionElements>
<bpmn:incoming>Flow_0xcmxua</bpmn:incoming>
<bpmn:outgoing>Flow_0vs7ni0</bpmn:outgoing>
</bpmn:callActivity>
</bpmn:subProcess>
<bpmn:exclusiveGateway id="Gateway_1m89oya" name="Terminate?" default="Flow_105vzb3">
<bpmn:incoming>Flow_06cqvxh</bpmn:incoming>
Expand All @@ -323,6 +335,9 @@
</bpmn:message>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_TaskTesting">
<bpmndi:BPMNShape id="Event_0mamn5m_di" bpmnElement="Event_0mamn5m">
<dc:Bounds x="2372" y="312" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_018bood_di" bpmnElement="Activity_1dh97uw" isExpanded="true">
<dc:Bounds x="645" y="530" width="350" height="200" />
</bpmndi:BPMNShape>
Expand Down Expand Up @@ -370,9 +385,6 @@
<bpmndi:BPMNShape id="Event_0g7rfcn_di" bpmnElement="Event_0g7rfcn">
<dc:Bounds x="1032" y="82" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0mamn5m_di" bpmnElement="Event_0mamn5m">
<dc:Bounds x="2242" y="312" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0vbfdqv_di" bpmnElement="Event_1hzo51y">
<dc:Bounds x="922" y="432" width="36" height="36" />
</bpmndi:BPMNShape>
Expand All @@ -387,10 +399,6 @@
<dc:Bounds x="930" y="290" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_16890h2_di" bpmnElement="ScriptTask_1">
<dc:Bounds x="230" y="290" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0mmlnsy_di" bpmnElement="ReceiveTask_1">
<dc:Bounds x="1070" y="290" width="100" height="80" />
<bpmndi:BPMNLabel />
Expand All @@ -407,14 +415,22 @@
<dc:Bounds x="790" y="290" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_16890h2_di" bpmnElement="ScriptTask_1">
<dc:Bounds x="230" y="290" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="StartEvent_1_di" bpmnElement="StartEvent_1">
<dc:Bounds x="152" y="312" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0upgd3o_di" bpmnElement="SubProcess_1" isExpanded="true">
<dc:Bounds x="1610" y="170" width="580" height="320" />
<dc:Bounds x="1610" y="170" width="710" height="320" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0zpa9tc_di" bpmnElement="Event_0zpa9tc">
<dc:Bounds x="1642" y="312" width="36" height="36" />
<bpmndi:BPMNShape id="Event_05uneqm_di" bpmnElement="Event_05uneqm">
<dc:Bounds x="2242" y="312" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1tqycsm_di" bpmnElement="Activity_098dliy">
<dc:Bounds x="2090" y="290" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1j6vjzg_di" bpmnElement="AdHocSubProcess_2" isExpanded="true">
<dc:Bounds x="1760" y="230" width="270" height="200" />
Expand All @@ -424,16 +440,20 @@
<dc:Bounds x="1840" y="290" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_05uneqm_di" bpmnElement="Event_05uneqm">
<dc:Bounds x="2112" y="312" width="36" height="36" />
<bpmndi:BPMNShape id="Event_0zpa9tc_di" bpmnElement="Event_0zpa9tc">
<dc:Bounds x="1642" y="312" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0ek248u_di" bpmnElement="Flow_0ek248u">
<di:waypoint x="1678" y="330" />
<di:waypoint x="1760" y="330" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0xcmxua_di" bpmnElement="Flow_0xcmxua">
<di:waypoint x="2030" y="330" />
<di:waypoint x="2112" y="330" />
<di:waypoint x="2090" y="330" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0vs7ni0_di" bpmnElement="Flow_0vs7ni0">
<di:waypoint x="2190" y="330" />
<di:waypoint x="2242" y="330" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Gateway_1m89oya_di" bpmnElement="Gateway_1m89oya" isMarkerVisible="true">
<dc:Bounds x="925" y="185" width="50" height="50" />
Expand Down Expand Up @@ -474,8 +494,8 @@
<di:waypoint x="230" y="330" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0f2v3oj_di" bpmnElement="Flow_0f2v3oj">
<di:waypoint x="2190" y="330" />
<di:waypoint x="2242" y="330" />
<di:waypoint x="2320" y="330" />
<di:waypoint x="2372" y="330" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0ggbd4s_di" bpmnElement="Flow_0ggbd4s">
<di:waypoint x="470" y="330" />
Expand Down Expand Up @@ -525,4 +545,4 @@
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
</bpmn:definitions>
42 changes: 42 additions & 0 deletions demo/fixtures/diagram_2.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1ynk0nx" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.45.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.9.0">
<bpmn:process id="Process_TaskTestingChild" isExecutable="true">
<bpmn:startEvent id="StartEvent_1">
<bpmn:outgoing>Flow_0uujfd4</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:sequenceFlow id="Flow_0uujfd4" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />
<bpmn:endEvent id="Event_0x6w7ai">
<bpmn:incoming>Flow_0rfmhb9</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_0rfmhb9" sourceRef="ScriptTask_1" targetRef="Event_0x6w7ai" />
<bpmn:scriptTask id="ScriptTask_1" name="Script task">
<bpmn:extensionElements>
<zeebe:script expression="=callActivityInput + 1" resultVariable="scriptTaskResult" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_0uujfd4</bpmn:incoming>
<bpmn:outgoing>Flow_0rfmhb9</bpmn:outgoing>
</bpmn:scriptTask>
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_TaskTestingChild">
<bpmndi:BPMNShape id="StartEvent_1_di" bpmnElement="StartEvent_1">
<dc:Bounds x="182" y="82" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0x6w7ai_di" bpmnElement="Event_0x6w7ai">
<dc:Bounds x="422" y="82" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1ujq0i3_di" bpmnElement="ScriptTask_1">
<dc:Bounds x="270" y="60" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0uujfd4_di" bpmnElement="Flow_0uujfd4">
<di:waypoint x="218" y="100" />
<di:waypoint x="270" y="100" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0rfmhb9_di" bpmnElement="Flow_0rfmhb9">
<di:waypoint x="370" y="100" />
<di:waypoint x="422" y="100" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
0 demo/fixtures/form.form → demo/fixtures/form_1.form
View file
Open in desktop
File renamed without changes.
Loading
Loading