fixup

ethanndickson · ethanndickson · commit abc053b44214 · 2025-02-11T18:01:20.000+11:00
diff --git a/Coder Desktop/Coder Desktop/VPNMenuState.swift b/Coder Desktop/Coder Desktop/VPNMenuState.swift
@@ -18,10 +18,7 @@ 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 }
-    }
+    var primaryHost: String? { fqdns.min(by: { $0.count < $1.count }) }
 }
 
 enum AgentStatus: Int, Equatable, Comparable {
@@ -72,7 +69,8 @@ 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,
-            fqdns: agent.fqdn,
+            // Remove trailing dot if present
+            fqdns: agent.fqdn.map { $0.hasSuffix(".") ? String($0.dropLast()) : $0 },
             wsName: wsName,
             wsID: wsID
         )

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,7 @@ struct Agent: Identifiable, Equatable, Comparable {`
`18`	`18`	`return lhs.wsName.localizedCompare(rhs.wsName) == .orderedAscending`
`19`	`19`	`}`
`20`	`20`
`21`		`- // Choose the shortest hostname, and remove trailing dot if present`
`22`		`- var primaryHost: String? { fqdns.min(by: { $0.count < $1.count })`
`23`		`- .map { $0.hasSuffix(".") ? String($0.dropLast()) : $0 }`
`24`		`- }`
	`21`	`+ var primaryHost: String? { fqdns.min(by: { $0.count < $1.count }) }`
`25`	`22`	`}`
`26`	`23`
`27`	`24`	`enum AgentStatus: Int, Equatable, Comparable {`
`@@ -72,7 +69,8 @@ struct VPNMenuState {`
`72`	`69`	`name: agent.name,`
`73`	`70`	`// If last handshake was not within last five minutes, the agent is unhealthy`
`74`	`71`	`status: agent.lastHandshake.date > Date.now.addingTimeInterval(-300) ? .okay : .warn,`
`75`		`- fqdns: agent.fqdn,`
	`72`	`+ // Remove trailing dot if present`
	`73`	`+ fqdns: agent.fqdn.map { $0.hasSuffix(".") ? String($0.dropLast()) : $0 },`
`76`	`74`	`wsName: wsName,`
`77`	`75`	`wsID: wsID`
`78`	`76`	`)`