Commit `af09603805`

af09603805feaa815ace9a40f43fdc2458e53e71

parent: 6887325f24

Verified · cmc

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

admin: reload after every action; match the web's details

perform() reloaded only on success, leaving a stale row behind a
refusal (e.g. the account changed state meanwhile); it now reloads
after both success and failure, through reloadTask so a filter change
cannot race it. Typed-name confirmation trims whitespace, like the
web. AdminUsersViewModel gets loadIfNeeded() like the other list view
models, so returning to the screen keeps its loaded page. The disable
message now says what the server actually does (signs out of the web,
revokes API tokens; SSH stays refused until re-enabled) rather than
"until enabled" for everything. The admin chip is neutral like the
web's plain chip, and the row menu carries an accessibility label.

Tests: the refusal test uses the server's real last-admin failure
(HTTP 500, exit 1, retried once) and also checks the reload it
triggers; Envelope is renamed DashboardEnvelope to say what it is.
Added coverage for a refused action still reloading the list and for
loadIfNeeded() reading only once.

Layout: unified · split

gitbay/Admin/AdminModels.swift +1 −1

	@@ -222,7 +222,7 @@ nonisolated enum AdminAction: String, Sendable, Hashable {
222	switch self {	222	switch self {
223	case .promote: "\(username) becomes an instance admin."	223	case .promote: "\(username) becomes an instance admin."
224	case .demote: "\(username) stops being an instance admin. Type the username to confirm."	224	case .demote: "\(username) stops being an instance admin. Type the username to confirm."
225	case .disable: "SSH, web sessions and API tokens for \(username) are refused until the account is enabled. Type the username to confirm."	225	case .disable: "Signs \(username) out of the web and revokes their API tokens; SSH is refused until the account is enabled. Type the username to confirm."
226	case .enable: "\(username) can sign in again."	226	case .enable: "\(username) can sign in again."
227	}	227	}
228	}	228	}

gitbay/Admin/AdminViewModels.swift +9 −1

         await list.reload()
     }
+    /// The list's `.task`: reads only while nothing is shown yet.
+    func loadIfNeeded() async {
+        guard list.needsLoad else { return }
+        await load()
+    }
     func perform(_ action: AdminAction, on username: String) async {
         working = true
         actionError = nil
         defer { working = false }
         do {
             try await client.run(action.argv(username))
-            await list.reload()
         } catch let error as GitbayError {
             actionError = error.userFacingMessage
         } catch {
             actionError = GitbayError.transport(error).userFacingMessage
         }
+        reloadTask?.cancel()
+        reloadTask = Task { await list.reload() }
+        await reloadTask?.value
     }
 }

gitbay/Views/Admin/AdminUsersView.swift +5 −3

         .overlay { LoadStateOverlay(state: model.list.state) }
         .navigationTitle("Accounts")
         .navigationBarTitleDisplayMode(.inline)
-        .task { await model.load() }
+        .task { await model.loadIfNeeded() }
         .refreshable { await model.load() }
         .alert(
             pending.map { "\($0.action.title) \($0.username)?" } ?? "",
             Button(pending.action.title, role: pending.action.needsTypedName ? .destructive : nil) {
                 Task { await model.perform(pending.action, on: pending.username) }
             }
-            .disabled(pending.action.needsTypedName && typed != pending.username)
+            .disabled(pending.action.needsTypedName
+                && typed.trimmingCharacters(in: .whitespaces) != pending.username)
             Button("Cancel", role: .cancel) {}
         } message: { pending in
             Text(pending.action.message(for: pending.username))
                     Text(user.username)
                         .font(.gbSans(.subheadline).weight(.medium))
                     if user.admin {
-                        GBChip("admin", .gbAccent)
+                        GBChip("admin", .secondary)
                     }
                     GBChip(user.state, stateColor(user.state))
                 }
                 Image(systemName: "ellipsis.circle")
             }
             .accessibilityIdentifier("admin-user-menu-\(user.username)")
