Skip to content

Commit 8b56181

Browse files
Merge pull request #2552 from digma-ai/fix-tool-window-flow
Change the flow of window opening
2 parents 570f6e9 + bcaff58 commit 8b56181

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

ide-common/src/main/kotlin/org/digma/intellij/plugin/scope/ScopeManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ScopeManager(private val project: Project) {
2828
}
2929

3030
fun changeToHome(
31-
isCalledFromReact: Boolean = false,
31+
openMainPanel: Boolean = false,
3232
scopeContext: ScopeContext? = null,
3333
environmentId: String? = null
3434
) {
@@ -47,7 +47,7 @@ class ScopeManager(private val project: Project) {
4747
if (!PersistenceService.getInstance().isFirstWizardLaunch()) {
4848
MainToolWindowCardsController.getInstance(project).closeCoveringViewsIfNecessary()
4949

50-
if (!isCalledFromReact) {
50+
if (openMainPanel) {
5151
// if react called changeToHome it's ok not to show the tool window, usually its on connection events.
5252
ToolWindowShower.getInstance(project).showToolWindow()
5353
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
399399
payload?.let { pl ->
400400

401401
val changeScopeMessage = jsonToObject(pl, ChangeScopeMessage::class.java)
402-
403402
changeScopeMessage.span?.spanCodeObjectId?.let { spanId ->
404403
val spanScope = SpanScope(spanId)
405404
ScopeManager.getInstance(project).changeScope(
@@ -408,7 +407,7 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
408407
environmentId = changeScopeMessage.environmentId
409408
)
410409
} ?: ScopeManager.getInstance(project).changeToHome(
411-
isCalledFromReact = true,
410+
openMainPanel = changeScopeMessage.openMainPanel ?: false,
412411
scopeContext = changeScopeMessage.context,
413412
environmentId = changeScopeMessage.environmentId
414413
)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ data class ChangeScopeMessage
2020
@ConstructorProperties(
2121
"span",
2222
"environmentId",
23-
"context"
23+
"context",
24+
"openMainPanel"
2425
)
2526
constructor(
2627
val span: ChangeScopeSpan? = null,
2728
val environmentId: String? = null,
28-
val context: ScopeContext? = null
29+
val context: ScopeContext? = null,
30+
val openMainPanel: Boolean? = null
2931
)
3032

3133

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)