review

Author: ethanndickson

Coder Desktop/Coder Desktop/Preview Content/PreviewVPN.swift

@@ -2,21 +2,21 @@ import SwiftUI
 
 class PreviewVPN: Coder_Desktop.VPNService {
     @Published var state: Coder_Desktop.VPNServiceState = .disabled
-    @Published var agents: [Coder_Desktop.AgentRow] = [
-        AgentRow(id: UUID(), name: "dogfood2", status: .red, copyableDNS: "asdf.coder", workspaceName: "dogfood2"),
-        AgentRow(id: UUID(), name: "testing-a-very-long-name", status: .green, copyableDNS: "asdf.coder",
+    @Published var agents: [Coder_Desktop.Agent] = [
+        Agent(id: UUID(), name: "dogfood2", status: .error, copyableDNS: "asdf.coder", workspaceName: "dogfood2"),
+        Agent(id: UUID(), name: "testing-a-very-long-name", status: .okay, copyableDNS: "asdf.coder",
                  workspaceName: "testing-a-very-long-name"
         ),
-        AgentRow(id: UUID(), name: "opensrc", status: .yellow, copyableDNS: "asdf.coder", workspaceName: "opensrc"),
-        AgentRow(id: UUID(), name: "gvisor", status: .gray, copyableDNS: "asdf.coder", workspaceName: "gvisor"),
-        AgentRow(id: UUID(), name: "example", status: .gray, copyableDNS: "asdf.coder", workspaceName: "example"),
-        AgentRow(id: UUID(), name: "dogfood2", status: .red, copyableDNS: "asdf.coder", workspaceName: "dogfood2"),
-        AgentRow(id: UUID(), name: "testing-a-very-long-name", status: .green, copyableDNS: "asdf.coder",
+        Agent(id: UUID(), name: "opensrc", status: .warn, copyableDNS: "asdf.coder", workspaceName: "opensrc"),
+        Agent(id: UUID(), name: "gvisor", status: .off, copyableDNS: "asdf.coder", workspaceName: "gvisor"),
+        Agent(id: UUID(), name: "example", status: .off, copyableDNS: "asdf.coder", workspaceName: "example"),
+        Agent(id: UUID(), name: "dogfood2", status: .error, copyableDNS: "asdf.coder", workspaceName: "dogfood2"),
+        Agent(id: UUID(), name: "testing-a-very-long-name", status: .okay, copyableDNS: "asdf.coder",
                  workspaceName: "testing-a-very-long-name"
         ),
-        AgentRow(id: UUID(), name: "opensrc", status: .yellow, copyableDNS: "asdf.coder", workspaceName: "opensrc"),
-        AgentRow(id: UUID(), name: "gvisor", status: .gray, copyableDNS: "asdf.coder", workspaceName: "gvisor"),
-        AgentRow(id: UUID(), name: "example", status: .gray, copyableDNS: "asdf.coder", workspaceName: "example"),
+        Agent(id: UUID(), name: "opensrc", status: .warn, copyableDNS: "asdf.coder", workspaceName: "opensrc"),
+        Agent(id: UUID(), name: "gvisor", status: .off, copyableDNS: "asdf.coder", workspaceName: "gvisor"),
+        Agent(id: UUID(), name: "example", status: .off, copyableDNS: "asdf.coder", workspaceName: "example"),
     ]
     let shouldFail: Bool
 

Coder Desktop/Coder Desktop/VPNService.swift

@@ -2,7 +2,7 @@ import SwiftUI
 
 protocol VPNService: ObservableObject {
     var state: VPNServiceState { get }
-    var agents: [AgentRow] { get }
+    var agents: [Agent] { get }
     func start() async
     // Stop must be idempotent
     func stop() async

Coder Desktop/Coder Desktop/Views/AgentRow.swift renamed to Coder Desktop/Coder Desktop/Views/Agent.swift

@@ -1,15 +1,31 @@
 import SwiftUI
 
-struct AgentRow: Identifiable, Equatable {
+struct Agent: Identifiable, Equatable {
     let id: UUID
     let name: String
-    let status: Color
+    let status: AgentStatus
     let copyableDNS: String
     let workspaceName: String
 }
 
+enum AgentStatus: Equatable {
+    case okay
+    case warn
+    case error
+    case off
+
+    public var color: Color {
+        switch self {
+        case .okay: return .green
+        case .warn: return .yellow
+        case .error: return .red
+        case .off: return .gray
+        }
+    }
+}
+
 struct AgentRowView: View {
-    let workspace: AgentRow
+    let workspace: Agent
     let baseAccessURL: URL
     @State private var nameIsSelected: Bool = false
     @State private var copyIsSelected: Bool = false
@@ -34,10 +50,10 @@ struct AgentRowView: View {
                 HStack(spacing: Theme.Size.trayPadding) {
                     ZStack {
                         Circle()
-                            .fill(workspace.status.opacity(0.4))
+                            .fill(workspace.status.color.opacity(0.4))
                             .frame(width: 12, height: 12)
                         Circle()
-                            .fill(workspace.status.opacity(1.0))
+                            .fill(workspace.status.color.opacity(1.0))
                             .frame(width: 7, height: 7)
                     }
                     Text(fmtWsName).lineLimit(1).truncationMode(.tail)

Coder Desktop/Coder DesktopTests/AgentsTests.swift

@@ -3,12 +3,12 @@ import ViewInspector
 import XCTest
 
 final class AgentsTests: XCTestCase {
-    private func createMockAgents(count: Int) -> [AgentRow] {
+    private func createMockAgents(count: Int) -> [Agent] {
         return (1...count).map {
-            AgentRow(
+            Agent(
                 id: UUID(),
                 name: "a\($0)",
-                status: .green,
+                status: .okay,
                 copyableDNS: "a\($0).example.com",
                 workspaceName: "w\($0)"
             )

Coder Desktop/Coder DesktopTests/Util.swift

@@ -4,7 +4,7 @@ import SwiftUI
 class MockVPNService: VPNService, ObservableObject {
     @Published var state: Coder_Desktop.VPNServiceState = .disabled
     @Published var baseAccessURL: URL = URL(string: "https://dev.coder.com")!
-    @Published var agents: [Coder_Desktop.AgentRow] = []
+    @Published var agents: [Coder_Desktop.Agent] = []
     var onStart: (() async -> Void)?
     var onStop: (() async -> Void)?