refactor: explicitly request the main page with URL visible

fioan89 · fioan89 · commit 3f71848ca062 · 2025-04-04T01:13:51.000+03:00
- i.e. with the header page expanded
diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteEnvironment.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteEnvironment.kt
@@ -177,7 +177,7 @@ class CoderRemoteEnvironment(
                         while (context.cs.isActive && workspaceStillExists) {
                             if (wsRawStatus == WorkspaceAndAgentStatus.DELETING || wsRawStatus == WorkspaceAndAgentStatus.DELETED) {
                                 workspaceStillExists = false
-                                context.envPageManager.showPluginEnvironmentsPage(true)
+                                context.envPageManager.showMainPageWithUrlVisible()
                             } else {
                                 delay(1.seconds)
                             }
diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
@@ -288,7 +288,7 @@ class CoderRemoteProvider(
      * than using multiple root pages.
      */
     private fun goToEnvironmentsPage() {
-        context.envPageManager.showPluginEnvironmentsPage(true)
+        context.envPageManager.showMainPageWithUrlVisible()
     }
 
     /**
diff --git a/src/main/kotlin/com/coder/toolbox/EnvironmentUiPageManagerExtensions.kt b/src/main/kotlin/com/coder/toolbox/EnvironmentUiPageManagerExtensions.kt
@@ -0,0 +1,7 @@
+package com.coder.toolbox
+
+import com.jetbrains.toolbox.api.remoteDev.ui.EnvironmentUiPageManager
+
+fun EnvironmentUiPageManager.showMainPageWithUrlVisible() {
+    showPluginEnvironmentsPage(true)
+}
diff --git a/src/main/kotlin/com/coder/toolbox/util/CoderProtocolHandler.kt b/src/main/kotlin/com/coder/toolbox/util/CoderProtocolHandler.kt
@@ -9,6 +9,7 @@ import com.coder.toolbox.sdk.CoderRestClient
 import com.coder.toolbox.sdk.v2.models.Workspace
 import com.coder.toolbox.sdk.v2.models.WorkspaceAgent
 import com.coder.toolbox.sdk.v2.models.WorkspaceStatus
+import com.coder.toolbox.showMainPageWithUrlVisible
 import com.jetbrains.toolbox.api.localization.LocalizableString
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.delay
@@ -322,7 +323,7 @@ private suspend fun CoderToolboxContext.showInfoPopup(
 
 private fun CoderToolboxContext.popupPluginMainPage() {
     this.ui.showWindow()
-    this.envPageManager.showPluginEnvironmentsPage(true)
+    this.envPageManager.showMainPageWithUrlVisible()
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ class CoderRemoteEnvironment(`
`177`	`177`	`while (context.cs.isActive && workspaceStillExists) {`
`178`	`178`	`if (wsRawStatus == WorkspaceAndAgentStatus.DELETING \|\| wsRawStatus == WorkspaceAndAgentStatus.DELETED) {`
`179`	`179`	`workspaceStillExists = false`
`180`		`- context.envPageManager.showPluginEnvironmentsPage(true)`
	`180`	`+ context.envPageManager.showMainPageWithUrlVisible()`
`181`	`181`	`} else {`
`182`	`182`	`delay(1.seconds)`
`183`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ class CoderRemoteProvider(`
`288`	`288`	`* than using multiple root pages.`
`289`	`289`	`*/`
`290`	`290`	`private fun goToEnvironmentsPage() {`
`291`		`- context.envPageManager.showPluginEnvironmentsPage(true)`
	`291`	`+ context.envPageManager.showMainPageWithUrlVisible()`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`/**`