Merge pull request #2121 from digma-ai/feature/statistics

Feature/statistics

Author: opoliarush

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

@@ -507,7 +507,7 @@ public InsightsStatsResult getInsightsStats(String spanCodeObjectId) throws Anal
         } catch (Exception e) {
             Log.debugWithException(LOGGER, project, e, "error calling  insights stats", e.getMessage());
         }
-        return new InsightsStatsResult(0, 0, 0, 0);
+        return new InsightsStatsResult(0, 0, 0, 0, 0, 0);
     }
 
     public HttpResponse lowLevelCall(HttpRequest request) throws AnalyticsServiceException {

ide-common/src/main/kotlin/org/digma/intellij/plugin/analytics/InsightStatsChangedEvent.kt

@@ -13,5 +13,12 @@ interface InsightStatsChangedEvent {
         )
     }
 
-    fun insightStatsChanged(scope: JsonNode?, analyticsInsightsCount: Int, issuesInsightsCount: Int, unreadInsightsCount: Int)
+    fun insightStatsChanged(
+        scope: JsonNode?,
+        analyticsInsightsCount: Int,
+        totalQueryResultCount: Int,
+        unreadInsightsCount: Int,
+        criticalInsightsCount: Int,
+        allIssuesCount: Int
+    )
 }

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

@@ -125,7 +125,7 @@ class ScopeManager(private val project: Project) {
     private fun showHomeView(scope: SpanScope, insightsStats: InsightsStatsResult?) {
         val contentViewSwitcher = MainContentViewSwitcher.getInstance(project)
         if (insightsStats != null) {
-            if (insightsStats.analyticsInsightsCount > 0 && insightsStats.issuesInsightsCount == 0) {
+            if (insightsStats.analyticsInsightsCount > 0 && insightsStats.totalQueryResultCount == 0) {
                 contentViewSwitcher.showAnalytics()
                 return
             }

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

@@ -7,5 +7,19 @@ import java.beans.ConstructorProperties
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class InsightsStatsResult
 @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-@ConstructorProperties("dismissedCount", "issuesInsightsCount", "analyticsInsightsCount", "unreadInsightsCount")
-constructor(val dismissedCount: Number, val issuesInsightsCount: Int, val analyticsInsightsCount: Int, val unreadInsightsCount: Int)
+@ConstructorProperties(
+    "dismissedCount",
+    "totalQueryResultCount",
+    "analyticsInsightsCount",
+    "unreadInsightsCount",
+    "criticalInsightsCount",
+    "allIssuesCount"
+)
+constructor(
+    val dismissedCount: Number,
+    val totalQueryResultCount: Int,
+    val analyticsInsightsCount: Int,
+    val unreadInsightsCount: Int,
+    val criticalInsightsCount: Int,
+    val allIssuesCount: Int
+)

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

@@ -251,20 +251,27 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
                             if (scopeNode is NullNode) {
                                 val stats = AnalyticsService.getInstance(project).getInsightsStats(null)
                                 project.messageBus.syncPublisher(InsightStatsChangedEvent.INSIGHT_STATS_CHANGED_TOPIC)
-                                    .insightStatsChanged(null, stats.analyticsInsightsCount, stats.issuesInsightsCount, stats.unreadInsightsCount)
+                                    .insightStatsChanged(
+                                        null,
+                                        stats.analyticsInsightsCount,
+                                        stats.totalQueryResultCount,
+                                        stats.unreadInsightsCount,
+                                        stats.criticalInsightsCount,
+                                        stats.allIssuesCount
+                                    )
                             } else {
                                 val spanCodeObjectId = scopeNode.get("span").get("spanCodeObjectId").asText()
                                 val stats = AnalyticsService.getInstance(project).getInsightsStats(spanCodeObjectId)
                                 project.messageBus.syncPublisher(InsightStatsChangedEvent.INSIGHT_STATS_CHANGED_TOPIC)
                                     .insightStatsChanged(
                                         scopeNode,
                                         stats.analyticsInsightsCount,
-                                        stats.issuesInsightsCount,
-                                        stats.unreadInsightsCount
+                                        stats.totalQueryResultCount,
+                                        stats.unreadInsightsCount,
+                                        stats.criticalInsightsCount,
+                                        stats.allIssuesCount
                                     )
                             }
-
-
                         }
                     }
 
@@ -356,7 +363,7 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
             CodeLocation(listOf(), listOf()),
             false,
             insightsStats?.analyticsInsightsCount ?: 0,
-            insightsStats?.issuesInsightsCount ?: 0,
+            insightsStats?.totalQueryResultCount ?: 0,
             insightsStats?.unreadInsightsCount ?: 0
         )
     }

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

