Commit `3efd628ddd`

3efd628ddd7ee6cbd59716ed7c6ae23ba6355228

parent: 4c43ef244d

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-06 20:16 UTC

Fix final-review findings in instance search

Keep prior results visible during a refined search instead of
flashing to a spinner on every keystroke; drop the dead clear()
method and its weak test; stop the debounce task from capturing self
strongly and add isolated deinit to cancel it; cover a failed search
and query trimming with tests.

Layout: unified · split

gitbay/Discovery/SearchViewModel.swift +6 −5

         self.client = client
     }
-    func clear() {
+    isolated deinit {
         searchTask?.cancel()
-        query = ""
     }
     private func scheduleSearch() {
         searchTask?.cancel()
         guard isSearching else { return }
-        state = .loading
+        // Keep prior results on screen while a refined search is in
-        searchTask = Task {
+        // flight, the way the repository list does.
+        if state.value == nil { state = .loading }
+        searchTask = Task { [weak self] in
             // Debounce a person typing, the way the repository list does.
             guard (try? await Task.sleep(for: .milliseconds(300))) != nil else { return }
             guard !Task.isCancelled else { return }
-            await run()
+            await self?.run()
         }
     }

gitbayTests/SearchTests.swift +26 −13

         #expect(argvFrom(try #require(stub.seen.last).url) == ["search", "c++"])
     }
-    @Test func clearingStopsSearchingAndDropsResults() async throws {
+    @Test func nothingFoundIsAnEmptyStateNotAFailure() async throws {
         let (client, stub) = try makeClient()
-        stub.enqueue(.init(status: 200, json: mixedResults))
+        stub.enqueue(.init(status: 200, json: """
+            {"protocol_version":1,"data":[],"exit_code":0}
+            """))
         let model = SearchViewModel(client: client)
-        model.query = "parity"
-        try await Task.sleep(for: .milliseconds(600))
-        #expect(model.isSearching)
-        model.clear()
+        model.query = "zzzznothing"
+        try await Task.sleep(for: .milliseconds(600))
-        #expect(model.isSearching == false)
+        guard case .empty = model.state else {
-        #expect(model.query.isEmpty)
+            Testing.Issue.record("expected empty, got \(model.state)")
+            return
+        }
     }
-    @Test func nothingFoundIsAnEmptyStateNotAFailure() async throws {
+    @Test func aServerFailureLandsInFailedNotEmpty() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 200, json: """
-            {"protocol_version":1,"data":[],"exit_code":0}
+            {"protocol_version":1,"error":"boom","exit_code":1}
             """))
         let model = SearchViewModel(client: client)
-        model.query = "zzzznothing"
+        model.query = "parity"
         try await Task.sleep(for: .milliseconds(600))
-        guard case .empty = model.state else {
+        guard case .failed = model.state else {
-            Testing.Issue.record("expected empty, got \(model.state)")
+            Testing.Issue.record("expected failed, got \(model.state)")
             return
         }
     }
+    @Test func theQueryIsTrimmedBeforeBeingSent() async throws {
+        let (client, stub) = try makeClient()
+        stub.enqueue(.init(status: 200, json: mixedResults))
+        let model = SearchViewModel(client: client)
+        model.query = "  parity  "
+        try await Task.sleep(for: .milliseconds(600))
+        #expect(argvFrom(try #require(stub.seen.last).url) == ["search", "parity"])
+    }
 }

Commit 3efd628ddd

Commit `3efd628ddd`