Commit `5c2efd71c6`

5c2efd71c6bfd5b1fa90a16d02fbd0309dd62feb

parent: f321cd5b62

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-06 23:14 UTC

Fix notification inbox review findings

- Pin the dashboard unread count in the fixture and assert it decodes,
  so a wrong key name can't silently fall back to 0.
- Gate swipe-to-mark-read on `working`, matching the toolbar action.
- Clear `actionError` on load and on filter change, not just at the
  start of the next action.
- Give the dashboard bell an accessibility label that states the
  unread count as one sentence, not a bare number after "bell".
- Use fractional-second timestamps in notification fixtures to match
  the server and the rest of the suite; add a cursor-reset test for a
  notifications filter change.

Layout: unified · split

gitbay/Account/NotificationsViewModel.swift +3

     var showAll = false {
         didSet {
             guard showAll != oldValue else { return }
+            actionError = nil
             configureList()
             reloadTask?.cancel()
             reloadTask = Task { await list.reload() }
     func load() async {
         reloadTask?.cancel()
+        actionError = nil
         await list.reload()
     }
     func markRead(_ id: Int64) async {
+        guard !working else { return }
         await perform(["notifications", "read", String(id)])
     }

gitbay/Views/Dashboard/DashboardView.swift +6

                     }
                 }
                 .accessibilityIdentifier("dashboard-notifications-button")
+                .accessibilityLabel(bellLabel)
             }
             ToolbarItem(placement: .topBarTrailing) {
                 Button {
         .refreshable { await model.load() }
     }
+    private var bellLabel: String {
+        guard let unread = model.state.value?.unread, unread > 0 else { return "Notifications" }
+        return "Notifications, \(unread) unread"
+    }
     private func itemSection(
         _ title: String,
         items: [DashboardItem],

gitbayTests/DashboardViewModelTests.swift +3 −1

     "data":{"number":2},"created_at":"2026-08-27T10:30:00.000Z"}],\
     "builds":[{"repo":"krz/gitbay","number":9,"job":"ci","status":"success",\
     "sha":"65ba14e0000000000000","ref":"refs/heads/main",\
-    "created_at":"2026-08-27T09:00:00.000Z","finished_at":"2026-08-27T09:05:00.000Z"}]},\
+    "created_at":"2026-08-27T09:00:00.000Z","finished_at":"2026-08-27T09:05:00.000Z"}],\
+    "unread":3},\
     "exit_code":0}
     """
         #expect(data.openIssues.first?.number == 11)
         #expect(data.recentActivity.first?.phrase == "merged !2")
         #expect(data.builds.first?.status == "success")
+        #expect(data.unread == 3)
         // The whole screen cost exactly one request.
         #expect(stub.seen.count == 1)
         #expect(stub.seen.first?.url.query() == "argv=dashboard")

gitbayTests/NotificationTests.swift +27 −6

 private let unreadBuild = """
     {"id":15,"repo":"krz/gitbay","kind":"build","actor":"ci",\
     "summary":"build 966 failed","path":"krz/gitbay/builds/966",\
-    "created_at":"2026-09-06T22:14:46Z"}
+    "created_at":"2026-09-06T22:14:46.000Z"}
     """
 struct NotificationDecodingTests {
         let n = try decode("""
             {"id":15,"repo":"krz/gitbay","kind":"build","actor":"ci",\
             "summary":"x","path":"krz/gitbay/builds/966",\
-            "created_at":"2026-09-06T22:14:46Z","read_at":"2026-09-06T22:20:24Z"}
+            "created_at":"2026-09-06T22:14:46.000Z","read_at":"2026-09-06T22:20:24.000Z"}
             """)
         #expect(n.readAt != nil)
         #expect(n.isUnread == false)
     @Test func everyKindRoutesToItsScreen() throws {
         let issue = try decode("""
             {"id":1,"repo":"krz/gitbay","kind":"issue","actor":"cmc","summary":"x",\
-            "path":"krz/gitbay/issues/168","created_at":"2026-09-06T22:14:46Z"}
+            "path":"krz/gitbay/issues/168","created_at":"2026-09-06T22:14:46.000Z"}
             """)
         #expect(issue.destination == .issue(repo: "krz/gitbay", number: 168))
         // The segment is "mrs", not "merge_requests".
         let mr = try decode("""
             {"id":2,"repo":"krz/gitbay","kind":"mr","actor":"cmc","summary":"x",\
-            "path":"krz/gitbay/mrs/282","created_at":"2026-09-06T22:14:46Z"}
+            "path":"krz/gitbay/mrs/282","created_at":"2026-09-06T22:14:46.000Z"}
             """)
         #expect(mr.destination == .mr(repo: "krz/gitbay", number: 282))
                      "too/short", "krz/gitbay/issues/1/extra", ""] {
             let n = try decode("""
                 {"id":1,"repo":"krz/gitbay","kind":"issue","actor":"cmc","summary":"x",\
-                "path":"\(path)","created_at":"2026-09-06T22:14:46Z"}
+                "path":"\(path)","created_at":"2026-09-06T22:14:46.000Z"}
                 """)
             #expect(n.destination == nil, "\(path) should not route")
         }
     @Test func theDestinationRepoComesFromThePath() throws {
         let n = try decode("""
             {"id":1,"repo":"other/repo","kind":"issue","actor":"cmc","summary":"x",\
-            "path":"krz/gitbay/issues/7","created_at":"2026-09-06T22:14:46Z"}
+            "path":"krz/gitbay/issues/7","created_at":"2026-09-06T22:14:46.000Z"}
             """)
         #expect(n.destination == .issue(repo: "krz/gitbay", number: 7))
     }
         {"protocol_version":1,"data":{"items":[\(unreadBuild)]},"exit_code":0}
         """
+    private let pageWithCursor = """
+        {"protocol_version":1,"data":{"items":[\(unreadBuild)],"next":"c1"},"exit_code":0}
+        """
     @Test func theDefaultListingIsUnreadOnly() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 200, json: page))
         #expect(argvFrom(try #require(stub.seen.last).url).contains("--all"))
     }
+    /// A filter change reloads rather than pages, so it must not carry
+    /// forward a cursor from whatever page was on screen.
+    @Test func aFilterChangeDoesNotCarryAStaleCursor() async throws {
+        let (client, stub) = try makeClient()
+        stub.enqueue(.init(status: 200, json: pageWithCursor))
+        let model = NotificationsViewModel(client: client)
+        await model.load()
+        #expect(model.list.hasMore)
+        stub.enqueue(.init(status: 200, json: page))
+        model.showAll = true
+        try await Task.sleep(for: .milliseconds(150))
+        let argv = argvFrom(try #require(stub.seen.last).url)
+        #expect(argv.contains("--cursor") == false)
+    }
     @Test func markingOneReadSendsItsId() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 200, json: page))

Commit 5c2efd71c6

Commit `5c2efd71c6`