Skip to content
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

Jump to bottom

JBPM-10199: Mark Async nodes as finished at the SVG when process inst… #3005

Merged
merged 1 commit into from
Jan 31, 2024
Merged

JBPM-10199: Mark Async nodes as finished at the SVG when process inst… #3005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions ...rver-services-jbpm-ui/src/main/java/org/kie/server/services/jbpm/ui/ImageServiceBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ public String getActiveProcessImage(String containerId, long procInstId, String
fullLogs.stream()
.filter(nodeInstanceDesc ->
(((org.jbpm.kie.services.impl.model.NodeInstanceDesc) nodeInstanceDesc).getType() == NodeInstanceLog.TYPE_ASYNC_ENTER) &&
fullLogs.stream().noneMatch(nodeInst -> nodeInstanceDesc.getNodeId().equals(nodeInst.getNodeId())
&& (((org.jbpm.kie.services.impl.model.NodeInstanceDesc) nodeInst).getType() == NodeInstanceLog.TYPE_EXIT)))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nmirasch @fjtirado could you please share a brief explanation about why we did check by type also?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see this comment // Async active nodes don't have any related completed node instance

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@domhanak before this change it only checked that the async node has an type_exit log to include it as an active one. Now it checks that it's not in the finished ones (including Exited, Aborted, Skipped and Obsolete) to be included as an active node and painted properly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! I am setting up rhpam to test the fix.

finishedLogs.stream().noneMatch(nodeInst -> nodeInstanceDesc.getNodeId().equals(nodeInst.getNodeId())))
.map(NodeInstanceDesc::getNodeId).collect(Collectors.toList());

