From ff6ab66096dee262f39e775fa75afe04b339ca65 Mon Sep 17 00:00:00 2001
From: Trung Mai <trung.maihovan@axonactive.com>
Date: Mon, 1 Jul 2024 17:18:40 +0700
Subject: [PATCH] TE-614: Check last end event base on next sequence flow

---
 .../utils/process/inspector/internal/WorkflowPath.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/process-inspector/src/com/axonivy/utils/process/inspector/internal/WorkflowPath.java b/process-inspector/src/com/axonivy/utils/process/inspector/internal/WorkflowPath.java
index 12554b0..27de939 100644
--- a/process-inspector/src/com/axonivy/utils/process/inspector/internal/WorkflowPath.java
+++ b/process-inspector/src/com/axonivy/utils/process/inspector/internal/WorkflowPath.java
@@ -14,7 +14,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.ListUtils;
@@ -97,7 +96,7 @@ protected List<DetectedElement> convertToDetectedElements(Map<ProcessElement, Li
 					timeUntilStarts);
 			result.addAll(elements);
 		}
-		result = keepMaxTimeUtilEndDetectedElement(result);
+		//result = keepMaxTimeUtilEndDetectedElement(result);
 		return result;
 	}
 
@@ -185,8 +184,8 @@ private List<DetectedElement> convertPathToDetectedElements(ProcessElement start
 
 			// It is EmbeddedProcessElement
 			if (element instanceof SubProcessGroup) {				
-				List<AnalysisPath> subPaths = ((SubProcessGroup) element).getInternalPaths();
-				//List<AnalysisPath> subPaths = getAnalysisPathBaseOnNextSequenceFlow(internalPaths, nextElement.getElement());
+				List<AnalysisPath> internalPaths = ((SubProcessGroup) element).getInternalPaths();
+				List<AnalysisPath> subPaths = getAnalysisPathBaseOnNextSequenceFlow(internalPaths, nextElement.getElement());
 				List<DetectedElement> allTaskFromSubPath = new ArrayList<>();
 				for(AnalysisPath subPath : subPaths) {
 					ProcessElement startSubElement = subPath.getElements().get(0);
@@ -507,6 +506,7 @@ private List<AnalysisPath> getAnalysisPathBaseOnNextSequenceFlow(List<AnalysisPa
 						taskGroup.setInternalPaths(validInternalPaths);
 						newPath.add(taskGroup);	
 					}
+					result.add(new AnalysisPath(newPath));
 					continue;
 				}