Fix: terminal link for workspaces with a single agent

- resolves #65

Author: fioan89

CHANGELOG.md

@@ -3,18 +3,26 @@
 # coder-gateway Changelog
 
 ## [Unreleased]
+
 ### Added
+
 - support for displaying workspace version
 - support for managing the lifecycle of a workspace, i.e. start and stop
 
+### Fixed
+
+- terminal link for workspaces with a single agent
+
 ### Changed
+
 - workspace panel is now updated every 5 seconds
 
 ## [2.0.2]
+
 ### Added
-- support for displaying working and non-working workspaces
-- better support for Light and Dark themes in the "Status" column 
 
+- support for displaying working and non-working workspaces
+- better support for Light and Dark themes in the "Status" column
 
 ### Fixed
 - left panel is no longer visible when a new connection is triggered from Coder's "Recent Workspaces" panel.

src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt

@@ -111,7 +111,7 @@ class CoderLocateRemoteProjectStepView(private val disableNextAction: () -> Unit
 
         tfProject.text = if (selectedWorkspace.homeDirectory.isNullOrBlank()) "/home" else selectedWorkspace.homeDirectory
         titleLabel.text = CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.choose.text", selectedWorkspace.name)
-        terminalLink.url = "${coderClient.coderURL}/@${coderClient.me.username}/${selectedWorkspace.name}.coder/terminal"
+        terminalLink.url = "${coderClient.coderURL}/@${coderClient.me.username}/${selectedWorkspace.name}/terminal"
 
         cs.launch {
             logger.info("Retrieving available IDE's for ${selectedWorkspace.name} workspace...")

src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt

@@ -348,37 +348,20 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                     )
                 }
 
-                1 -> {
-                    listOf(
-                        WorkspaceAgentModel(
-                            this.id,
-                            this.name,
-                            this.name,
-                            this.templateName,
-                            WorkspaceVersionStatus.from(this),
-                            WorkspaceAgentStatus.from(this),
-                            OS.from(agents[0].operatingSystem),
-                            Arch.from(agents[0].architecture),
-                            agents[0].directory
-                        )
-                    )
-                }
-
                 else -> agents.map { agent ->
-                    val workspaceName = "${this.name}.${agent.name}"
+                    val workspaceWithAgentName = "${this.name}.${agent.name}"
                     WorkspaceAgentModel(
                         this.id,
                         this.name,
-                        workspaceName,
+                        workspaceWithAgentName,
                         this.templateName,
                         WorkspaceVersionStatus.from(this),
                         WorkspaceAgentStatus.from(this),
                         OS.from(agent.operatingSystem),
                         Arch.from(agent.architecture),
                         agent.directory
                     )
-                }
-                    .toList()
+                }.toList()
             }
         } catch (e: Exception) {
             logger.warn("Agent(s) for ${this.name} could not be retrieved. Reason: $e")