Map<Long, String> active = new HashMap<Long, String>();
Expand Down
116 changes: 115 additions & 1 deletion ...-services-jbpm-ui/src/test/java/org/kie/server/services/jbpm/ui/ImageServiceBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public void testSvgAsyncNodesBorderColoring() throws Exception {
"", 6, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance8 = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("8", node_async_failing, "", "AsyncEventNode", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 6, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
"", 2, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance6_end = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("6", node_pm_evaluation, "PM_evaluation", "HumanTaskNode", "evaluation_1.0.0-SNAPSHOT",
processInstanceId, null, "", 1, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
Expand Down Expand Up @@ -429,6 +429,120 @@ public void testSvgAsyncNodesBorderColoring() throws Exception {
checkStrokeAttributeAtNode(svgDocument, node_async_failing, activeAsyncNodeBorderColor);
}

@Test
public void testSvgAbortedAsyncNodesBorderColoring() throws Exception {
String containerId = "test-container";
String processId = "test-processId";
long processInstanceId = 10;

String node_start = "_ED165B85-E65D-42A6-B0EF-8A160356271E";
String node_self_evaluation = "_D3E17247-1D94-47D8-93AD-D645E317B736";
String node_asyncOk = "_9C7235D4-C26C-4EB8-9724-9AAC5C02CCE5";
String node_split = "_930D6071-9D06-42C3-946F-BA46C09EF157";
String node_hr_evaluation = "_AB431E82-86BC-460F-9D8B-7A7617565B36";
String node_pm_evaluation = "_E35438DF-03AF-4D7B-9DCB-30BC70E7E92E";
String node_async_failing = "_502513E3-41BD-40AC-8C41-F32566D9FA2B";

byte[] byteArray = getInputStreamAsByteArray(ImageServiceBaseTest.class.getResourceAsStream("/evaluation_async.svg"));

when(dataService.getProcessesByDeploymentIdProcessId(containerId, processId)).thenReturn(mock(ProcessDefinition.class));
when(imageReference.getImageContent(anyString(), anyString())).thenReturn(byteArray);
when(kieServerRegistry.getConfig()).thenReturn(config);
when(config.getConfigItemValue(anyString(), anyString())).thenReturn("");

//async triggered again
NodeInstanceDesc nodeInstance8_2 = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("8", node_async_failing, "", "AsyncEventNode", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 6, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance8 = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("8", node_async_failing, "", "AsyncEventNode", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 2, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance6_end = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("6", node_pm_evaluation, "PM_evaluation", "HumanTaskNode", "evaluation_1.0.0-SNAPSHOT",
processInstanceId, null, "", 1, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance6_start = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("6", node_pm_evaluation, "PM_evaluation", "HumanTaskNode", "evaluation_1.0.0-SNAPSHOT",
processInstanceId, null, "", 0, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance5_end = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("5", node_split, "", "Split", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 1, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance7_start = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("7", node_hr_evaluation, "HR Evaluation", "HumanTaskNode", "evaluation_1.0.0-SNAPSHOT",
processInstanceId, null, "", 0, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance5_start = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("5", node_split, "", "Split", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 0, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance5_end2 = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("5", node_split, "", "Split", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 1, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance3_end = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("3", node_asyncOk, "AsyncOK", "ActionNode", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 1, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance3_start = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("3", node_asyncOk, "AsyncOK", "ActionNode", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 0, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance2 = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("2", node_asyncOk, "", "AsyncEventNode", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 6, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance1_end = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("1", node_self_evaluation, "Self Evaluation", "HumanTaskNode", "evaluation_1.0.0-SNAPSHOT",
processInstanceId, null, "", 1, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance1_start = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("1", node_self_evaluation, "Self Evaluation", "HumanTaskNode", "evaluation_1.0.0-SNAPSHOT",
processInstanceId, null, "", 0, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance0_end = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("0", node_start, "", "StartNode", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 1, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);
NodeInstanceDesc nodeInstance0_start = new org.jbpm.kie.services.impl.model.NodeInstanceDesc
("0", node_start, "", "StartNode", "evaluation_1.0.0-SNAPSHOT", processInstanceId, null,
"", 0, null, null, "evaluation_1.0.0-SNAPSHOT", null, 1);

List<NodeInstanceDesc> activeNodes = Arrays.asList(nodeInstance7_start);
List<NodeInstanceDesc> finishedNodes = Arrays.asList(nodeInstance0_end, nodeInstance1_end, nodeInstance3_end,
nodeInstance5_end, nodeInstance5_end2, nodeInstance6_end,nodeInstance8);
List<NodeInstanceDesc> fullLogs = Arrays.asList(nodeInstance0_end, nodeInstance0_start, nodeInstance1_start,
nodeInstance1_end, nodeInstance2, nodeInstance3_end,
nodeInstance3_start, nodeInstance5_end, nodeInstance5_end2,
nodeInstance5_start, nodeInstance6_end, nodeInstance6_start,
nodeInstance7_start, nodeInstance8, nodeInstance8_2);
when(dataService.getProcessInstanceHistoryFinished(anyLong(), any())).thenReturn(finishedNodes);
when(dataService.getProcessInstanceHistoryActive(anyLong(), any())).thenReturn(activeNodes);
when(dataService.getProcessInstanceFullHistory(anyLong(), any())).thenReturn(fullLogs);
Map<String, ImageReference> imageReferenceMap = new HashMap<>();
imageReferenceMap.put(containerId, imageReference);

ProcessInstanceDesc processInstanceDesc = new org.jbpm.kie.services.impl.model.ProcessInstanceDesc(processInstanceId, processId, "", "", 1, containerId, null
, "", "", "");

when(dataService.getProcessInstanceById(processInstanceId)).thenReturn(processInstanceDesc);

ImageServiceBase imageServiceBase = new ImageServiceBase(dataService, imageReferenceMap, kieServerRegistry);
String processImageStr = imageServiceBase.getActiveProcessImage(containerId, processInstanceId);

Document svgDocument = readSVG(processImageStr);

checkStrokeAttributeAtNode(svgDocument, node_hr_evaluation, ACTIVE_BORDER_COLOR);
checkStrokeAttributeAtNode(svgDocument, node_self_evaluation, COMPLETED_BORDER_COLOR);
checkStrokeAttributeAtNode(svgDocument, node_pm_evaluation, COMPLETED_BORDER_COLOR);
checkStrokeAttributeAtNode(svgDocument, node_async_failing, COMPLETED_BORDER_COLOR);
checkStrokeAttributeAtNode(svgDocument, node_asyncOk, COMPLETED_BORDER_COLOR);

String completedNodeColor = "black";
String completedNodeBorderColor = "grey";
String activeNodeBorderColor = "blue";
String activeAsyncNodeBorderColor = "red";
processImageStr = imageServiceBase.getActiveProcessImage(containerId, processInstanceId, completedNodeColor,
completedNodeBorderColor, activeNodeBorderColor, false,
activeAsyncNodeBorderColor);
svgDocument = readSVG(processImageStr);

checkStrokeAttributeAtNode(svgDocument, node_hr_evaluation, activeNodeBorderColor);
checkStrokeAttributeAtNode(svgDocument, node_self_evaluation, completedNodeBorderColor);
checkStrokeAttributeAtNode(svgDocument, node_pm_evaluation, completedNodeBorderColor);
checkStrokeAttributeAtNode(svgDocument, node_asyncOk, completedNodeBorderColor);
checkStrokeAttributeAtNode(svgDocument, node_async_failing, completedNodeBorderColor);
}

private void checkStrokeAttributeAtNode(Document svgDocument, String nodeId, String expectedStrokeValue) {
Element humanTaskBorderElement = svgDocument.getElementById(nodeId + "?shapeType=BORDER&renderType=STROKE");
String stroke = humanTaskBorderElement.getAttribute("stroke");
Expand Down
Loading