fixes

StefKors · Nov 1, 2024 · 6881e00 · 6881e00
1 parent e5b3ef5
commit 6881e00
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/Shared/UserInterface/Models/PipelineStatus.swift b/Shared/UserInterface/Models/PipelineStatus.swift
@@ -33,7 +33,7 @@ enum PipelineStatus: String, Codable, Equatable {
     case manual = "MANUAL"
     /// Pipeline is scheduled to run.
     case scheduled = "SCHEDULED"
-
+    
     static func from(_ state: GitHub.CheckStatusState?) -> Self? {
         switch state {
         case .pending: return .pending
@@ -45,4 +45,19 @@ enum PipelineStatus: String, Codable, Equatable {
         case .none: return nil
         }
     }
+
+    static func from(_ state: GitHub.CheckConclusionState?) -> Self? {
+        switch state {
+        case .success: return .success
+        case .failure: return .failed
+        case .skipped: return .skipped
+        case .actionRequired: return .manual
+        case .timedOut: return .failed
+        case .cancelled: return .canceled
+        case .neutral: return .created
+        case .stale: return .pending // I guess?
+        case .startupFailure: return .failed
+        case .none: return nil
+        }
+    }
 }
diff --git a/Shared/UserInterface/Views/ActionsView.swift b/Shared/UserInterface/Views/ActionsView.swift
@@ -56,7 +56,7 @@ struct ActionsView: View {
                         }
                         .zIndex(2)
 
-                    let isLast = index == stages.count - 1
+                    let isLast = index == Array(groupedByWorkflow.keys.enumerated()).count - 1
                     if !isLast {
                         Rectangle()
                             .fill(.quaternary)

diff --git a/Shared/UserInterface/Views/GitHubCIJobsView.swift b/Shared/UserInterface/Views/GitHubCIJobsView.swift
@@ -86,7 +86,7 @@ struct GitHubCIJobsView: View {
                                let destination = URL(string: path) {
                                 HStack {
                                     Link(destination: destination, label: {
-                                        CIStatusView(status: PipelineStatus.from(stage.status))
+                                        CIStatusView(status: PipelineStatus.from(stage.conclusion))
                                         Text(stage.name ?? "")
                                     })
                                 }