fixup

Author: ethanndickson

Coder-Desktop/Coder-Desktop/VPN/MenuState.swift

@@ -10,9 +10,12 @@ struct Agent: Identifiable, Equatable, Comparable, Hashable {
     let wsName: String
     let wsID: UUID
 
-    // Agents are sorted by name
+    // Agents are sorted by stauts, and then by name
     static func < (lhs: Agent, rhs: Agent) -> Bool {
-        lhs.wsName.localizedCompare(rhs.wsName) == .orderedAscending
+        if lhs.status != rhs.status {
+            return lhs.status < rhs.status
+        }
+        return lhs.wsName.localizedCompare(rhs.wsName) == .orderedAscending
     }
 
     let primaryHost: String

Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenuItem.swift

@@ -233,9 +233,7 @@ struct MenuItemIconButton: View {
     let action: @MainActor () -> Void
 
     var body: some View {
-        Button {
-            action()
-        } label: {
+        Button(action: action) {
             Image(systemName: systemName)
                 .padding(3)
                 .contentShape(Rectangle())
@@ -259,16 +257,3 @@ struct AnimatedChevron: View {
             .animation(.easeInOut(duration: Theme.Animation.collapsibleDuration), value: isExpanded)
     }
 }
-
-#if DEBUG
-    #Preview {
-        let appState = AppState(persistent: false)
-        appState.login(baseAccessURL: URL(string: "http://127.0.0.1:8080")!, sessionToken: "")
-        // appState.clearSession()
-
-        return VPNMenu<PreviewVPN, PreviewFileSync>().frame(width: 256)
-            .environmentObject(PreviewVPN())
-            .environmentObject(appState)
-            .environmentObject(PreviewFileSync())
-    }
-#endif

Coder-Desktop/Coder-DesktopTests/AgentsTests.swift

@@ -62,7 +62,7 @@ struct AgentsTests {
         let forEach = try view.inspect().find(ViewType.ForEach.self)
         #expect(forEach.count == Theme.defaultVisibleAgents)
         // Agents are sorted by status, and then by name in alphabetical order
-        #expect(throws: Never.self) { try view.inspect().find(link: "a1.coder") }
+        #expect(throws: Never.self) { try view.inspect().find(text: "a1.coder") }
     }
 
     @Test
@@ -115,7 +115,7 @@ struct AgentsTests {
             try await sut.inspection.inspect { view in
                 let forEach = try view.find(ViewType.ForEach.self)
                 #expect(forEach.count == Theme.defaultVisibleAgents)
-                #expect(throws: Never.self) { try view.find(link: "offline.coder") }
+                #expect(throws: Never.self) { try view.find(text: "offline.coder") }
             }
         }
     }