From 821ab26a4dea13130a049a56594ad29bb3fcdb17 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 20 Apr 2023 14:00:58 -0800 Subject: [PATCH] Use expanded directory if available The JetBrains remote does not expand them so you get errors like "~/coder does not exist". --- .../kotlin/com/coder/gateway/sdk/v2/models/WorkspaceAgent.kt | 5 +++-- .../com/coder/gateway/views/steps/CoderWorkspacesStepView.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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 index 727a9097..8f05e4bd 100644 --- 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, @SerializedName("latency") val derpLatency: Map?, @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 -) \ No newline at end of file +) diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt index 8cf9ff8a..ac1c545b 100644 --- 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)