Use expanded directory if available (#227)

code-asher · web-flow · commit ca68ef3d081b · 2023-04-21T09:24:16.000-08:00
The JetBrains remote does not expand them so you get errors like
"~/coder does not exist".
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspaceAgent.kt b/src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspaceAgent.kt
@@ -20,11 +20,12 @@ data class WorkspaceAgent(
     @SerializedName("operating_system") val operatingSystem: String,
     @SerializedName("startup_script") val startupScript: String?,
     @SerializedName("directory") val directory: String?,
+    @SerializedName("expanded_directory") val expandedDirectory: String?,
     @SerializedName("version") val version: String,
     @SerializedName("apps") val apps: List<WorkspaceApp>,
     @SerializedName("latency") val derpLatency: Map<String, DERPRegion>?,
     @SerializedName("connection_timeout_seconds") val connectionTimeoutSeconds: Int,
-    @SerializedName("troubleshooting_url") val troubleshootingURL: String
+    @SerializedName("troubleshooting_url") val troubleshootingURL: String,
 )
 
 enum class WorkspaceAgentStatus {
@@ -44,4 +45,4 @@ enum class WorkspaceAgentStatus {
 data class DERPRegion(
     @SerializedName("preferred") val preferred: Boolean,
     @SerializedName("latency_ms") val latencyMillis: Double
-)
+)
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -655,7 +655,7 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
                         this.latestBuild.transition,
                         OS.from(agent.operatingSystem),
                         Arch.from(agent.architecture),
-                        agent.directory
+                        agent.expandedDirectory ?: agent.directory,
                     )
                     cs.launch(Dispatchers.IO) {
                         wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod`
`655`	`655`	`this.latestBuild.transition,`
`656`	`656`	`OS.from(agent.operatingSystem),`
`657`	`657`	`Arch.from(agent.architecture),`
`658`		`- agent.directory`
	`658`	`+ agent.expandedDirectory ?: agent.directory,`
`659`	`659`	`)`
`660`	`660`	`cs.launch(Dispatchers.IO) {`
`661`	`661`	`wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)`