Simplify agent model list

code-asher · code-asher · commit 3b06d9fd6e1a · 2023-04-25T14:01:35.000-08:00
We can just check if the list is empty then add the workspace-only
"agent" model rather than duplicate the block.
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -687,86 +687,57 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
     }
 
     private fun Workspace.toAgentModels(): Set<WorkspaceAgentModel> {
-        return when (this.latestBuild.resources.size) {
-            0 -> {
-                val wm = WorkspaceAgentModel(
-                    this.id,
-                    this.name,
-                    this.name,
-                    this.templateID,
-                    this.templateName,
-                    this.templateIcon,
-                    null,
-                    WorkspaceVersionStatus.from(this),
-                    WorkspaceAgentStatus.from(this),
-                    this.latestBuild.transition,
-                    null,
-                    null,
-                    null
-                )
-                cs.launch(Dispatchers.IO) {
-                    wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)
-                    withContext(Dispatchers.Main) {
-                        tableOfWorkspaces.updateUI()
-                    }
+        val wam = this.latestBuild.resources.filter { it.agents != null }.flatMap { it.agents!! }.map { agent ->
+            val workspaceWithAgentName = "${this.name}.${agent.name}"
+            val wm = WorkspaceAgentModel(
+                this.id,
+                this.name,
+                workspaceWithAgentName,
+                this.templateID,
+                this.templateName,
+                this.templateIcon,
+                null,
+                WorkspaceVersionStatus.from(this),
+                WorkspaceAgentStatus.from(this),
+                this.latestBuild.transition,
+                OS.from(agent.operatingSystem),
+                Arch.from(agent.architecture),
+                agent.expandedDirectory ?: agent.directory,
+            )
+            cs.launch(Dispatchers.IO) {
+                wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)
+                withContext(Dispatchers.Main) {
+                    tableOfWorkspaces.updateUI()
                 }
-                setOf(wm)
             }
-
-            else -> {
-                val wam = this.latestBuild.resources.filter { it.agents != null }.flatMap { it.agents!! }.map { agent ->
-                    val workspaceWithAgentName = "${this.name}.${agent.name}"
-                    val wm = WorkspaceAgentModel(
-                        this.id,
-                        this.name,
-                        workspaceWithAgentName,
-                        this.templateID,
-                        this.templateName,
-                        this.templateIcon,
-                        null,
-                        WorkspaceVersionStatus.from(this),
-                        WorkspaceAgentStatus.from(this),
-                        this.latestBuild.transition,
-                        OS.from(agent.operatingSystem),
-                        Arch.from(agent.architecture),
-                        agent.expandedDirectory ?: agent.directory,
-                    )
-                    cs.launch(Dispatchers.IO) {
-                        wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)
-                        withContext(Dispatchers.Main) {
-                            tableOfWorkspaces.updateUI()
-                        }
-                    }
-                    wm
-                }.toSet()
-
-                if (wam.isNullOrEmpty()) {
-                    val wm = WorkspaceAgentModel(
-                        this.id,
-                        this.name,
-                        this.name,
-                        this.templateID,
-                        this.templateName,
-                        this.templateIcon,
-                        null,
-                        WorkspaceVersionStatus.from(this),
-                        WorkspaceAgentStatus.from(this),
-                        this.latestBuild.transition,
-                        null,
-                        null,
-                        null
-                    )
-                    cs.launch(Dispatchers.IO) {
-                        wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)
-                        withContext(Dispatchers.Main) {
-                            tableOfWorkspaces.updateUI()
-                        }
-                    }
-                    return setOf(wm)
+            wm
+        }.toSet()
+
+        if (wam.isNullOrEmpty()) {
+            val wm = WorkspaceAgentModel(
+                this.id,
+                this.name,
+                this.name,
+                this.templateID,
+                this.templateName,
+                this.templateIcon,
+                null,
+                WorkspaceVersionStatus.from(this),
+                WorkspaceAgentStatus.from(this),
+                this.latestBuild.transition,
+                null,
+                null,
+                null
+            )
+            cs.launch(Dispatchers.IO) {
+                wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)
+                withContext(Dispatchers.Main) {
+                    tableOfWorkspaces.updateUI()
                 }
-                return wam
             }
+            return setOf(wm)
         }
+        return wam
     }
 
     override fun onPrevious() {