@@ -232,7 +232,7 @@ private constructor(
                             codeLocation,
                             hasErrors,
                             insightsStats?.analyticsInsightsCount ?: 0,
-                            insightsStats?.issuesInsightsCount ?: 0,
+                            insightsStats?.totalQueryResultCount ?: 0,
                             insightsStats?.unreadInsightsCount ?: 0
                         )
                     } catch (e: Throwable) {
@@ -256,9 +256,24 @@ private constructor(
 
         project.messageBus.connect(insightStatsChangeParentDisposable).subscribe(
             InsightStatsChangedEvent.INSIGHT_STATS_CHANGED_TOPIC, object : InsightStatsChangedEvent {
-                override fun insightStatsChanged(scope: JsonNode?, analyticsInsightsCount: Int, issuesInsightsCount: Int, unreadInsightsCount: Int) {
+                override fun insightStatsChanged(
+                    scope: JsonNode?,
+                    analyticsInsightsCount: Int,
+                    totalQueryResultCount: Int,
+                    unreadInsightsCount: Int,
+                    criticalInsightsCount: Int,
+                    allIssuesCount: Int
+                ) {
                     try {
-                        sendSetInsightStatsMessage(jbCefBrowser.cefBrowser, scope, analyticsInsightsCount, issuesInsightsCount, unreadInsightsCount)
+                        sendSetInsightStatsMessage(
+                            jbCefBrowser.cefBrowser,
+                            scope,
+                            analyticsInsightsCount,
+                            totalQueryResultCount,
+                            unreadInsightsCount,
+                            criticalInsightsCount,
+                            allIssuesCount
+                        )
                     } catch (e: Throwable) {
                         ErrorReporter.getInstance().reportError("JCefComponent.insightStatsChanged", e)
                     }

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

@@ -198,11 +198,12 @@ fun sendScopeChangedMessage(
     codeLocation: CodeLocation,
     hasErrors: Boolean,
     analyticsInsightsCount: Number,
-    issuesInsightsCount: Number,
+    totalQueryResultCount: Number,
     unreadInsightsCount: Number
 ) {
     serializeAndExecuteWindowPostMessageJavaScript(
-        cefBrowser, SetScopeMessage(SetScopeMessagePayload(scope, codeLocation, hasErrors, analyticsInsightsCount, issuesInsightsCount, unreadInsightsCount))
+        cefBrowser,
+        SetScopeMessage(SetScopeMessagePayload(scope, codeLocation, hasErrors, analyticsInsightsCount, totalQueryResultCount, unreadInsightsCount))
     )
 }
 
@@ -230,10 +231,22 @@ fun sendSetInsightStatsMessage(
     cefBrowser: CefBrowser,
     scope: JsonNode?,
     analyticsInsightsCount: Number,
-    issuesInsightsCount: Number,
-    unreadInsightsCount: Number
+    totalQueryResultCount: Number,
+    unreadInsightsCount: Number,
+    criticalInsightsCount: Number,
+    allIssuesCount: Number
 ) {
     serializeAndExecuteWindowPostMessageJavaScript(
-        cefBrowser, SetInsightStatsMessage(SetInsightStatsMessagePayload(scope, analyticsInsightsCount, issuesInsightsCount, unreadInsightsCount))
+        cefBrowser,
+        SetInsightStatsMessage(
+            SetInsightStatsMessagePayload(
+                scope,
+                analyticsInsightsCount,
+                totalQueryResultCount,
+                unreadInsightsCount,
+                criticalInsightsCount,
+                allIssuesCount
+            )
+        )
     )
 }

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

@@ -15,7 +15,7 @@ data class SetScopeMessagePayload(
     val code: CodeLocation,
     val hasErrors: Boolean,
     val analyticsInsightsCount: Number,
-    val issuesInsightsCount: Number,
+    val totalQueryResultCount: Number,
     val unreadInsightsCount: Number
 )
 

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

@@ -12,6 +12,8 @@ data class SetInsightStatsMessage(val payload: SetInsightStatsMessagePayload) {
 data class SetInsightStatsMessagePayload(
     val scope: JsonNode?,
     val analyticsInsightsCount: Number,
-    val issuesInsightsCount: Number,
-    val unreadInsightsCount: Number
+    val totalQueryResultCount: Number,
+    val unreadInsightsCount: Number,
+    val criticalInsightsCount: Number,
+    val allIssuesCount: Number
 )