Commit `6b2371ec5c`

6b2371ec5ce038ea398c036e1b9626a97e69a680

parent: 24feba272c

Unsigned

cmc <hello@cleberg.net> · 2026-07-16 05:29 UTC

fix: blank mailing list from Projects, swipe flicker, hidden upload

Three problems from manual testing.

Opening a mailing list from More → Projects showed a blank screen, while the
same tap on a project pinned to Home worked. handleTabNavigation reset the
target path and appended to it two Task.yields later. When the target tab is
already on screen — Projects lives under More — the reset starts an animated pop
of the view the user is standing on and the appends land mid-animation. From
Home the tab actually changes, so the More stack is quiescent and the appends
land cleanly. Each case now builds its path and assigns it once, so SwiftUI gets
a single diff with nothing to race.

Destructive swipe actions made the row vanish and spring back while the
confirmation was still up. role: .destructive makes SwiftUI perform the row
removal on activation, which allowsFullSwipe: false does not prevent — the
report was a tap, not a full swipe. These buttons only record pending state and
wait for an answer, so they are plain buttons tinted red instead. Six sites: the
two added here, plus trackers, pastes, and tracker ACLs and labels, which had
the same flicker already.

The artifacts upload control was invisible. It was declared as a toolbar item
from a view that is a segment inside RepositoryDetailView's tab switch rather
than its own navigation destination, so it never reached the navigation bar. It
is a row in the list now, and also an action on the empty state — the overlay
covers the list, and a repository with no artifacts is precisely the one that
needs uploading.

Layout: unified · split

Hutch/App/RootView.swift +27 −21

	@@ -291,39 +291,45 @@ struct RootView: View {
291	}	291	}
292	}	292	}
293		293
		294	/// Replaces the target tab's path in one assignment.
		295	///
		296	/// Resetting the path and appending to it afterwards races when the target tab
		297	/// is already the one on screen: the reset starts an animated pop of the view
		298	/// the user is standing on, and the appends land mid-animation, leaving a blank
		299	/// screen. That is why opening a mailing list from a pinned project on Home
		300	/// worked while the same tap under More → Projects did not — one changes tabs
		301	/// and the other does not.
		302	///
		303	/// Building the whole path first and assigning once gives SwiftUI a single
		304	/// diff, with nothing to race.
