fix: use shortest fqdn as workspace display name

Author: ethanndickson

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

@@ -3,27 +3,27 @@ import SwiftUI
 
 @MainActor
 final class PreviewVPN: Coder_Desktop.VPNService {
-    @Published var state: Coder_Desktop.VPNServiceState = .disabled
+    @Published var state: Coder_Desktop.VPNServiceState = .connected
     @Published var menuState: VPNMenuState = .init(agents: [
-        UUID(): Agent(id: UUID(), name: "dev", status: .error, copyableDNS: "asdf.coder", wsName: "dogfood2",
+        UUID(): Agent(id: UUID(), name: "dev", status: .error, fqdns: ["asdf.coder"], wsName: "dogfood2",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .okay, copyableDNS: "asdf.coder",
+        UUID(): Agent(id: UUID(), name: "dev", status: .okay, fqdns: ["asdf.coder"],
                       wsName: "testing-a-very-long-name", wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .warn, copyableDNS: "asdf.coder", wsName: "opensrc",
+        UUID(): Agent(id: UUID(), name: "dev", status: .warn, fqdns: ["asdf.coder"], wsName: "opensrc",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .off, copyableDNS: "asdf.coder", wsName: "gvisor",
+        UUID(): Agent(id: UUID(), name: "dev", status: .off, fqdns: ["asdf.coder"], wsName: "gvisor",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .off, copyableDNS: "asdf.coder", wsName: "example",
+        UUID(): Agent(id: UUID(), name: "dev", status: .off, fqdns: ["asdf.coder"], wsName: "example",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .error, copyableDNS: "asdf.coder", wsName: "dogfood2",
+        UUID(): Agent(id: UUID(), name: "dev", status: .error, fqdns: ["asdf.coder"], wsName: "dogfood2",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .okay, copyableDNS: "asdf.coder",
+        UUID(): Agent(id: UUID(), name: "dev", status: .okay, fqdns: ["asdf.coder"],
                       wsName: "testing-a-very-long-name", wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .warn, copyableDNS: "asdf.coder", wsName: "opensrc",
+        UUID(): Agent(id: UUID(), name: "dev", status: .warn, fqdns: ["asdf.coder"], wsName: "opensrc",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .off, copyableDNS: "asdf.coder", wsName: "gvisor",
+        UUID(): Agent(id: UUID(), name: "dev", status: .off, fqdns: ["asdf.coder"], wsName: "gvisor",
                       wsID: UUID()),
-        UUID(): Agent(id: UUID(), name: "dev", status: .off, copyableDNS: "asdf.coder", wsName: "example",
+        UUID(): Agent(id: UUID(), name: "dev", status: .off, fqdns: ["asdf.coder"], wsName: "example",
                       wsID: UUID()),
     ], workspaces: [:])
     let shouldFail: Bool

Coder Desktop/Coder Desktop/VPNMenuState.swift

@@ -6,7 +6,7 @@ struct Agent: Identifiable, Equatable, Comparable {
     let id: UUID
     let name: String
     let status: AgentStatus
-    let copyableDNS: String
+    let fqdns: [String]
     let wsName: String
     let wsID: UUID
 
@@ -17,6 +17,11 @@ struct Agent: Identifiable, Equatable, Comparable {
         }
         return lhs.wsName.localizedCompare(rhs.wsName) == .orderedAscending
     }
+
+    // Choose the shortest hostname, and remove trailing dot if present
+    var primaryHost: String? { fqdns.min(by: { $0.count < $1.count })
+        .map { $0.hasSuffix(".") ? String($0.dropLast()) : $0 }
+    }
 }
 
 enum AgentStatus: Int, Equatable, Comparable {
@@ -67,9 +72,7 @@ struct VPNMenuState {
             name: agent.name,
             // If last handshake was not within last five minutes, the agent is unhealthy
             status: agent.lastHandshake.date > Date.now.addingTimeInterval(-300) ? .okay : .warn,
-            // Choose the shortest hostname, and remove trailing dot if present
-            copyableDNS: agent.fqdn.min(by: { $0.count < $1.count })
-                .map { $0.hasSuffix(".") ? String($0.dropLast()) : $0 } ?? "UNKNOWN",
+            fqdns: agent.fqdn,
             wsName: wsName,
             wsID: wsID
         )

Coder Desktop/Coder Desktop/Views/VPNMenuItem.swift

@@ -47,12 +47,17 @@ struct MenuItemView: View {
     @State private var nameIsSelected: Bool = false
     @State private var copyIsSelected: Bool = false
 
-    private var fmtWsName: AttributedString {
-        var formattedName = AttributedString(item.wsName)
+    private var itemName: AttributedString {
+        let name = switch item {
+        case let .agent(agent): agent.primaryHost ?? "\(item.wsName).coder"
+        case .offlineWorkspace: "\(item.wsName).coder"
+        }
+
+        var formattedName = AttributedString(name)
         formattedName.foregroundColor = .primary
-        var coderPart = AttributedString(".coder")
-        coderPart.foregroundColor = .gray
-        formattedName.append(coderPart)
+        if let range = formattedName.range(of: ".coder") {
+            formattedName[range].foregroundColor = .gray
+        }
         return formattedName
     }
 
@@ -73,7 +78,7 @@ struct MenuItemView: View {
                             .fill(item.status.color.opacity(1.0))
                             .frame(width: 7, height: 7)
                     }
-                    Text(fmtWsName).lineLimit(1).truncationMode(.tail)
+                    Text(itemName).lineLimit(1).truncationMode(.tail)
                     Spacer()
                 }.padding(.horizontal, Theme.Size.trayPadding)
                     .frame(minHeight: 22)
@@ -84,10 +89,10 @@ struct MenuItemView: View {
                     .onHover { hovering in nameIsSelected = hovering }
                 Spacer()
             }.buttonStyle(.plain)
-            if case let .agent(agent) = item {
+            if case let .agent(agent) = item, let copyableDNS = agent.primaryHost {
                 Button {
                     NSPasteboard.general.clearContents()
-                    NSPasteboard.general.setString(agent.copyableDNS, forType: .string)
+                    NSPasteboard.general.setString(copyableDNS, forType: .string)
                 } label: {
                     Image(systemName: "doc.on.doc")
                         .symbolVariant(.fill)

Coder Desktop/Coder DesktopTests/AgentsTests.swift

@@ -24,8 +24,8 @@ struct AgentsTests {
                 id: UUID(),
                 name: "dev",
                 status: .okay,
-                copyableDNS: "a\($0).example.com",
-                wsName: "a\($0)",
+                fqdns: ["a\($0).coder"],
+                wsName: "ws\($0)",
                 wsID: UUID()
             )
             return (agent.id, agent)

Coder Desktop/Coder DesktopTests/VPNMenuStateTests.swift

@@ -27,7 +27,7 @@ struct VPNMenuStateTests {
         #expect(storedAgent.name == "dev")
         #expect(storedAgent.wsID == workspaceID)
         #expect(storedAgent.wsName == "foo")
-        #expect(storedAgent.copyableDNS == "foo.coder")
+        #expect(storedAgent.primaryHost == "foo.coder")
         #expect(storedAgent.status == .okay)
     }
 
@@ -123,7 +123,7 @@ struct VPNMenuStateTests {
         let storedAgent = try #require(state.agents[newAgentID])
         #expect(storedAgent.name == "agent1")
         #expect(storedAgent.wsID == workspaceID)
-        #expect(storedAgent.copyableDNS == "foo.coder")
+        #expect(storedAgent.primaryHost == "foo.coder")
         #expect(storedAgent.status == .okay)
     }