undo dumb idea

ethanndickson · ethanndickson · commit 63442fe5f5a5 · 2025-02-12T18:46:00.000+11:00
diff --git a/Coder Desktop/Coder Desktop/Views/Agents.swift b/Coder Desktop/Coder Desktop/Views/Agents.swift
@@ -13,23 +13,20 @@ struct Agents<VPN: VPNService, S: Session>: View {
             // Agents List
             if vpn.state == .connected {
                 let items = vpn.menuState.sorted
-                let visibleOnlineItems = items.prefix(defaultVisibleRows) {
-                    $0.status != .off
-                }
-                let visibleItems = viewAll ? items[...] : visibleOnlineItems
+                let visibleItems = viewAll ? items[...] : items.prefix(defaultVisibleRows)
                 ForEach(visibleItems, id: \.id) { agent in
                     MenuItemView(item: agent, baseAccessURL: session.baseAccessURL!)
                         .padding(.horizontal, Theme.Size.trayMargin)
                 }
-                if visibleItems.count == 0 {
-                    Text("No \(items.count > 0 ? "running " : "")workspaces!")
+                if items.count == 0 {
+                    Text("No workspaces!")
                         .font(.body)
                         .foregroundColor(.gray)
                         .padding(.horizontal, Theme.Size.trayInset)
                         .padding(.top, 2)
                 }
                 // Only show the toggle if there are more items to show
-                if visibleOnlineItems.count < items.count {
+                if items.count > defaultVisibleRows {
                     Toggle(isOn: $viewAll) {
                         Text(viewAll ? "Show less" : "Show all")
                             .font(.headline)
diff --git a/Coder Desktop/Coder Desktop/Views/Util.swift b/Coder Desktop/Coder Desktop/Views/Util.swift
@@ -31,11 +31,3 @@ extension UUID {
         self.init(uuid: uuid)
     }
 }
-
-extension Array {
-    func prefix(_ maxCount: Int, while predicate: (Element) -> Bool) -> ArraySlice<Element> {
-        let failureIndex = enumerated().first(where: { !predicate($0.element) })?.offset ?? count
-        let endIndex = Swift.min(failureIndex, maxCount)
-        return self[..<endIndex]
-    }
-}
diff --git a/Coder Desktop/Coder DesktopTests/AgentsTests.swift b/Coder Desktop/Coder DesktopTests/AgentsTests.swift
@@ -101,68 +101,19 @@ struct AgentsTests {
         }
     }
 
-    @Test func showAllToggle_noOnlineWorkspaces() async throws {
-        vpn.state = .connected
-        let tmpAgents = createMockAgents(count: Theme.defaultVisibleAgents + 1, status: .off)
-        vpn.menuState = .init(agents: tmpAgents)
-
-        try await ViewHosting.host(view) {
-            try await sut.inspection.inspect { view in
-                var toggle = try view.find(ViewType.Toggle.self)
-                var forEach = try view.find(ViewType.ForEach.self)
-                #expect(throws: Never.self) { try view.find(text: "No running workspaces!") }
-                #expect(forEach.count == 0)
-                #expect(try toggle.labelView().text().string() == "Show all")
-                #expect(try !toggle.isOn())
-
-                try toggle.tap()
-                toggle = try view.find(ViewType.Toggle.self)
-                forEach = try view.find(ViewType.ForEach.self)
-                #expect(forEach.count == Theme.defaultVisibleAgents + 1)
-                #expect(try toggle.labelView().text().string() == "Show less")
-
-                try toggle.tap()
-                toggle = try view.find(ViewType.Toggle.self)
-                forEach = try view.find(ViewType.ForEach.self)
-                #expect(try toggle.labelView().text().string() == "Show all")
-                #expect(forEach.count == 0)
-            }
-        }
-    }
-
     @Test
-    func showAllToggle_oneOfflineWorkspace() async throws {
+    func showOfflineWorkspace() async throws {
         vpn.state = .connected
-        vpn.menuState = .init(agents: createMockAgents(count: Theme.defaultVisibleAgents - 2))
-        let offlineAgent = Agent(
-            id: UUID(),
-            name: "dev",
-            status: .off,
-            hosts: ["offline.coder"],
-            wsName: "offlinews",
-            wsID: UUID()
+        vpn.menuState = .init(
+            agents: createMockAgents(count: Theme.defaultVisibleAgents - 1),
+            workspaces: [UUID(): Workspace(id: UUID(), name: "offline", agents: .init())]
         )
-        vpn.menuState.agents[offlineAgent.id] = offlineAgent
 
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in
-                var toggle = try view.find(ViewType.Toggle.self)
-                var forEach = try view.find(ViewType.ForEach.self)
-                #expect(forEach.count == Theme.defaultVisibleAgents - 2)
-                #expect(try toggle.labelView().text().string() == "Show all")
-                #expect(try !toggle.isOn())
-
-                try toggle.tap()
-                toggle = try view.find(ViewType.Toggle.self)
-                forEach = try view.find(ViewType.ForEach.self)
-                #expect(forEach.count == Theme.defaultVisibleAgents - 1)
-                #expect(try toggle.labelView().text().string() == "Show less")
-
-                try toggle.tap()
-                toggle = try view.find(ViewType.Toggle.self)
-                forEach = try view.find(ViewType.ForEach.self)
-                #expect(try toggle.labelView().text().string() == "Show all")
-                #expect(forEach.count == Theme.defaultVisibleAgents - 2)
+                let forEach = try view.find(ViewType.ForEach.self)
+                #expect(forEach.count == Theme.defaultVisibleAgents)
+                #expect(throws: Never.self) { try view.find(link: "offline.coder") }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,3 @@ extension UUID {`
`31`	`31`	`self.init(uuid: uuid)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`		`-`
`35`		`-extension Array {`
`36`		`- func prefix(_ maxCount: Int, while predicate: (Element) -> Bool) -> ArraySlice<Element> {`
`37`		`- let failureIndex = enumerated().first(where: { !predicate($0.element) })?.offset ?? count`
`38`		`- let endIndex = Swift.min(failureIndex, maxCount)`
`39`		`- return self[..<endIndex]`
`40`		`- }`
`41`		`-}`