Added ordering by build result as proposed in #7.

Author: erikdoe

CCMenu/Source/Menu Bar Extra/MenuBarExtraMenu.swift

@@ -60,23 +60,20 @@ struct MenuBarExtraMenu: View {
         case .sortedAlphabetically:
             return filtered.sorted(by: { $0.name.lowercased() < $1.name.lowercased() })
         case .sortedByBuildTime:
-            return filtered.sorted(by: {p1, p2 in
-				let r1 = p1.status.lastBuild?.result
-				let r2 = p2.status.lastBuild?.result
+            return filtered.sorted(by: { $0.status.lastBuild?.timestamp ?? Date.distantPast >
+                $1.status.lastBuild?.timestamp ?? Date.distantPast})
+        case .sortedByBuildResult:
+            return filtered.sorted(by: { p1, p2 in
+                let r1 = p1.status.lastBuild?.result ?? BuildResult.unknown
+                let r2 = p2.status.lastBuild?.result ?? BuildResult.unknown
 				if (r1 != r2) {
-					if (r1 == nil) {
-						return false
-					}
-					else if (r2 == nil) {
-						return true
-					}
-					let resultOrder = [
-						BuildResult.failure, BuildResult.success,
-						BuildResult.unknown, BuildResult.other
-					]
-					return resultOrder.firstIndex(of: r1!)! < resultOrder.firstIndex(of: r2!)!
-				}
-				return p1.status.lastBuild?.timestamp ?? Date.distantFuture > p2.status.lastBuild?.timestamp ?? Date.distantFuture
+                    let resultOrder: [BuildResult] = [ .failure, .success, .other, .unknown ]
+					return (resultOrder.firstIndex(of: r1) ?? Int.max) <
+                        (resultOrder.firstIndex(of: r2) ?? Int.max)
+                } else {
+                    return p1.status.lastBuild?.timestamp ?? Date.distantPast >
+                        p2.status.lastBuild?.timestamp ?? Date.distantFuture
+                }
 			})
         }
     }

CCMenu/Source/Miscellaneous/UserDefaultsExtension.swift

@@ -10,9 +10,9 @@ enum MenuSortOrder: Int, CaseIterable, Identifiable {
     case // Int raw values for compatibility with legacy defaults
     asArranged,
     sortedAlphabetically,
-    sortedByBuildTime
+    sortedByBuildTime,
+    sortedByBuildResult
 
-    // TODO: Wasn't there a way to do without this?
     var id: Self { self }
 }
 
@@ -22,7 +22,6 @@ enum AppIconVisibility: String, CaseIterable, Identifiable {
     sometimes,
     always
 
-    // TODO: Wasn't there a way to do without this?
     var id: Self { self }
 }
 
@@ -82,8 +81,6 @@ extension AppStorage {
         self.init(wrappedValue: wrappedValue, key.rawValue, store: UserDefaults.active)
     }
 
-    // TODO: Find out how to combine the following cases, which are all RawRepresentable
-
     init(wrappedValue: Value, _ key: DefaultsKey) where Value == MenuSortOrder {
         self.init(wrappedValue: wrappedValue, key.rawValue, store: UserDefaults.active)
     }

CCMenu/Source/Settings/AppearanceSettings.swift

@@ -55,6 +55,8 @@ struct AppearanceSettings: View {
                         .accessibilityIdentifier("Order alphabetically")
                     Text("ordered by last build time").tag(MenuSortOrder.sortedByBuildTime)
                         .accessibilityIdentifier("Order last build time")
+                    Text("ordered by last build result").tag(MenuSortOrder.sortedByBuildResult)
+                        .accessibilityIdentifier("Order last build result")
                 }
                 .pickerStyle(.radioGroup)
                 .labelsHidden()

CCMenuUITests/MenuTests.swift

@@ -69,6 +69,16 @@ class MenuTests: XCTestCase {
         XCTAssertEqual("connectfour", menu.menuItems.element(boundBy: 1).title)
         XCTAssertEqual("ccmenu", menu.menuItems.element(boundBy: 2).title)
 
+        // Open settings and set order to last build result
+        menu.menuItems["Settings..."].click()
+        window.radioButtons["Order last build result"].click()
+
+        // Make sure the pipelines are shown in desired order
+        TestHelper.openMenu(app: app)
+        XCTAssertEqual("connectfour", menu.menuItems.element(boundBy: 0).title)
+        XCTAssertEqual("ccmenu2 | Build and test", menu.menuItems.element(boundBy: 1).title)
+        XCTAssertEqual("ccmenu", menu.menuItems.element(boundBy: 2).title)
+
         // Chose to hide pipelines with successful builds
         menu.menuItems["Settings..."].click()
         XCTAssert(window.checkBoxes["Hide successful builds"].isSelected == false)