+            .accessibilityLabel("Actions for \(user.username)")
         }
     }

gitbayTests/AdminTests.swift +40 −6

     }},"exit_code":0}
     """
-nonisolated private struct Envelope: Decodable { let data: AdminDashboard }
+nonisolated private struct DashboardEnvelope: Decodable { let data: AdminDashboard }
 private func sections() throws -> [QueueSection] {
     let dashboard = try GitbayClient.decoder()
-        .decode(Envelope.self, from: Data(adminDashboardJSON.utf8)).data
+        .decode(DashboardEnvelope.self, from: Data(adminDashboardJSON.utf8)).data
     let queues = try #require(dashboard.queues)
     // A fixed stand-in for relative time keeps the text deterministic.
     return queues.sections(when: { "at \($0)" })
     /// Everyone else's dashboard omits both blocks.
     @Test func aNonAdminDashboardHasNoQueues() throws {
         let json = #"{"protocol_version":1,"data":{"unread":3},"exit_code":0}"#
-        let dashboard = try GitbayClient.decoder().decode(Envelope.self, from: Data(json.utf8)).data
+        let dashboard = try GitbayClient.decoder().decode(DashboardEnvelope.self, from: Data(json.utf8)).data
         #expect(dashboard.queues == nil)
         #expect(dashboard.server == nil)
     }
         #expect(stub.seen.first?.url.query() == "argv=admin&argv=user&argv=list&argv=--limit&argv=50")
     }
+    @Test func loadIfNeededOnlyReadsOnce() async throws {
+        let (client, stub) = try makeClient()
+        stub.enqueue(.init(status: 200, json: userPageJSON))
+        let model = AdminUsersViewModel(client: client)
+        await model.loadIfNeeded()
+        await model.loadIfNeeded()
+        #expect(stub.seen.count == 1)
+        #expect(stub.seen.first?.url.query() == "argv=admin&argv=user&argv=list&argv=--limit&argv=50")
+    }
     @Test func aFilterReloadsWithItsState() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 200, json: userPageJSON))
         #expect(model.list.state.value?.count == 2)
     }
+    /// The last-admin refusal is a real server failure (exit 1, HTTP 500),
+    /// which the client retries once before surfacing it.
     @Test func aRefusalIsShownVerbatim() async throws {
         let (client, stub) = try makeClient()
-        stub.enqueue(.init(status: 200, json:
+        let refusal = StubProtocol.Stub(status: 500, json:
-            #"{"protocol_version":1,"error":"cmc is the last admin","exit_code":4}"#, match: "cmd"))
+            #"{"protocol_version":1,"error":"that is the only instance admin; promote someone else first","exit_code":1}"#,
+            match: "cmd")
+        stub.enqueue(refusal)
+        stub.enqueue(refusal)
+        stub.enqueue(.init(status: 200, json: userPageJSON, match: "argv=list"))
         let model = AdminUsersViewModel(client: client)
         await model.perform(.demote, on: "cmc")
-        #expect(model.actionError == "cmc is the last admin")
+        #expect(model.actionError == "that is the only instance admin; promote someone else first")
+        #expect(model.list.state.value?.count == 2)
+    }
+    /// A refusal must still reload the list, so a stale row does not
+    /// linger after the account changed state meanwhile.
+    @Test func aRefusedActionStillReloadsTheList() async throws {
+        let (client, stub) = try makeClient()
+        stub.enqueue(.init(status: 403, json:
+            #"{"protocol_version":1,"error":"account changed state","exit_code":4}"#, match: "cmd"))
+        stub.enqueue(.init(status: 200, json: userPageJSON, match: "argv=list"))
+        let model = AdminUsersViewModel(client: client)
+        await model.perform(.disable, on: "bhargavkk")
+        #expect(model.actionError == "account changed state")
+        #expect(stub.seen.contains { $0.url.query()?.contains("argv=list") == true })
     }
 }

Commit af09603805

Commit `af09603805`