Commit `250c56ddb3`

250c56ddb3c79770a96c3ea23dfa9679807ce98a

parent: bebda41def

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-16 03:33 UTC

Org delete and prune: a refusal in an alert, the profile follows, a pruned head is not offered again

A refused organization delete is shown as an alert where the button is, as repository delete does; the org's profile reloads after a delete and a deleted org's screen does not reload. After a prune the menu no longer offers it.

Ref #47
Ref #48

Layout: unified · split

gitbay/MRs/MRDetailViewModel.swift +2

	@@ -151,6 +151,8 @@ final class MRDetailViewModel {
151	/// kept. The diff is gone afterwards; the thread records who pruned it.	151	/// kept. The diff is gone afterwards; the thread records who pruned it.
152	func pruneHead() async {	152	func pruneHead() async {
153	await perform(["admin", "mr", "prune", repoPath, String(number), "--yes"])	153	await perform(["admin", "mr", "prune", repoPath, String(number), "--yes"])
		154	// Done: another prune would only add another system comment.
		155	if actionError == nil { canPruneHead = false }
154	}	156	}
155		157
156	func cancelQueuedMerge() async {	158	func cancelQueuedMerge() async {

gitbay/Views/Discovery/ProfileView.swift +4

         }
         .task { await model.load() }
         .refreshable { await model.load() }
+        // The organization screen, pushed from an org's profile, may delete it.
+        .onReceive(NotificationCenter.default.publisher(for: .gitbayOrganizationsChanged)) { note in
+            if note.object as? String == model.name { Task { await model.load() } }
+        }
         .sheet(isPresented: $editingProfile) {
             if let profile = model.state.value {
                 ProfileEditSheet(model: model, profile: profile)

gitbay/Views/Orgs/OrgView.swift +17 −4

     @State private var deleteConfirm = ""
     /// Set once the organization is deleted: nothing on this screen applies.
     @State private var deleted = false
+    /// A delete refused, shown where the button is rather than in the
+    /// banner at the top of a list scrolled past it.
+    @State private var refusal: String?
     init(client: GitbayClient, org: String) {
         _model = State(initialValue: OrgViewModel(client: client, orgName: org))
             }
         }
         .task { await model.load() }
-        .refreshable { await model.load() }
+        .refreshable {
+            guard !deleted else { return }
+            await model.load()
+        }
+        .alert("Not done", isPresented: Binding(get: { refusal != nil }, set: { if !$0 { refusal = nil } })) {
+            Button("OK", role: .cancel) {}
+        } message: {
+            Text(refusal ?? "")
+        }
         .alert("Delete \(model.orgName)", isPresented: $deletingOrg) {
             TextField("type \(model.orgName) to confirm", text: $deleteConfirm)
                 .autocorrectionDisabled()
                 .textInputAutocapitalization(.never)
             Button("Delete", role: .destructive) {
-                Task { deleted = await model.delete() }
+                Task {
+                    if await model.delete() { deleted = true } else { refusal = model.actionError }
+                }
             }
             .disabled(deleteConfirm != model.orgName)
             Button("Cancel", role: .cancel) {}
         }
     }
-    /// Labels and milestones every repository under the org sees
-    /// (v1.19.0), managed here with `org label` and `org milestone`.
     private var deleteSection: some View {
         Section {
             Button(role: .destructive) {
         }
     }
+    /// Labels and milestones every repository under the org sees
+    /// (v1.19.0), managed here with `org label` and `org milestone`.
     private var issuesSection: some View {
         Section {
             NavigationLink(value: OrgRoute.labels(model.orgName)) {

gitbayTests/OrgDeleteMRPruneTests.swift +6

     @Test func pruneNamesTheMergeRequestAndConfirms() async throws {
         let (client, stub) = try makeClient()
+        stub.enqueue(.init(status: 200, json: mergedJSON, match: "argv=show"))
+        stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"user":"cmc","admin":true},"exit_code":0}"#, match: "argv=whoami"))
         stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":[{"number":7,"head":"abc123"}],"exit_code":0}"#, match: "cmd"))
         stub.enqueue(.init(status: 200, json: mergedJSON, match: "argv=show"))
         let model = MRDetailViewModel(client: client, repoPath: "krz/gitbay", number: 7)
+        await model.load()
+        await model.checkCanPruneHead()
+        #expect(model.canPruneHead, "an admin on a merged merge request is offered the prune")
         await model.pruneHead()
         #expect(try writes(stub) == [["admin", "mr", "prune", "krz/gitbay", "7", "--yes"]])
         #expect(model.actionError == nil)
+        #expect(model.canPruneHead == false, "a pruned head is not offered again")
     }
     @Test func aStillMergeableHeadIsRefusedWithTheReason() async throws {

Commit 250c56ddb3

Commit `250c56ddb3`