Merge span and REST call into same group (#123)

Author: MykolaYaremchuk

ide-common/src/main/java/org/digma/intellij/plugin/insights/view/GroupListViewItemBuilder.java

@@ -27,9 +27,8 @@ public GroupListViewItemBuilder(InsightGroupType insightGroupType, Function<T, S
     @Override
     public List<ListViewItem<?>> build(Project project, T insight, ListGroupManager groupManager) {
         final String groupId = groupByFunction.apply(insight);
-        final String groupKey = insightGroupType.name() + ":" + groupId;
         final InsightGroupListViewItem theGroup = (InsightGroupListViewItem)
-                groupManager.getOrCreateGroup(groupKey, () -> new InsightGroupListViewItem(groupId, insightGroupType));
+                groupManager.getOrCreateGroup(groupId, () -> new InsightGroupListViewItem(groupId, insightGroupType));
 
         final var theListView = new InsightListViewItem<>(insight);
 

ide-common/src/main/java/org/digma/intellij/plugin/insights/view/InsightsViewBuilder.java

@@ -32,7 +32,7 @@ public List<ListViewItem<?>> build(Project project, @NotNull MethodInfo scope, L
 
         codeObjectInsights.forEach(insight -> {
             final ListViewItemBuilder<CodeObjectInsight> builder = (ListViewItemBuilder<CodeObjectInsight>) buildersHolder.getBuilder(insight.getType());
-            final List<ListViewItem<?>> insightListItems = builder.build(project,insight, groupManager);
+            final List<ListViewItem<?>> insightListItems = builder.build(project, insight, groupManager);
             allItems.addAll(insightListItems);
         });
 

ide-common/src/main/java/org/digma/intellij/plugin/view/ListGroupManager.java

@@ -5,14 +5,20 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 public class ListGroupManager {
 
     private final Map<String, GroupListViewItem> groups = new HashMap<>();
 
     public GroupListViewItem getOrCreateGroup(String groupKey, Supplier<GroupListViewItem> supplier) {
-        return groups.computeIfAbsent(groupKey, key -> supplier.get());
+        Optional<String> existingMatchingGroupKey = groups.keySet()
+                .stream()
+        //FYI: Temporary fix because from BE we receive some insights with groupId = "epHTTP:POST Transfer/TransferFunds" and some insights with groupId = "HTTP POST Transfer/TransferFunds" but all these items should be displayed on the same group on UI
+                .filter(s -> s.endsWith(groupKey.replace("HTTP ", "")))
+                .findFirst();
+        return groups.computeIfAbsent(existingMatchingGroupKey.orElse(groupKey), key -> supplier.get());
     }
 
     public Collection<GroupListViewItem> getGroupItems() {

src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/InsightsListCellRenderer.kt

@@ -83,8 +83,7 @@ class InsightsListCellRenderer : AbstractPanelListCellRenderer() {
     }
 
 
-
-    private fun groupTitlePanel(labelText: String,icon: Icon): JPanel {
+    private fun groupTitlePanel(labelText: String, icon: Icon): JPanel {
         return panel {
             row {
                 icon(icon).applyToComponent {