Use latestBuild resources when non-empty and add agent name (#489)

cdosso · web-flow · commit 803e9e649d2f · 2024-10-02T14:10:42.000-08:00
* Add Agent name in rows

* Fetch resources from workspace last_build instead of templateversions

* Add resources fallback if workspace latestBuild is empty
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClient.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClient.kt
@@ -182,7 +182,7 @@ open class CoderRestClient(
         // It is possible for there to be resources with duplicate names so we
         // need to use a set.
         return workspaces.flatMap { ws ->
-            resources(ws).filter { it.agents != null }.flatMap { it.agents!! }.map {
+            ws.latestBuild.resources.ifEmpty { resources(ws) }.filter { it.agents != null }.flatMap { it.agents!! }.map {
                 "${ws.name}.${it.name}"
             }
         }.toSet()
diff --git a/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt b/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt
@@ -244,7 +244,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
                                         foreground = Color.GRAY
                                     }
                                 }
-                                label("").resizableColumn().align(AlignX.FILL)
+                                label(workspaceProjectIDE.name.replace(workspaceName+".","")).resizableColumn()
                                 label(workspaceProjectIDE.ideName).applyToComponent {
                                     foreground = JBUI.CurrentTheme.ContextHelp.FOREGROUND
                                     font = ComponentPanelBuilder.getCommentFont(font)

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ open class CoderRestClient(`
`182`	`182`	`// It is possible for there to be resources with duplicate names so we`
`183`	`183`	`// need to use a set.`
`184`	`184`	`return workspaces.flatMap { ws ->`
`185`		`- resources(ws).filter { it.agents != null }.flatMap { it.agents!! }.map {`
	`185`	`+ ws.latestBuild.resources.ifEmpty { resources(ws) }.filter { it.agents != null }.flatMap { it.agents!! }.map {`
`186`	`186`	`"${ws.name}.${it.name}"`
`187`	`187`	`}`
`188`	`188`	`}.toSet()`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:`
`244`	`244`	`foreground = Color.GRAY`
`245`	`245`	`}`
`246`	`246`	`}`
`247`		`- label("").resizableColumn().align(AlignX.FILL)`
	`247`	`+ label(workspaceProjectIDE.name.replace(workspaceName+".","")).resizableColumn()`
`248`	`248`	`label(workspaceProjectIDE.ideName).applyToComponent {`
`249`	`249`	`foreground = JBUI.CurrentTheme.ContextHelp.FOREGROUND`
`250`	`250`	`font = ComponentPanelBuilder.getCommentFont(font)`