Merge pull request #2407 from digma-ai/feature/service-filters

Feature/service filters

Author: opoliarush

ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java

@@ -462,7 +462,7 @@ public String register(@NotNull Map<String, Object> queryParams) throws Analytic
     }
 
     @NotNull
-    public InsightsStatsResult getInsightsStats(String spanCodeObjectId, String insightTypes) {
+    public InsightsStatsResult getInsightsStats(String spanCodeObjectId, String insightTypes, String services) {
         try {
             var envId = getCurrentEnvironmentId();
             var params = new HashMap<String, Object>();
@@ -476,6 +476,10 @@ public InsightsStatsResult getInsightsStats(String spanCodeObjectId, String insi
                 params.put("insights", insightTypes);
             }
 
+            if (services != null && !services.isEmpty()) {
+                params.put("services", services);
+            }
+
             return executeCatching(() -> analyticsProviderProxy.getInsightsStats(params));
         } catch (Exception e) {
             Log.debugWithException(LOGGER, project, e, "error calling  insights stats", e.getMessage());

ide-common/src/main/kotlin/org/digma/intellij/plugin/scope/ScopeManager.kt

@@ -167,7 +167,7 @@ class ScopeManager(private val project: Project) {
 
         //in both these cases, if there are no insights, show analytics
         if (preferredView == null || preferredView == View.Insights) {
-            val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(scope.spanCodeObjectId, null)
+            val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(scope.spanCodeObjectId, null, null)
             if (insightsStats.issuesInsightsCount == 0) {
                 MainContentViewSwitcher.getInstance(project).showAnalytics()
             } else {

model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/issues/GetIssuesRequestPayload.kt

@@ -17,6 +17,7 @@ data class GetIssuesRequestPayload
     "sortBy",
     "sortOrder",
     "insightTypes",
+    "services",
     "page"
 )
 constructor(
@@ -28,5 +29,6 @@ constructor(
     val sortBy: String,
     val sortOrder: String,
     @JsonRawValue val insightTypes: String?,
+    @JsonRawValue val services: String?,
     val page: Number
 )

src/main/java/org/digma/intellij/plugin/insights/AbstractInsightsMessageRouterHandler.java

@@ -99,6 +99,7 @@ private void pushIssuesListData(JsonNode jsonNode) throws JsonProcessingExceptio
                 query.at("/sorting/criterion").asText(null),
                 query.at("/sorting/order").asText(null),
                 query.at("/insightTypes").toString(),
+                query.at("/services").toString(),
                 query.at("/page").asInt(0));
 
         InsightsService.getInstance(getProject()).refreshIssuesList(request);

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/BaseMessageRouterHandler.kt

@@ -270,14 +270,23 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
                         payload?.let {
                             val scopeNode = payload.get("scope")
                             val insightTypesJsonArray = payload.at("/filters/insights")
+                            val servicesJsonArray = payload.at("/filters/services")
                             val insightTypes = mutableListOf<String>()
                             if (insightTypesJsonArray is ArrayNode) {
                                 insightTypesJsonArray.forEach { type: JsonNode ->
                                     insightTypes.add(type.asText())
                                 }
                             }
+                            val services = mutableListOf<String>()
+                            if (servicesJsonArray is ArrayNode) {
+                                servicesJsonArray.forEach { type: JsonNode ->
+                                    services.add(type.asText())
+                                }
+                            }
                             if (scopeNode is NullNode) {
-                                val stats = AnalyticsService.getInstance(project).getInsightsStats(null, insightTypes.joinToString())
+                                val stats =
+                                    AnalyticsService.getInstance(project)
+                                        .getInsightsStats(null, insightTypes.joinToString(","), services.joinToString(","))
                                 project.messageBus.syncPublisher(InsightStatsChangedEvent.INSIGHT_STATS_CHANGED_TOPIC)
                                     .insightStatsChanged(
                                         null,
@@ -289,7 +298,8 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
                                     )
                             } else {
                                 val spanCodeObjectId = scopeNode.get("span").get("spanCodeObjectId").asText()
-                                val stats = AnalyticsService.getInstance(project).getInsightsStats(spanCodeObjectId, insightTypes.joinToString())
+                                val stats = AnalyticsService.getInstance(project)
+                                    .getInsightsStats(spanCodeObjectId, insightTypes.joinToString(","), services.joinToString(","))
                                 project.messageBus.syncPublisher(InsightStatsChangedEvent.INSIGHT_STATS_CHANGED_TOPIC)
                                     .insightStatsChanged(
                                         scopeNode,
@@ -377,7 +387,7 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
             Log.debugWithException(logger, project, e, "error calling about")
         }
 
-        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(null, null)
+        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(null, null, null)
 
         updateDigmaEngineStatus(project, browser)
 

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCefComponent.kt

@@ -269,7 +269,7 @@ private constructor(
                     scope: SpanScope?, codeLocation: CodeLocation, hasErrors: Boolean, scopeContext: ScopeContext?, environmentId: String?
                 ) {
                     try {
-                        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(scope?.spanCodeObjectId, null)
+                        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(scope?.spanCodeObjectId, null, null)
 
                         sendScopeChangedMessage(
                             jbCefBrowser.cefBrowser,