Skip to content

Commit b917405

Browse files
committed
Fix tab switch
1 parent a256799 commit b917405

File tree

4 files changed

+67
-39
lines changed

4 files changed

+67
-39
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import org.digma.intellij.plugin.ui.insights.model.SetDismissedData
2121
import org.digma.intellij.plugin.ui.insights.model.SetDismissedMessage
2222
import org.digma.intellij.plugin.ui.insights.model.SetInsightDataListMessage
2323
import org.digma.intellij.plugin.ui.insights.model.SetInsightsAsReadData
24+
import org.digma.intellij.plugin.ui.insights.model.SetInsightsData
2425
import org.digma.intellij.plugin.ui.insights.model.SetInsightsMarkAsReadMessage
26+
import org.digma.intellij.plugin.ui.insights.model.SetIssuesData
2527
import org.digma.intellij.plugin.ui.insights.model.SetIssuesDataListMessage
2628
import org.digma.intellij.plugin.ui.insights.model.SetIssuesFilterMessage
2729
import org.digma.intellij.plugin.ui.insights.model.SetUnDismissedData
@@ -56,15 +58,15 @@ class InsightsService(val project: Project) : InsightsServiceImpl(project) {
5658
}
5759

5860
fun refreshInsightsList(backendQueryParams: MutableMap<String, Any>) {
59-
61+
val viewMode = backendQueryParams["insightViewType"] as String;
6062
val message = try {
6163
val insights = AnalyticsService.getInstance(project).getInsights(backendQueryParams)
6264
onInsightReceived(insights)
63-
SetInsightDataListMessage(insights)
65+
SetInsightDataListMessage(SetInsightsData(insights, viewMode))
6466
} catch (e: AnalyticsServiceException) {
6567
Log.debugWithException(logger, project, e, "Error loading insights {}", e.message)
6668
val error = ErrorPayload(e.nonNullMessage)
67-
SetInsightDataListMessage("{\"totalCount\":0,\"insights\":[]}",error)
69+
SetInsightDataListMessage(SetInsightsData("{\"totalCount\":0,\"insights\":[]}", viewMode), error)
6870
}
6971

7072
jCefComponent?.let {
@@ -73,13 +75,13 @@ class InsightsService(val project: Project) : InsightsServiceImpl(project) {
7375
}
7476

7577
fun refreshIssuesList(request: GetIssuesRequestPayload) {
76-
val message = try {
78+
val message = try {
7779
val issues = AnalyticsService.getInstance(project).getIssues(request)
78-
SetIssuesDataListMessage(issues)
80+
SetIssuesDataListMessage(SetIssuesData(issues))
7981
} catch (e: AnalyticsServiceException) {
8082
Log.debugWithException(logger, project, e, "Error loading issues {}", e.message)
8183
val error = ErrorPayload(e.nonNullMessage)
82-
SetIssuesDataListMessage("{\"totalCount\":0,\"insights\":[]}", error)
84+
SetIssuesDataListMessage(SetIssuesData("{\"totalCount\":0,\"insights\":[]}"), error)
8385
}
8486

8587
jCefComponent?.let {
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
package org.digma.intellij.plugin.ui.insights.model
22

3+
import com.fasterxml.jackson.annotation.JsonCreator
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
35
import com.fasterxml.jackson.annotation.JsonRawValue
46
import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
57
import org.digma.intellij.plugin.ui.jcef.model.ErrorPayload
8+
import java.beans.ConstructorProperties
69

7-
data class SetInsightDataListMessage( @JsonRawValue val payload: String,val error: ErrorPayload? = null) {
10+
@JsonIgnoreProperties(ignoreUnknown = true)
11+
data class SetInsightsData
12+
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
13+
@ConstructorProperties("data", "viewMode")
14+
constructor(
15+
@JsonRawValue val data: String,
16+
val insightsViewMode: String
17+
)
18+
19+
data class SetInsightDataListMessage(val payload: SetInsightsData, val error: ErrorPayload? = null) {
820
val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
921
val action = "INSIGHTS/SET_DATA_LIST"
1022
}
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
package org.digma.intellij.plugin.ui.insights.model
22

3+
import com.fasterxml.jackson.annotation.JsonCreator
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
35
import com.fasterxml.jackson.annotation.JsonRawValue
46
import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
57
import org.digma.intellij.plugin.ui.jcef.model.ErrorPayload
8+
import java.beans.ConstructorProperties
69

7-
data class SetIssuesDataListMessage(@JsonRawValue val payload: String, val error: ErrorPayload? = null) {
10+
@JsonIgnoreProperties(ignoreUnknown = true)
11+
data class SetIssuesData
12+
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
13+
@ConstructorProperties("data")
14+
constructor(
15+
@JsonRawValue val data: String,
16+
){
17+
val insightsViewMode = "Issues"
18+
}
19+
20+
21+
data class SetIssuesDataListMessage(val payload: SetIssuesData, val error: ErrorPayload? = null) {
822
val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
923
val action = "ISSUES/SET_DATA_LIST"
1024
}

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

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)