Merge pull request #2481 from digma-ai/fix/tab-switch

Fix tab switch

Author: opoliarush

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

@@ -20,7 +20,9 @@ import org.digma.intellij.plugin.ui.insights.model.SetDismissedData
 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.SetInsightsData
 import org.digma.intellij.plugin.ui.insights.model.SetInsightsMarkAsReadMessage
+import org.digma.intellij.plugin.ui.insights.model.SetIssuesData
 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
@@ -55,15 +57,15 @@ class InsightsService(val project: Project) : InsightsServiceImpl(project) {
     }
 
     fun refreshInsightsList(backendQueryParams: MutableMap<String, Any>) {
-
+        val viewMode = backendQueryParams["insightViewType"] as String;
         val message = try {
             val insights = AnalyticsService.getInstance(project).getInsights(backendQueryParams)
             onInsightReceived(insights)
-            SetInsightDataListMessage(insights)
+            SetInsightDataListMessage(SetInsightsData(insights, viewMode))
         } catch (e: AnalyticsServiceException) {
             Log.debugWithException(logger, project, e, "Error loading insights {}", e.message)
             val error = ErrorPayload(e.nonNullMessage)
-            SetInsightDataListMessage("{\"totalCount\":0,\"insights\":[]}",error)
+            SetInsightDataListMessage(SetInsightsData("{\"totalCount\":0,\"insights\":[]}", viewMode), error)
         }
 
         jCefComponent?.let {
@@ -72,14 +74,14 @@ class InsightsService(val project: Project) : InsightsServiceImpl(project) {
     }
 
     fun refreshIssuesList(request: GetIssuesRequestPayload) {
-        val message = try {
+       val message = try {
             val issues = AnalyticsService.getInstance(project).getIssues(request)
             reportFirstIssue(issues)
-            SetIssuesDataListMessage(issues)
+            SetIssuesDataListMessage(SetIssuesData(issues))
         } catch (e: AnalyticsServiceException) {
             Log.debugWithException(logger, project, e, "Error loading issues {}", e.message)
             val error = ErrorPayload(e.nonNullMessage)
-            SetIssuesDataListMessage("{\"totalCount\":0,\"insights\":[]}", error)
+            SetIssuesDataListMessage(SetIssuesData("{\"totalCount\":0,\"insights\":[]}"), error)
         }
 
         jCefComponent?.let {

src/main/kotlin/org/digma/intellij/plugin/ui/insights/model/SetInsightDataListMessage.kt

@@ -1,10 +1,22 @@
 package org.digma.intellij.plugin.ui.insights.model
 
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonRawValue
 import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
 import org.digma.intellij.plugin.ui.jcef.model.ErrorPayload
+import java.beans.ConstructorProperties
 
-data class SetInsightDataListMessage( @JsonRawValue val payload: String,val error: ErrorPayload? = null) {
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class SetInsightsData
+@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+@ConstructorProperties("data", "viewMode")
+constructor(
+    @JsonRawValue val data: String,
+    val insightsViewMode: String
+)
+
+data class SetInsightDataListMessage(val payload: SetInsightsData, val error: ErrorPayload? = null) {
     val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
     val action = "INSIGHTS/SET_DATA_LIST"
 }

src/main/kotlin/org/digma/intellij/plugin/ui/insights/model/SetIssuesDataListMessage.kt

@@ -1,10 +1,24 @@
 package org.digma.intellij.plugin.ui.insights.model
 
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonRawValue
 import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
 import org.digma.intellij.plugin.ui.jcef.model.ErrorPayload
+import java.beans.ConstructorProperties
 
-data class SetIssuesDataListMessage(@JsonRawValue val payload: String, val error: ErrorPayload? = null) {
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class SetIssuesData
+@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+@ConstructorProperties("data")
+constructor(
+    @JsonRawValue val data: String,
+){
+    val insightsViewMode = "Issues"
+}
+
+
+data class SetIssuesDataListMessage(val payload: SetIssuesData, val error: ErrorPayload? = null) {
     val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
     val action = "ISSUES/SET_DATA_LIST"
 }