294	private func handleTabNavigation(_ target: AppState.TabNavigationTarget) {	305	private func handleTabNavigation(_ target: AppState.TabNavigationTarget) {
295	switch target {	306	switch target {
296	case .repository(let repository):	307	case .repository(let repository):
297	repoPath = NavigationPath()	308	var path = NavigationPath()
		309	path.append(repository)
		310	repoPath = path
298	appState.selectedTab = .repositories	311	appState.selectedTab = .repositories
299	Task {
300	await settleNavigationTransition()
301	repoPath.append(repository)
302	}
303		312
304	case .tracker(let tracker):	313	case .tracker(let tracker):
305	ticketsPath = NavigationPath()	314	var path = NavigationPath()
		315	path.append(tracker)
		316	ticketsPath = path
306	appState.selectedTab = .tickets	317	appState.selectedTab = .tickets
307	Task {
308	await settleNavigationTransition()
309	ticketsPath.append(tracker)
310	}
311		318
312	case .mailingList(let mailingList):	319	case .mailingList(let mailingList):
313	morePath = NavigationPath()	320	// .lists first so back lands on Mailing Lists rather than dead-ending.
		321	var path = NavigationPath()
		322	path.append(MoreRoute.lists)
		323	path.append(MoreRoute.mailingList(mailingList))
		324	morePath = path
314	appState.selectedTab = .more	325	appState.selectedTab = .more
315	Task {	326
316	await settleNavigationTransition()
317	morePath.append(MoreRoute.lists)
318	morePath.append(MoreRoute.mailingList(mailingList))
319	}
320	case .systemStatus:	327	case .systemStatus:
321	morePath = NavigationPath()	328	var path = NavigationPath()
		329	path.append(MoreRoute.systemStatus)
		330	morePath = path
322	appState.selectedTab = .more	331	appState.selectedTab = .more
323	Task {	332
324	await settleNavigationTransition()
325	morePath.append(MoreRoute.systemStatus)
326	}
327	case .builds:	333	case .builds:
328	buildsPath = NavigationPath()	334	buildsPath = NavigationPath()
329	appState.selectedTab = .builds	335	appState.selectedTab = .builds

Hutch/Views/Lists/MailingListListView.swift +2 −1

                 // the data has not actually changed.
                 .swipeActions(edge: .trailing, allowsFullSwipe: false) {
                     if isOwned(mailingList) {
-                        Button(role: .destructive) {
+                        Button {
                             pendingDeletion = mailingList
                         } label: {
                             SwiftUI.Label("Delete", systemImage: "trash")
                         }
+                        .tint(.red)
                         Button {
                             editingList = mailingList
                         } label: {

Hutch/Views/Pastes/PasteListView.swift +2 −1

                 }
                 .swipeActions(edge: .trailing, allowsFullSwipe: false) {
                     if swipeActionsEnabled {
-                        Button(role: .destructive) {
+                        Button {
                             pasteToDelete = paste
                         } label: {
                             Label("Delete", systemImage: "trash")
                         }
+                        .tint(.red)
                     }
                 }
                 .task {

Hutch/Views/Repositories/ArtifactsView.swift +32 −20

     var body: some View {
         List {
+            // In the list rather than the toolbar: this view is a segment inside
+            // RepositoryDetailView's tab switch, not its own navigation
+            // destination, and a toolbar declared from there does not reliably
+            // reach the navigation bar. It also has to be reachable when there are
+            // no artifacts at all, which is the state a new tag is in.
+            if isOwnedByCurrentUser {
+                Button {
+                    showTagPicker = true
+                } label: {
+                    SwiftUI.Label("Upload Artifact…", systemImage: "square.and.arrow.up")
+                }
+                .disabled(viewModel.isMutatingArtifact || viewModel.tags.isEmpty)
+                .themedRow()
+            }
             ForEach(viewModel.referenceArtifacts) { refArtifacts in
                 Section {
                     ForEach(refArtifacts.artifacts) { artifact in
                         // action animates the row out before the confirmation.
                         .swipeActions(edge: .trailing, allowsFullSwipe: false) {
                             if isOwnedByCurrentUser {
-                                Button(role: .destructive) {
+                                Button {
                                     pendingDeletion = artifact
                                 } label: {
                                     SwiftUI.Label("Delete", systemImage: "trash")
                                 }
+                                .tint(.red)
                             }
                         }
                     }
         } message: { _ in
             Text("This permanently removes the artifact from the tag. This cannot be undone.")
         }
-        // The sections above only list tags that already have an artifact, so
-        // without this there would be no way to attach the first one to a tag.
-        .toolbar {
-            if isOwnedByCurrentUser {
-                ToolbarItem(placement: .topBarTrailing) {
-                    Button {
-                        showTagPicker = true
-                    } label: {
-                        SwiftUI.Label("Upload Artifact", systemImage: "square.and.arrow.up")
-                    }
-                    .disabled(viewModel.isMutatingArtifact || viewModel.tags.isEmpty)
-                }
-            }
-        }
         .confirmationDialog("Upload to Tag", isPresented: $showTagPicker, titleVisibility: .visible) {
             ForEach(viewModel.tags.prefix(12), id: \.name) { tag in
                 Button(RepositorySummary.displayBranchName(for: tag.name)) {
                     retryAction: { await viewModel.loadArtifacts() }
                 )
             } else if viewModel.referenceArtifacts.isEmpty {
-                ContentUnavailableView(
+                // The overlay covers the whole list, so the upload row above is
-                    "No Artifacts",
+                // hidden underneath it — and a repository with no artifacts is
-                    systemImage: "archivebox",
+                // exactly the one that needs uploading. Offer it here too.
-                    description: Text("This repository has no release artifacts.")
+                ContentUnavailableView {
-                )
+                    SwiftUI.Label("No Artifacts", systemImage: "archivebox")
+                } description: {
+                    Text("This repository has no release artifacts.")
+                } actions: {
+                    if isOwnedByCurrentUser {
+                        Button("Upload Artifact…") {
+                            showTagPicker = true
+                        }
+                        .disabled(viewModel.isMutatingArtifact || viewModel.tags.isEmpty)
+                    }
+                }
             }
         }
         .task {

Hutch/Views/Tickets/TrackerListView.swift +2 −1

                     TrackerRowView(tracker: tracker)
                 }
                 .swipeActions(edge: .trailing, allowsFullSwipe: false) {
-                    Button(role: .destructive) {
+                    Button {
                         pendingDeletion = tracker
                     } label: {
                         Label("Delete", systemImage: "trash")
                     }
+                    .tint(.red)
                     Button {
                         editingTracker = tracker

Hutch/Views/Tickets/TrackerManagementView.swift +4 −2

                                 TrackerPermissionSummary(permissions: entry.permissions)
                             }
                             .swipeActions(edge: .trailing, allowsFullSwipe: false) {
-                                Button(role: .destructive) {
+                                Button {
                                     pendingDeletion = entry
                                 } label: {
                                     Label("Delete", systemImage: "trash")
                                 }
+                                .tint(.red)
                                 Button {
                                     editingACL = entry
                             }
                             .tint(.blue)
-                            Button(role: .destructive) {
+                            Button {
                                 pendingDeletion = label
                             } label: {
                                 Label("Delete", systemImage: "trash")
                             }
+                            .tint(.red)
                         }
                     }
                     .themedRow()

Commit 6b2371ec5c

Commit `6b2371ec5c`