Split agent status icon and label

So we can show just the icon in the recent connections view.

Author: code-asher

src/main/kotlin/com/coder/gateway/icons/CoderIcons.kt

@@ -8,6 +8,10 @@ object CoderIcons {
 
     val OPEN_TERMINAL = IconLoader.getIcon("open_terminal.svg", javaClass)
 
+    val PENDING = IconLoader.getIcon("pending.svg", javaClass)
+    val RUNNING = IconLoader.getIcon("running.svg", javaClass)
+    val OFF = IconLoader.getIcon("off.svg", javaClass)
+
     val HOME = IconLoader.getIcon("homeFolder.svg", javaClass)
     val CREATE = IconLoader.getIcon("create.svg", javaClass)
     val RUN = IconLoader.getIcon("run.svg", javaClass)
@@ -55,4 +59,4 @@ object CoderIcons {
     val Y = IconLoader.getIcon("y.svg", javaClass)
     val Z = IconLoader.getIcon("z.svg", javaClass)
 
-}
+}

src/main/kotlin/com/coder/gateway/models/WorkspaceAndAgentStatus.kt

@@ -1,44 +1,46 @@
 package com.coder.gateway.models
 
+import com.coder.gateway.icons.CoderIcons
 import com.coder.gateway.sdk.v2.models.Workspace
 import com.coder.gateway.sdk.v2.models.WorkspaceAgent
 import com.coder.gateway.sdk.v2.models.WorkspaceAgentLifecycleState
 import com.coder.gateway.sdk.v2.models.WorkspaceAgentStatus
 import com.coder.gateway.sdk.v2.models.WorkspaceStatus
 import com.intellij.ui.JBColor
+import javax.swing.Icon
 
 /**
  * WorkspaceAndAgentStatus represents the combined status of a single agent and
  * its workspace (or just the workspace if there are no agents).
  */
