Merge pull request #2273 from digma-ai/feature/issues-filtering

kshmidt-digma · web-flow · commit 2d852e5fa761 · 2024-07-10T20:06:21.000+02:00
Feature/issues filtering
diff --git a/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsProvider.java b/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsProvider.java
@@ -11,6 +11,7 @@
 import org.digma.intellij.plugin.model.rest.event.*;
 import org.digma.intellij.plugin.model.rest.highlights.HighlightsRequest;
 import org.digma.intellij.plugin.model.rest.insights.*;
+import org.digma.intellij.plugin.model.rest.insights.issues.GetIssuesRequestPayload;
 import org.digma.intellij.plugin.model.rest.livedata.*;
 import org.digma.intellij.plugin.model.rest.login.*;
 import org.digma.intellij.plugin.model.rest.lowlevel.*;
@@ -104,6 +105,10 @@ public interface AnalyticsProvider extends Closeable {
 
     String getInsights(Map<String, Object> queryParams);
 
+    String getIssues(GetIssuesRequestPayload queryParams);
+
+    String getIssuesFilters(Map<String, Object> queryParams);
+
     AssetNavigationResponse getAssetNavigation(String env, String spanCodeObjectId);
 
     String createEnvironments(Map<String, Object> request);
diff --git a/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java b/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java
@@ -16,6 +16,7 @@
 import org.digma.intellij.plugin.model.rest.event.*;
 import org.digma.intellij.plugin.model.rest.highlights.HighlightsRequest;
 import org.digma.intellij.plugin.model.rest.insights.*;
+import org.digma.intellij.plugin.model.rest.insights.issues.GetIssuesRequestPayload;
 import org.digma.intellij.plugin.model.rest.livedata.*;
 import org.digma.intellij.plugin.model.rest.login.*;
 import org.digma.intellij.plugin.model.rest.lowlevel.*;
@@ -262,6 +263,17 @@ public String getInsights(Map<String, Object> queryParams) {
         return execute(() -> client.analyticsProvider.getInsights(queryParams));
     }
 
+    @Override
+    public String getIssues(GetIssuesRequestPayload queryParams) {
+        return execute(() -> client.analyticsProvider.getIssues(queryParams));
+
+    }
+
+    @Override
+    public String getIssuesFilters(Map<String, Object> queryParams) {
+        return execute(() -> client.analyticsProvider.getIssuesFilters(queryParams));
+    }
+
     @Override
     public AssetNavigationResponse getAssetNavigation(String env, String spanCodeObjectId) {
         return execute(() -> client.analyticsProvider.getAssetNavigation(env, spanCodeObjectId));
@@ -859,6 +871,20 @@ Call<ResponseBody> setInsightCustomStartTime(
         @GET("/insights/get_insights_view")
         Call<String> getInsights(@QueryMap Map<String, Object> fields);
 
+        @Headers({
+                "Accept: application/+json",
+                "Content-Type:application/json"
+        })
+        @POST("/insights/issues")
+        Call<String> getIssues(@Body GetIssuesRequestPayload fields);
+
+        @Headers({
+                "Accept: application/+json",
+                "Content-Type:application/json"
+        })
+        @GET("/insights/issues/filters")
+        Call<String> getIssuesFilters(@QueryMap Map<String, Object> fields);
+
         @Headers({
                 "Accept: text/plain",
                 "Content-Type:application/json"
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java b/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java
@@ -22,6 +22,7 @@
 import org.digma.intellij.plugin.model.rest.event.*;
 import org.digma.intellij.plugin.model.rest.highlights.HighlightsRequest;
 import org.digma.intellij.plugin.model.rest.insights.*;
+import org.digma.intellij.plugin.model.rest.insights.issues.GetIssuesRequestPayload;
 import org.digma.intellij.plugin.model.rest.livedata.*;
 import org.digma.intellij.plugin.model.rest.lowlevel.*;
 import org.digma.intellij.plugin.model.rest.navigation.*;
@@ -449,6 +450,18 @@ public String getInsights(@NotNull Map<String, Object> queryParams) throws Analy
         return executeCatching(() -> analyticsProviderProxy.getInsights(queryParams));
     }
 
+    public String getIssues(GetIssuesRequestPayload requestPayload) throws AnalyticsServiceException {
+        var env = getCurrentEnvironmentId();
+        requestPayload.setEnvironment(env);
+        return executeCatching(() -> analyticsProviderProxy.getIssues(requestPayload));
+    }
+
+    public String getIssuesFilters(@NotNull Map<String, Object> queryParams) throws AnalyticsServiceException {
+        var env = getCurrentEnvironmentId();
+        queryParams.put(ENVIRONMENT_QUERY_PARAM_NAME, env);
+        return executeCatching(() -> analyticsProviderProxy.getIssuesFilters(queryParams));
+    }
+
     public void markInsightsAsRead(@NotNull List<String> insightIds) throws AnalyticsServiceException {
         executeCatching(() -> {
             analyticsProviderProxy.markInsightsAsRead(insightIds);
@@ -493,10 +506,8 @@ public String register(@NotNull Map<String, Object> queryParams) throws Analytic
     }
 
     @NotNull
-    public InsightsStatsResult getInsightsStats(String spanCodeObjectId) throws AnalyticsServiceException {
-
+    public InsightsStatsResult getInsightsStats(String spanCodeObjectId, String insightTypes) throws AnalyticsServiceException {
         try {
-            var env = getCurrentEnvironmentId();
             var envId = getCurrentEnvironmentId();
             var params = new HashMap<String, Object>();
             params.put("Environment", envId);
@@ -505,6 +516,10 @@ public InsightsStatsResult getInsightsStats(String spanCodeObjectId) throws Anal
                 params.put("ScopedSpanCodeObjectId", spanCodeObjectId);
             }
 
+            if (insightTypes != null && !insightTypes.isEmpty()) {
+                params.put("insights", insightTypes);
+            }
+
             return executeCatching(() -> analyticsProviderProxy.getInsightsStats(params));
         } catch (NoSelectedEnvironmentException e) {
             Log.debugWithException(LOGGER, project, e, "error calling  insights stats", e.getMessage());
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/analytics/Environment.java b/ide-common/src/main/java/org/digma/intellij/plugin/analytics/Environment.java
@@ -187,7 +187,7 @@ public Env findById(@NotNull String envId) {
     }
 
     private Optional<Env> find(@Nullable String envIdToFind) {
-        if(envIdToFind == null){
+        if (envIdToFind == null) {
             return Optional.empty();
         }
         return environments.stream().filter(env -> env.getId().equals(envIdToFind)).findFirst();
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/scope/ScopeManager.kt b/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)
+            val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(scope.spanCodeObjectId, null)
             if (insightsStats.issuesInsightsCount == 0) {
                 MainContentViewSwitcher.getInstance(project).showAnalytics()
             } else {
diff --git a/model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/issues/GetIssuesRequestPayload.kt b/model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/issues/GetIssuesRequestPayload.kt
@@ -0,0 +1,32 @@
+package org.digma.intellij.plugin.model.rest.insights.issues
+
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonRawValue
+import java.beans.ConstructorProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class GetIssuesRequestPayload
+@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+@ConstructorProperties(
+    "environment",
+    "scopedSpanCodeObjectId",
+    "displayName",
+    "showDismissed",
+    "filters",
+    "sortBy",
+    "sortOrder",
+    "insightTypes",
+    "page"
+)
+constructor(
+    var environment: String?,
+    val scopedSpanCodeObjectId: String?,
+    val displayName: String?,
+    val showDismissed: Boolean,
+    @JsonRawValue val filters: String,
+    val sortBy: String,
+    val sortOrder: String,
+    @JsonRawValue val insightTypes: String?,
+    val page: Number
+)
diff --git a/src/main/java/org/digma/intellij/plugin/insights/AbstractInsightsMessageRouterHandler.java b/src/main/java/org/digma/intellij/plugin/insights/AbstractInsightsMessageRouterHandler.java
@@ -9,6 +9,7 @@
 import org.digma.intellij.plugin.analytics.*;
 import org.digma.intellij.plugin.common.CodeObjectsUtil;
 import org.digma.intellij.plugin.log.Log;
+import org.digma.intellij.plugin.model.rest.insights.issues.GetIssuesRequestPayload;
 import org.digma.intellij.plugin.model.rest.navigation.*;
 import org.digma.intellij.plugin.navigation.codenavigation.CodeNavigator;
 import org.digma.intellij.plugin.posthog.*;
@@ -34,7 +35,6 @@ public AbstractInsightsMessageRouterHandler(Project project) {
         super(project);
     }
 
-
     @Override
     public boolean doOnQuery(@NotNull Project project, @NotNull CefBrowser browser, @NotNull JsonNode requestJsonNode, @NotNull String rawRequest, @NotNull String action) throws Exception {
 
@@ -68,6 +68,10 @@ public boolean doOnQuery(@NotNull Project project, @NotNull CefBrowser browser,
 
             case "INSIGHTS/UNDISMISS" -> undismissInsight(requestJsonNode);
 
+            case "ISSUES/GET_DATA_LIST" -> pushIssuesListData(requestJsonNode);
+
+            case "ISSUES/GET_FILTERS" -> pushIssuesFiltersData(requestJsonNode);
+
             default -> {
                 return false;
             }
@@ -82,6 +86,30 @@ private void pushInsightsListData(JsonNode jsonNode) {
         InsightsService.getInstance(getProject()).refreshInsightsList(backendQueryParams);
     }
 
+    private void pushIssuesListData(JsonNode jsonNode) throws JsonProcessingException {
+        Log.log(LOGGER::debug, getProject(), "got ISSUES/GET_DATA_LIST message");
+        var payload = getObjectMapper().readTree(jsonNode.get("payload").toString());
+        var query = payload.get("query");
+        var request = new GetIssuesRequestPayload(
+                query.at("/environment").asText(""),
+                query.at("/scopedSpanCodeObjectId").asText(""),
+                query.at("/displayName").asText(null),
+                query.at("/showDismissed").asBoolean(false),
+                query.at("/filters").toString(),
+                query.at("/sorting/criterion").asText(null),
+                query.at("/sorting/order").asText(null),
+                query.at("/insightTypes").toString(),
+                query.at("/page").asInt(0));
+
+        InsightsService.getInstance(getProject()).refreshIssuesList(request);
+    }
+
+    private void pushIssuesFiltersData(JsonNode jsonNode) {
+        Log.log(LOGGER::debug, getProject(), "got ISSUES/GET_FILTERS message");
+        Map<String, Object> backendQueryParams = getQueryMapFromPayload(jsonNode, getObjectMapper());
+        InsightsService.getInstance(getProject()).refreshIssuesFilters(backendQueryParams);
+    }
+
     private void dismissInsight(JsonNode jsonNode) {
         Log.log(LOGGER::debug, getProject(), "got INSIGHTS/DISMISS message");
         var insightId = getPayloadFromRequestNonNull(jsonNode).get("insightId").asText();
@@ -109,15 +137,11 @@ private void getCommitInfo(@NotNull CefBrowser browser, JsonNode jsonNode) throw
             }
         });
 
-
         var message = new SetCommitInfoMessage("digma", "INSIGHTS/SET_COMMIT_INFO", new SetCommitInfoData(commitInfos));
         serializeAndExecuteWindowPostMessageJavaScript(browser, message);
 
     }
 
-
-
-
     private void linkTicket(@NotNull CefBrowser browser, JsonNode jsonNode) throws JsonProcessingException, AnalyticsServiceException {
         Log.log(LOGGER::trace, getProject(), "got INSIGHTS/LINK_TICKET message");
         var payload = getObjectMapper().readTree(jsonNode.get("payload").toString());
@@ -288,3 +312,4 @@ private void goToTraceComparison(JsonNode jsonNode) {
 
 
 }
+
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/insights/InsightsService.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/insights/InsightsService.kt
@@ -12,6 +12,7 @@ import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.insights.InsightsServiceImpl
 import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.model.rest.insights.MarkInsightsAsReadScope
+import org.digma.intellij.plugin.model.rest.insights.issues.GetIssuesRequestPayload
 import org.digma.intellij.plugin.persistence.PersistenceService
 import org.digma.intellij.plugin.posthog.ActivityMonitor
 import org.digma.intellij.plugin.ui.insights.model.SetAllInsightsAsReadData
@@ -21,6 +22,8 @@ import org.digma.intellij.plugin.ui.insights.model.SetDismissedMessage
 import org.digma.intellij.plugin.ui.insights.model.SetInsightDataListMessage
 import org.digma.intellij.plugin.ui.insights.model.SetInsightsAsReadData
 import org.digma.intellij.plugin.ui.insights.model.SetInsightsMarkAsReadMessage
+import org.digma.intellij.plugin.ui.insights.model.SetIssuesDataListMessage
+import org.digma.intellij.plugin.ui.insights.model.SetIssuesFilterMessage
 import org.digma.intellij.plugin.ui.insights.model.SetUnDismissedData
 import org.digma.intellij.plugin.ui.insights.model.SetUnDismissedMessage
 import org.digma.intellij.plugin.ui.jcef.JCefComponent
@@ -69,6 +72,35 @@ class InsightsService(val project: Project) : InsightsServiceImpl(project) {
         }
     }
 
+    fun refreshIssuesList(request: GetIssuesRequestPayload) {
+        val message = try {
+            val issues = AnalyticsService.getInstance(project).getIssues(request)
+            SetIssuesDataListMessage(issues)
+        } catch (e: AnalyticsServiceException) {
+            Log.debugWithException(logger, project, e, "Error loading issues {}", e.message)
+            val error = ErrorPayload(e.meaningfulMessage)
+            SetIssuesDataListMessage("{\"totalCount\":0,\"insights\":[]}", error)
+        }
+
+        jCefComponent?.let {
+            serializeAndExecuteWindowPostMessageJavaScript(it.jbCefBrowser.cefBrowser, message)
+        }
+    }
+
+    fun refreshIssuesFilters(backendQueryParams: MutableMap<String, Any>) {
+        val message = try {
+            val filters = AnalyticsService.getInstance(project).getIssuesFilters(backendQueryParams)
+            SetIssuesFilterMessage(filters)
+        } catch (e: AnalyticsServiceException) {
+            Log.debugWithException(logger, project, e, "Error loading issues filters {}", e.message)
+        }
+
+        jCefComponent?.let {
+            serializeAndExecuteWindowPostMessageJavaScript(it.jbCefBrowser.cefBrowser, message)
+        }
+    }
+
+
     fun undismissInsight(insightId: String) {
         var status = ""
         var error: String? = null
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/insights/model/SetIssuesDataListMessage.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/insights/model/SetIssuesDataListMessage.kt
@@ -0,0 +1,10 @@
+package org.digma.intellij.plugin.ui.insights.model
+
+import com.fasterxml.jackson.annotation.JsonRawValue
+import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
+import org.digma.intellij.plugin.ui.jcef.model.ErrorPayload
+
+data class SetIssuesDataListMessage(@JsonRawValue val payload: String, val error: ErrorPayload? = null) {
+    val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
+    val action = "ISSUES/SET_DATA_LIST"
+}
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/insights/model/SetIssuesFilterMessage.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/insights/model/SetIssuesFilterMessage.kt
@@ -0,0 +1,10 @@
+package org.digma.intellij.plugin.ui.insights.model
+
+import com.fasterxml.jackson.annotation.JsonRawValue
+import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
+import org.digma.intellij.plugin.ui.jcef.model.ErrorPayload
+
+data class SetIssuesFilterMessage(@JsonRawValue val payload: String, val error: ErrorPayload? = null) {
+    val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
+    val action = "ISSUES/SET_FILTERS"
+}
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/jcef/BaseMessageRouterHandler.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/jcef/BaseMessageRouterHandler.kt
@@ -2,6 +2,7 @@ package org.digma.intellij.plugin.ui.jcef
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.node.ArrayNode
 import com.fasterxml.jackson.databind.node.NullNode
 import com.intellij.execution.RunManager
 import com.intellij.ide.BrowserUtil
@@ -260,8 +261,15 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
                         val payload = getPayloadFromRequest(requestJsonNode)
                         payload?.let {
                             val scopeNode = payload.get("scope")
+                            val insightTypesJsonArray = payload.at("/filters/insights")
+                            val insightTypes = mutableListOf<String>()
+                            if (insightTypesJsonArray is ArrayNode) {
+                                insightTypesJsonArray.forEach { type: JsonNode ->
+                                    insightTypes.add(type.asText())
+                                }
+                            }
                             if (scopeNode is NullNode) {
-                                val stats = AnalyticsService.getInstance(project).getInsightsStats(null)
+                                val stats = AnalyticsService.getInstance(project).getInsightsStats(null, insightTypes.joinToString())
                                 project.messageBus.syncPublisher(InsightStatsChangedEvent.INSIGHT_STATS_CHANGED_TOPIC)
                                     .insightStatsChanged(
                                         null,
@@ -273,7 +281,7 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
                                     )
                             } else {
                                 val spanCodeObjectId = scopeNode.get("span").get("spanCodeObjectId").asText()
-                                val stats = AnalyticsService.getInstance(project).getInsightsStats(spanCodeObjectId)
+                                val stats = AnalyticsService.getInstance(project).getInsightsStats(spanCodeObjectId, insightTypes.joinToString())
                                 project.messageBus.syncPublisher(InsightStatsChangedEvent.INSIGHT_STATS_CHANGED_TOPIC)
                                     .insightStatsChanged(
                                         scopeNode,
@@ -361,7 +369,7 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
             Log.debugWithException(logger, project, e, "error calling about")
         }
 
-        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(null)
+        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(null, null)
 
         updateDigmaEngineStatus(project, browser)
 
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCefComponent.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCefComponent.kt
@@ -264,7 +264,7 @@ private constructor(
                     scope: SpanScope?, codeLocation: CodeLocation, hasErrors: Boolean, scopeContext: ScopeContext?, environmentId: String?
                 ) {
                     try {
-                        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(scope?.spanCodeObjectId)
+                        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(scope?.spanCodeObjectId, null)
                         sendScopeChangedMessage(
                             jbCefBrowser.cefBrowser,
                             scope,
diff --git a/src/main/resources/webview/main/index.js b/src/main/resources/webview/main/index.js

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public Env findById(@NotNull String envId) {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`private Optional<Env> find(@Nullable String envIdToFind) {`
`190`		`- if(envIdToFind == null){`
	`190`	`+ if (envIdToFind == null) {`
`191`	`191`	`return Optional.empty();`
`192`	`192`	`}`
`193`	`193`	`return environments.stream().filter(env -> env.getId().equals(envIdToFind)).findFirst();`