Fix merge conflicts

Author: opoliarush

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## [2.0.392] - 2024-10-10
+## [2.0.393] - 2024-10-16
+
+- fix quarkus export delay by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2559
+- Update eap profile by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2560
+- Add new messages for filters load by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2561
+- Update Main UI by @kshmidt-digma in https://github.com/digma-ai/digma-intellij-plugin/pull/2563
+
+## 2.0.392 - 2024-10-10
 
 - Update-UI by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2553
 - Update-UI by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2554

analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsProvider.java

@@ -48,6 +48,8 @@ public interface AnalyticsProvider extends Closeable {
 
     String getErrorTimeseries(String errorId, Map<String, Object> payload);
 
+    String getGlobalErrorsFilters(String payload);
+
     void setInsightCustomStartTime(CustomStartTimeInsightRequest customStartTimeInsightRequest);
 
     String getErrorDetails(String errorSourceId);

analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java

@@ -171,6 +171,11 @@ public String getGlobalErrors(String payload) {
         return execute(() -> client.analyticsProvider.getGlobalErrors(payload));
     }
 
+    @Override
+    public String getGlobalErrorsFilters(String payload) {
+        return execute(() -> client.analyticsProvider.getGlobalErrorsFilters(payload));
+    }
+
     @Override
     public String getErrorTimeseries(String errorId, Map<String, Object> payload) {
         return execute(() -> client.analyticsProvider.getErrorTimeseries( errorId, payload));
@@ -820,6 +825,13 @@ private interface AnalyticsProviderRetrofit {
         @GET("errors/{errorId}/timeseries")
         Call<String> getErrorTimeseries(@Path("errorId") String errorSourceId, @QueryMap Map<String, Object> fields);
 
+        @Headers({
+                "Accept: application/+json",
+                "Content-Type:application/json"
+        })
+        @POST("errors/filters")
+        Call<String> getGlobalErrorsFilters(@Body String payload);
+
         @Headers({
                 "Content-Type:application/json"
         })

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

@@ -240,6 +240,10 @@ public String getErrorTimeseries(String error_id, Map<String, Object> payload) t
         return executeCatching(() -> analyticsProviderProxy.getErrorTimeseries(error_id, payload));
     }
 
+    public String getGlobalErrorsFilters(String payload) throws AnalyticsServiceException {
+        return executeCatching(() -> analyticsProviderProxy.getGlobalErrorsFilters(payload));
+    }
+
     public String getErrorDetails(String errorUid) throws AnalyticsServiceException {
         return executeCatching(() -> analyticsProviderProxy.getErrorDetails(errorUid));
     }

src/main/kotlin/org/digma/intellij/plugin/ui/errors/ErrorsMessageRouterHandler.kt

@@ -13,6 +13,7 @@ import org.digma.intellij.plugin.ui.errors.model.SetErrorsDataMessage
 import org.digma.intellij.plugin.ui.errors.model.SetErrorsDetailsMessage
 import org.digma.intellij.plugin.ui.errors.model.SetFilesUrlsMessage
 import org.digma.intellij.plugin.ui.errors.model.SetGlobalErrorsDataMessage
+import org.digma.intellij.plugin.ui.errors.model.SetGlobalErrorsFiltersDataMessage
 import org.digma.intellij.plugin.ui.jcef.BaseCommonMessageRouterHandler
 import org.digma.intellij.plugin.ui.jcef.getMapFromNode
 import org.digma.intellij.plugin.ui.jcef.getQueryMapFromPayload
@@ -27,6 +28,7 @@ class ErrorsMessageRouterHandler(project: Project) : BaseCommonMessageRouterHand
         when (action) {
             "ERRORS/GET_ERRORS_DATA" -> getErrorsData(project, browser, requestJsonNode)
             "ERRORS/GET_GLOBAL_ERRORS_DATA" -> getGlobalErrorsData(project, browser, requestJsonNode)
+            "ERRORS/GET_GLOBAL_ERRORS_FILTERS_DATA" -> getGlobalErrorsFiltersData(project, browser, requestJsonNode)
             "ERRORS/GET_ERROR_TIMESERIES_DATA" -> getErrorTimeseriesData(project, browser, requestJsonNode)
             "ERRORS/GET_ERROR_DETAILS" -> getErrorDetails(project, browser, requestJsonNode)
             "ERRORS/OPEN_RAW_ERROR_STACK_TRACE_IN_EDITOR" -> openStackTrace(project, requestJsonNode)
@@ -78,6 +80,14 @@ class ErrorsMessageRouterHandler(project: Project) : BaseCommonMessageRouterHand
         }
     }
 
+    private fun getGlobalErrorsFiltersData(project: Project, browser: CefBrowser, requestJsonNode: JsonNode) {
+        getPayloadFromRequest(requestJsonNode)?.let { payload ->
+            val errorsData = ErrorsService.getInstance(project).getGlobalErrorsFiltersData(payload.toString())
+            val setErrorsDataMessage = SetGlobalErrorsFiltersDataMessage(errorsData)
+            serializeAndExecuteWindowPostMessageJavaScript(browser, setErrorsDataMessage, project)
+        }
+    }
+
     private fun getErrorDetails(project: Project, browser: CefBrowser, requestJsonNode: JsonNode) {
         getPayloadFromRequest(requestJsonNode)?.let { payload ->
             val errorId = payload.get("errorId")?.takeIf { it !is NullNode }?.asText()

src/main/kotlin/org/digma/intellij/plugin/ui/errors/ErrorsService.kt

@@ -47,6 +47,15 @@ class ErrorsService(val project: Project) : Disposable {
         }
     }
 
+    fun getGlobalErrorsFiltersData(payload: String): String? {
+        try {
+            return AnalyticsService.getInstance(project).getGlobalErrorsFilters(payload)
+        } catch (e: Throwable) {
+            Log.warnWithException(logger, project, e, "error fetching errors/filters")
+            return null
+        }
+    }
+
     fun getErrorTimeseries( errorId: String, payload:Map<String, Any>): String? {
         try {
             return AnalyticsService.getInstance(project).getErrorTimeseries(errorId, payload)

src/main/kotlin/org/digma/intellij/plugin/ui/errors/model/SetGlobalErrorsFiltersDataMessage.kt

@@ -0,0 +1,9 @@
+package org.digma.intellij.plugin.ui.errors.model
+
+import com.fasterxml.jackson.annotation.JsonRawValue
+import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
+
+class SetGlobalErrorsFiltersDataMessage(@JsonRawValue val payload: String?) {
+    val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
+    val action = "ERRORS/SET_GLOBAL_ERRORS_FILTERS_DATA"
+}

src/main/resources/webview/main/index.js

@@ -1,2 +1,2 @@
-#Thu Oct 10 12:08:27 UTC 2024
-version=2.0.393
+#Wed Oct 16 12:08:27 UTC 2024
+version=2.0.394