diff options
| author | Christian Cleberg <[email protected]> | 2026-03-22 20:42:53 -0500 |
|---|---|---|
| committer | Christian Cleberg <[email protected]> | 2026-03-22 20:42:53 -0500 |
| commit | 82e54ad018ae5fa5cdf90c0d763e09e99bc0e933 (patch) | |
| tree | cafdbc8f4116af5cc6e0ca706e05ced599e26570 /Hutch/Views/Tickets | |
| parent | 1f8b7a23529462c3c332753d33810b5c9f692bbc (diff) | |
| download | hutch-82e54ad018ae5fa5cdf90c0d763e09e99bc0e933.tar.gz hutch-82e54ad018ae5fa5cdf90c0d763e09e99bc0e933.tar.bz2 hutch-82e54ad018ae5fa5cdf90c0d763e09e99bc0e933.zip | |
feat: swipe actions on tickets, pastes, builds, and home dashboard
Diffstat (limited to 'Hutch/Views/Tickets')
| -rw-r--r-- | Hutch/Views/Tickets/TicketListView.swift | 208 | ||||
| -rw-r--r-- | Hutch/Views/Tickets/TicketListViewModel.swift | 305 |
2 files changed, 513 insertions, 0 deletions
diff --git a/Hutch/Views/Tickets/TicketListView.swift b/Hutch/Views/Tickets/TicketListView.swift index 93a7032..69ab419 100644 --- a/Hutch/Views/Tickets/TicketListView.swift +++ b/Hutch/Views/Tickets/TicketListView.swift @@ -6,10 +6,12 @@ struct TicketListView: View { let trackerId: Int let trackerRid: String + @AppStorage(AppStorageKeys.swipeActionsEnabled) private var swipeActionsEnabled = true @Environment(AppState.self) private var appState @State private var viewModel: TicketListViewModel? @State private var showCreateTicketSheet = false @State private var createdTicket: TicketSummary? + @State private var labelEditorTicket: LabelEditorTicket? var body: some View { Group { @@ -45,6 +47,15 @@ struct TicketListView: View { } } } + .sheet(item: $labelEditorTicket) { item in + if let viewModel { + TicketLabelsSheet( + ticketId: item.id, + viewModel: viewModel + ) + .presentationDetents([.medium]) + } + } .navigationDestination(isPresented: Binding( get: { createdTicket != nil }, set: { isPresented in @@ -63,6 +74,7 @@ struct TicketListView: View { ownerUsername: ownerUsername, trackerName: trackerName, trackerId: trackerId, + trackerRid: trackerRid, client: appState.client ) viewModel = vm @@ -93,6 +105,16 @@ struct TicketListView: View { NavigationLink(value: ticket) { TicketRowView(ticket: ticket) } + .swipeActions(edge: .leading, allowsFullSwipe: true) { + if swipeActionsEnabled { + ticketLeadingSwipeAction(ticket, viewModel: viewModel) + } + } + .swipeActions(edge: .trailing, allowsFullSwipe: false) { + if swipeActionsEnabled { + ticketTrailingSwipeActions(ticket, viewModel: viewModel) + } + } .task { await viewModel.loadMoreIfNeeded(currentItem: ticket) } @@ -144,6 +166,106 @@ struct TicketListView: View { TicketDetailView(ownerUsername: ownerUsername, trackerName: trackerName, trackerId: trackerId, trackerRid: trackerRid, ticketId: ticket.id) } } + + @ViewBuilder + private func ticketLeadingSwipeAction( + _ ticket: TicketSummary, + viewModel: TicketListViewModel + ) -> some View { + if ticket.status.isOpen { + Button { + Task { + await resolveTicket(ticket, viewModel: viewModel) + } + } label: { + Label("Resolve", systemImage: "checkmark.circle") + } + .tint(.green) + } else { + Button { + Task { + await reopenTicket(ticket, viewModel: viewModel) + } + } label: { + Label("Reopen", systemImage: "arrow.uturn.backward") + } + .tint(.blue) + } + } + + private func resolveTicket(_ ticket: TicketSummary, viewModel: TicketListViewModel) async { + await viewModel.resolveTicket(ticket) + } + + private func reopenTicket(_ ticket: TicketSummary, viewModel: TicketListViewModel) async { + await viewModel.reopenTicket(ticket) + } + + @ViewBuilder + private func ticketTrailingSwipeActions( + _ ticket: TicketSummary, + viewModel: TicketListViewModel + ) -> some View { + Button { + labelEditorTicket = LabelEditorTicket(id: ticket.id) + Task { await viewModel.loadTrackerLabels() } + } label: { + Label("Edit Labels", systemImage: "tag") + } + .tint(.purple) + + if let currentUser = appState.currentUser { + let isAssigned = ticket.assignees.contains { assignee in + matchesAssignee(assignee, user: currentUser) + } + + if isAssigned { + Button { + Task { + await viewModel.unassignFromMe(ticket: ticket, user: currentUser) + } + } label: { + Label("Unassign Me", systemImage: "person.badge.minus") + } + .tint(.orange) + } else { + Button { + Task { + await viewModel.assignToMe(ticket: ticket, user: currentUser) + } + } label: { + Label("Assign Me", systemImage: "person.badge.plus") + } + .tint(.cyan) + } + } + } + + private func matchesAssignee(_ entity: Entity, user: User) -> Bool { + let assigneeCanonical = normalizedCanonicalName(entity.canonicalName) + let userCanonical = normalizedCanonicalName(user.canonicalName) + if assigneeCanonical == userCanonical { + return true + } + return normalizedUsername(entity.canonicalName) == normalizedUsername(user.username) + } + + private func normalizedCanonicalName(_ value: String) -> String { + let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines) + if trimmed.hasPrefix("~") { + return trimmed + } + return "~\(trimmed)" + } + + private func normalizedUsername(_ value: String) -> String { + let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines) + return trimmed.hasPrefix("~") ? String(trimmed.dropFirst()) : trimmed + } +} + +private struct LabelEditorTicket: Identifiable { + let id: Int } private struct CreateTicketSheet: View { @@ -191,6 +313,92 @@ private struct CreateTicketSheet: View { } } +private struct TicketLabelsSheet: View { + let ticketId: Int + let viewModel: TicketListViewModel + + @Environment(\.dismiss) private var dismiss + + var body: some View { + NavigationStack { + Group { + if let ticket = viewModel.ticket(withId: ticketId) { + if viewModel.trackerLabels.isEmpty { + if viewModel.isPerformingAction { + ProgressView() + } else { + ContentUnavailableView( + "No Labels", + systemImage: "tag", + description: Text("This tracker has no labels defined.") + ) + } + } else { + List { + ForEach(viewModel.trackerLabels) { label in + TicketListLabelToggleRow( + label: label, + isApplied: ticket.labels.contains(where: { $0.id == label.id }), + isLoading: viewModel.isPerformingAction + ) { shouldApply in + Task { + if shouldApply { + await viewModel.labelTicket(ticket, label: label) + } else { + await viewModel.unlabelTicket(ticket, label: label) + } + } + } + } + } + } + } else { + ContentUnavailableView( + "Ticket Unavailable", + systemImage: "ticket", + description: Text("This ticket is no longer in the current list.") + ) + } + } + .navigationTitle("Labels") + .navigationBarTitleDisplayMode(.inline) + .toolbar { + ToolbarItem(placement: .cancellationAction) { + Button("Done") { dismiss() } + } + } + .task { + if viewModel.trackerLabels.isEmpty { + await viewModel.loadTrackerLabels() + } + } + } + } +} + +private struct TicketListLabelToggleRow: View { + let label: TicketLabel + let isApplied: Bool + let isLoading: Bool + let onToggle: (Bool) -> Void + + var body: some View { + Button { + onToggle(!isApplied) + } label: { + HStack { + LabelPill(label: label) + Spacer() + if isApplied { + Image(systemName: "checkmark") + .foregroundStyle(.blue) + } + } + } + .disabled(isLoading) + } +} + // MARK: - Ticket Row private struct TicketRowView: View { diff --git a/Hutch/Views/Tickets/TicketListViewModel.swift b/Hutch/Views/Tickets/TicketListViewModel.swift index 303fd66..4a9f8df 100644 --- a/Hutch/Views/Tickets/TicketListViewModel.swift +++ b/Hutch/Views/Tickets/TicketListViewModel.swift @@ -19,6 +19,48 @@ private struct TicketsPage: Decodable, Sendable { let cursor: String? } +private struct AssignmentMutationResponse: Decodable, Sendable { + struct EventRef: Decodable, Sendable { + let id: Int + } + + let assignUser: EventRef? + let unassignUser: EventRef? +} + +private struct LabelMutationResponse: Decodable, Sendable { + struct EventRef: Decodable, Sendable { + let id: Int + } + + let labelTicket: EventRef? + let unlabelTicket: EventRef? +} + +private struct TrackerLabelsResponse: Decodable, Sendable { + let user: UserTrackerLabelsWrapper +} + +private struct UserTrackerLabelsWrapper: Decodable, Sendable { + let tracker: TrackerLabelsWrapper +} + +private struct TrackerLabelsWrapper: Decodable, Sendable { + let labels: LabelsPage +} + +private struct LabelsPage: Decodable, Sendable { + let results: [TicketLabel] +} + +private struct UpdateStatusResponse: Decodable, Sendable { + let updateTicketStatus: MutationEventRef +} + +private struct MutationEventRef: Decodable, Sendable { + let eventType: String +} + // MARK: - Filter enum TicketFilter: String, CaseIterable, Sendable { @@ -260,8 +302,233 @@ final class TicketListViewModel { } } + func resolveTicket(_ ticket: TicketSummary) async { + let input: [String: any Sendable] = [ + "status": TicketStatus.resolved.rawValue, + "resolution": TicketResolution.fixed.rawValue + ] + await performStatusUpdate(ticket: ticket, input: input) + } + + func reopenTicket(_ ticket: TicketSummary) async { + let input: [String: any Sendable] = [ + "status": TicketStatus.reported.rawValue + ] + await performStatusUpdate(ticket: ticket, input: input) + } + + func assignToMe(ticket: TicketSummary, user: User) async { + guard !isPerformingAction else { return } + isPerformingAction = true + error = nil + + let original = tickets + if let index = tickets.firstIndex(where: { $0.id == ticket.id }) { + let entity = Entity(canonicalName: user.canonicalName) + let updated = TicketSummary( + id: ticket.id, + title: ticket.title, + status: ticket.status, + resolution: ticket.resolution, + created: ticket.created, + submitter: ticket.submitter, + labels: ticket.labels, + assignees: ticket.assignees + [entity] + ) + tickets[index] = updated + } + + do { + _ = try await client.execute( + service: .todo, + query: Self.assignUserMutation, + variables: [ + "trackerId": trackerId, + "ticketId": ticket.id, + "userId": user.id + ], + responseType: AssignmentMutationResponse.self + ) + } catch { + tickets = original + self.error = error.userFacingMessage + } + + isPerformingAction = false + } + + func unassignFromMe(ticket: TicketSummary, user: User) async { + guard !isPerformingAction else { return } + isPerformingAction = true + error = nil + + let original = tickets + if let index = tickets.firstIndex(where: { $0.id == ticket.id }) { + let filtered = ticket.assignees.filter { assignee in + !Self.matchesAssignee(assignee, user: user) + } + let updated = TicketSummary( + id: ticket.id, + title: ticket.title, + status: ticket.status, + resolution: ticket.resolution, + created: ticket.created, + submitter: ticket.submitter, + labels: ticket.labels, + assignees: filtered + ) + tickets[index] = updated + } + + do { + _ = try await client.execute( + service: .todo, + query: Self.unassignUserMutation, + variables: [ + "trackerId": trackerId, + "ticketId": ticket.id, + "userId": user.id + ], + responseType: AssignmentMutationResponse.self + ) + } catch { + tickets = original + self.error = error.userFacingMessage + } + + isPerformingAction = false + } + + func loadTrackerLabels() async { + do { + let result = try await client.execute( + service: .todo, + query: Self.trackerLabelsQuery, + variables: [ + "owner": ownerUsername, + "tracker": trackerName + ], + responseType: TrackerLabelsResponse.self + ) + trackerLabels = result.user.tracker.labels.results + } catch { + self.error = error.userFacingMessage + } + } + + func labelTicket(_ ticket: TicketSummary, label: TicketLabel) async { + guard !isPerformingAction else { return } + isPerformingAction = true + error = nil + + let original = tickets + if let index = tickets.firstIndex(where: { $0.id == ticket.id }) { + let updated = TicketSummary( + id: ticket.id, + title: ticket.title, + status: ticket.status, + resolution: ticket.resolution, + created: ticket.created, + submitter: ticket.submitter, + labels: ticket.labels + [label], + assignees: ticket.assignees + ) + tickets[index] = updated + } + + do { + _ = try await client.execute( + service: .todo, + query: Self.labelTicketMutation, + variables: [ + "trackerId": trackerId, + "ticketId": ticket.id, + "labelId": label.id + ], + responseType: LabelMutationResponse.self + ) + } catch { + tickets = original + self.error = error.userFacingMessage + } + + isPerformingAction = false + } + + func unlabelTicket(_ ticket: TicketSummary, label: TicketLabel) async { + guard !isPerformingAction else { return } + isPerformingAction = true + error = nil + + let original = tickets + if let index = tickets.firstIndex(where: { $0.id == ticket.id }) { + let filtered = ticket.labels.filter { $0.id != label.id } + let updated = TicketSummary( + id: ticket.id, + title: ticket.title, + status: ticket.status, + resolution: ticket.resolution, + created: ticket.created, + submitter: ticket.submitter, + labels: filtered, + assignees: ticket.assignees + ) + tickets[index] = updated + } + + do { + _ = try await client.execute( + service: .todo, + query: Self.unlabelTicketMutation, + variables: [ + "trackerId": trackerId, + "ticketId": ticket.id, + "labelId": label.id + ], + responseType: LabelMutationResponse.self + ) + } catch { + tickets = original + self.error = error.userFacingMessage + } + + isPerformingAction = false + } + + func ticket(withId ticketId: Int) -> TicketSummary? { + tickets.first(where: { $0.id == ticketId }) + } + // MARK: - Private + private func performStatusUpdate(ticket: TicketSummary, input: [String: any Sendable]) async { + guard !isPerformingAction else { return } + isPerformingAction = true + error = nil + + do { + let variables: [String: any Sendable] = [ + "trackerId": trackerId, + "ticketId": ticket.id, + "input": input + ] + let result = try await client.execute( + service: .todo, + query: Self.updateStatusMutation, + variables: variables, + responseType: UpdateStatusResponse.self + ) + _ = result.updateTicketStatus + if let index = tickets.firstIndex(where: { $0.id == ticket.id }) { + tickets[index] = updatedTicket(from: ticket, input: input) + } + } catch { + self.error = error.userFacingMessage + } + + isPerformingAction = false + } + private func fetchPage(cursor: String?) async throws -> TicketsPage { var variables: [String: any Sendable] = [ "owner": ownerUsername, @@ -282,4 +549,42 @@ final class TicketListViewModel { private struct SubmitTicketResponse: Decodable, Sendable { let submitTicket: TicketSummary } + + private static func matchesAssignee(_ entity: Entity, user: User) -> Bool { + let assigneeCanonical = normalizedCanonicalName(entity.canonicalName) + let userCanonical = normalizedCanonicalName(user.canonicalName) + if assigneeCanonical == userCanonical { + return true + } + return normalizedUsername(entity.canonicalName) == normalizedUsername(user.username) + } + + private static func normalizedCanonicalName(_ value: String) -> String { + let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines) + if trimmed.hasPrefix("~") { + return trimmed + } + return "~\(trimmed)" + } + + private static func normalizedUsername(_ value: String) -> String { + let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines) + return trimmed.hasPrefix("~") ? String(trimmed.dropFirst()) : trimmed + } + + private func updatedTicket(from ticket: TicketSummary, input: [String: any Sendable]) -> TicketSummary { + let updatedStatus = (input["status"] as? String).flatMap(TicketStatus.init(rawValue:)) ?? ticket.status + let updatedResolution = (input["resolution"] as? String).flatMap(TicketResolution.init(rawValue:)) + + return TicketSummary( + id: ticket.id, + title: ticket.title, + status: updatedStatus, + resolution: updatedStatus == .resolved ? updatedResolution : nil, + created: ticket.created, + submitter: ticket.submitter, + labels: ticket.labels, + assignees: ticket.assignees + ) + } } |