-enum class WorkspaceAndAgentStatus(val label: String, val description: String) {
+enum class WorkspaceAndAgentStatus(val icon: Icon, val label: String, val description: String) {
     // Workspace states.
-    QUEUED("◍ Queued", "The workspace is queueing to start."),
-    STARTING("⦿ Starting", "The workspace is starting."),
-    FAILED("ⓧ Failed", "The workspace has failed to start."),
-    DELETING("⦸ Deleting", "The workspace is being deleted."),
-    DELETED("⦸ Deleted", "The workspace has been deleted."),
-    STOPPING("◍ Stopping", "The workspace is stopping."),
-    STOPPED("◍ Stopped", "The workspace has stopped."),
-    CANCELING("◍ Canceling action", "The workspace is being canceled."),
-    CANCELED("◍ Canceled action", "The workspace has been canceled."),
-    RUNNING("⦿ Running", "The workspace is running, waiting for agents."),
+    QUEUED(CoderIcons.PENDING, "Queued", "The workspace is queueing to start."),
+    STARTING(CoderIcons.PENDING, "Starting", "The workspace is starting."),
+    FAILED(CoderIcons.OFF, "Failed", "The workspace has failed to start."),
+    DELETING(CoderIcons.PENDING, "Deleting", "The workspace is being deleted."),
+    DELETED(CoderIcons.OFF, "Deleted", "The workspace has been deleted."),
+    STOPPING(CoderIcons.PENDING, "Stopping", "The workspace is stopping."),
+    STOPPED(CoderIcons.OFF, "Stopped", "The workspace has stopped."),
+    CANCELING(CoderIcons.PENDING, "Canceling action", "The workspace is being canceled."),
+    CANCELED(CoderIcons.OFF, "Canceled action", "The workspace has been canceled."),
+    RUNNING(CoderIcons.RUN, "Running", "The workspace is running, waiting for agents."),
 
     // Agent states.
-    CONNECTING("⦿ Connecting", "The agent is connecting."),
-    DISCONNECTED("⦸ Disconnected", "The agent has disconnected."),
-    TIMEOUT("ⓧ Timeout", "The agent is taking longer than expected to connect."),
-    AGENT_STARTING("⦿ Starting", "The startup script is running."),
-    AGENT_STARTING_READY("⦿ Starting", "The startup script is still running but the agent is ready to accept connections."),
-    CREATED("⦿ Created", "The agent has been created."),
-    START_ERROR("◍ Started with error", "The agent is ready but the startup script errored."),
-    START_TIMEOUT("◍ Starting", "The startup script is taking longer than expected."),
-    START_TIMEOUT_READY("◍ Starting", "The startup script is taking longer than expected but the agent is ready to accept connections."),
-    SHUTTING_DOWN("◍ Shutting down", "The agent is shutting down."),
-    SHUTDOWN_ERROR("⦸ Shutdown with error", "The agent shut down but the shutdown script errored."),
-    SHUTDOWN_TIMEOUT("⦸ Shutting down", "The shutdown script is taking longer than expected."),
-    OFF("⦸ Off", "The agent has shut down."),
-    READY("⦿ Ready", "The agent is ready to accept connections.");
+    CONNECTING(CoderIcons.PENDING, "Connecting", "The agent is connecting."),
+    DISCONNECTED(CoderIcons.OFF, "Disconnected", "The agent has disconnected."),
+    TIMEOUT(CoderIcons.PENDING, "Timeout", "The agent is taking longer than expected to connect."),
+    AGENT_STARTING(CoderIcons.PENDING, "Starting", "The startup script is running."),
+    AGENT_STARTING_READY(CoderIcons.RUNNING, "Starting", "The startup script is still running but the agent is ready to accept connections."),
+    CREATED(CoderIcons.PENDING, "Created", "The agent has been created."),
+    START_ERROR(CoderIcons.RUNNING, "Started with error", "The agent is ready but the startup script errored."),
+    START_TIMEOUT(CoderIcons.PENDING, "Starting", "The startup script is taking longer than expected."),
+    START_TIMEOUT_READY(CoderIcons.RUNNING, "Starting", "The startup script is taking longer than expected but the agent is ready to accept connections."),
+    SHUTTING_DOWN(CoderIcons.PENDING, "Shutting down", "The agent is shutting down."),
+    SHUTDOWN_ERROR(CoderIcons.OFF, "Shutdown with error", "The agent shut down but the shutdown script errored."),
+    SHUTDOWN_TIMEOUT(CoderIcons.OFF, "Shutting down", "The shutdown script is taking longer than expected."),
+    OFF(CoderIcons.OFF, "Off", "The agent has shut down."),
+    READY(CoderIcons.RUNNING, "Ready", "The agent is ready to accept connections.");
 
     fun statusColor(): JBColor = when (this) {
         READY, AGENT_STARTING_READY, START_TIMEOUT_READY -> JBColor.GREEN
@@ -100,7 +102,5 @@ enum class WorkspaceAndAgentStatus(val label: String, val description: String) {
             WorkspaceStatus.DELETING -> DELETING
             WorkspaceStatus.DELETED -> DELETED
         }
-
-        fun from(str: String) = WorkspaceAndAgentStatus.values().first { it.label.contains(str, true) }
     }
 }

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

@@ -5,7 +5,6 @@ import com.coder.gateway.icons.CoderIcons
 import com.coder.gateway.models.CoderWorkspacesWizardModel
 import com.coder.gateway.models.TokenSource
 import com.coder.gateway.models.WorkspaceAgentModel
-import com.coder.gateway.models.WorkspaceAndAgentStatus
 import com.coder.gateway.models.WorkspaceVersionStatus
 import com.coder.gateway.sdk.CoderCLIManager
 import com.coder.gateway.sdk.CoderRestClientService
@@ -860,12 +859,13 @@ class WorkspacesTableModel : ListTableModel<WorkspaceAgentModel>(
 
         override fun getRenderer(item: WorkspaceAgentModel?): TableCellRenderer {
             return object : DefaultTableCellRenderer() {
+                private val workspace = item
                 override fun getTableCellRendererComponent(table: JTable, value: Any, isSelected: Boolean, hasFocus: Boolean, row: Int, column: Int): Component {
                     super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column)
                     if (value is String) {
                         text = value
-                        foreground = WorkspaceAndAgentStatus.from(value).statusColor()
-                        toolTipText = WorkspaceAndAgentStatus.from(value).description
+                        foreground = workspace?.agentStatus?.statusColor()
+                        toolTipText = workspace?.agentStatus?.description
                     }
                     font = table.tableHeader.font
                     border = JBUI.Borders.empty(0, 8)