Skip to content

Commit a00a453

Browse files
authored
Merge pull request #2105 from digma-ai/feature/asset-naviagation
Feature/asset naviagation
2 parents e80343b + fe6139e commit a00a453

File tree

5 files changed

+95
-49
lines changed

5 files changed

+95
-49
lines changed

ide-common/src/main/kotlin/org/digma/intellij/plugin/navigation/MainContentViewSwitcher.kt

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.google.common.base.Objects
55
import com.intellij.openapi.components.Service
66
import com.intellij.openapi.components.service
77
import com.intellij.openapi.project.Project
8+
import org.digma.intellij.plugin.navigation.View.Companion.Assets
89
import org.digma.intellij.plugin.navigation.View.Companion.getSelected
910
import org.digma.intellij.plugin.navigation.View.Companion.hideErrorDetails
1011
import org.digma.intellij.plugin.navigation.View.Companion.hideErrors
@@ -70,13 +71,15 @@ class MainContentViewSwitcher(val project: Project) {
7071
}
7172

7273
private fun showView(view: View, fireEvent: Boolean, isTriggeredByJcef: Boolean) {
73-
7474
if (view == View.ErrorDetails) {
7575
hideErrors()
7676
} else {
7777
project.service<ErrorsViewOrchestrator>().closeErrorDetails()
7878
hideErrorDetails()
7979
}
80+
if (view != View.Assets) {
81+
View.Assets.path = null;
82+
}
8083

8184
if (view == View.Insights && getSelected() != View.Insights) {
8285
ActivityMonitor.getInstance(project).clearLastInsightsViewed()
@@ -109,6 +112,16 @@ class MainContentViewSwitcher(val project: Project) {
109112
}
110113

111114
fun showViewById(viewId: String, isTriggeredByJcef: Boolean = false) {
115+
val segments = viewId.split("/")
116+
if (segments[1] == "assets") {
117+
if (segments.count() > 2) {
118+
Assets.path = viewId.removePrefix("/assets/");
119+
} else {
120+
Assets.path = null
121+
}
122+
showView(Assets, isTriggeredByJcef = isTriggeredByJcef)
123+
}
124+
112125
View.findById(viewId)?.let { view ->
113126
showView(view, isTriggeredByJcef = isTriggeredByJcef)
114127
}
@@ -135,6 +148,7 @@ private constructor(
135148
@get:JsonProperty("isHidden")
136149
@param:JsonProperty("isHidden")
137150
var isHidden: Boolean = false,
151+
var path: String? = null,
138152
) {
139153

140154
override fun equals(other: Any?): Boolean {
@@ -147,13 +161,13 @@ private constructor(
147161

148162
companion object {
149163

150-
val Highlights = View(title = "", id = "highlights", cardName = "highlights")
151-
val Insights = View(title = "Issues", id = "insights", cardName = "insights", isSelected = true)
152-
val Assets = View("Assets", "assets", "assets")
153-
val Errors = View("Errors", "errors", "errors")
154-
val ErrorDetails = View(title = "Error Details", id = "errorsDetails", cardName = "errors", isHidden = true)
155-
val Tests = View("Tests", "tests", "tests")
156-
val Analytics = View("Analytics", "analytics", "analytics")
164+
val Highlights = View(title = "", id = "/highlights", cardName = "highlights")
165+
val Insights = View(title = "Issues", id = "/insights", cardName = "insights", isSelected = true)
166+
val Assets = View("Assets", "/assets", "assets")
167+
val Errors = View("Errors", "/errors", "errors")
168+
val ErrorDetails = View(title = "Error Details", id = "/errors/details", cardName = "errors", isHidden = true)
169+
val Tests = View("Tests", "/tests", "tests")
170+
val Analytics = View("Analytics", "/analytics", "analytics")
157171

158172

159173
val views = listOf(Highlights, Insights, Assets, Analytics, Errors, ErrorDetails, Tests)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
309309
payload?.let {
310310
val viewId = payload.get("view")?.asText()
311311
viewId?.let { vuid ->
312-
MainContentViewSwitcher.getInstance(project).showViewById(vuid, true)
312+
MainContentViewSwitcher.getInstance(project).showViewById(vuid, payload.get("isUserAction")?.asBoolean() ?: true)
313313
}
314314
}
315315
}

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

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

0 commit comments

Comments
 (0)