Switched to combo box for selection of branch.

This addresses #18.

Author: erikdoe

CCMenu/Source/Pipeline Window/GitHub Sheets/AddGitHubPipelineSheet.swift

@@ -15,6 +15,7 @@ struct AddGitHubPipelineSheet: View {
     @StateObject private var repository = DebouncedText()
     @StateObject private var repositoryList = GitHubRepositoryList()
     @StateObject private var workflowList = GitHubWorkflowList()
+    @StateObject private var branch = DebouncedText()
     @StateObject private var branchList = GitHubBranchList()
     @StateObject private var builder = GitHubPipelineBuilder()
 
@@ -105,15 +106,16 @@ struct AddGitHubPipelineSheet: View {
                     builder.workflow = workflowList.selected
                 }
 
-                Picker("Branch:", selection: $branchList.selected) {
-                    ForEach(branchList.items) { b in
-                        Text(b.name).tag(b)
-                    }
-                }
-                .accessibilityIdentifier("Branch picker")
-                .disabled(!branchList.selected.isValid)
-                .onChange(of: branchList.selected) { _ in
-                    builder.branch = branchList.selected
+                LabeledContent("Branch:") {
+                    ComboBox(items: branchList.items.map({ $0.name }), text: $branch.input)
+                        .accessibilityIdentifier("Branch combo box")
+                        .disabled(owner.text.isEmpty || repository.text.isEmpty || repository.text.starts(with: "("))
+                        .onReceive(branch.$text) { t in
+                            builder.branch = t
+                        }
+                        .onSubmit {
+                            branch.takeInput()
+                        }
                 }
                 .padding(.bottom)
 

CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubBranchList.swift

@@ -22,7 +22,7 @@ class GitHubBranchList: ObservableObject {
         if branches.count > 0 && !branches[0].isValid {
             return branches
         }
-        branches.insert(GitHubBranch(name: "all branches"), at: 0)
+        branches.insert(GitHubBranch(name: ""), at: 0)
         return branches
     }
 

CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubPipelineBuilder.swift

@@ -11,7 +11,7 @@ class GitHubPipelineBuilder: ObservableObject {
     var owner: String?
     var repository: String? { didSet { setDefaultName() } }
     var workflow: GitHubWorkflow? { didSet { setDefaultName() } }
-    var branch: GitHubBranch? { didSet { setDefaultName() } }
+    var branch: String? { didSet { setDefaultName() } }
 
     func setDefaultName() {
         var newName = ""
@@ -29,7 +29,7 @@ class GitHubPipelineBuilder: ObservableObject {
         guard let owner else { return false }
         guard let repository else { return false }
         guard let workflow, workflow.isValid else { return false }
-        guard let branch, branch.isValid else { return false }
+        guard let branch else { return false }
         return true
     }
 
@@ -38,8 +38,8 @@ class GitHubPipelineBuilder: ObservableObject {
         guard let owner else { return nil }
         guard let repository else { return nil }
         guard let workflow, workflow.isValid else { return nil }
-        guard let branch, branch.isValid else { return nil }
-        let branchName = branch.isAllBranchPlaceholder ? nil : branch.name
+        guard let branch else { return nil }
+        let branchName = branch.isEmpty ? nil : branch
 
         var url: URL? = nil
         let workflowPathComponents = [ workflow.filename, String(workflow.id) ]

CCMenuUITests/GitHubTests.swift

@@ -203,13 +203,15 @@ class GitHubTests: XCTestCase {
         // Make sure that the repositories and branches are loaded
         let repositoryBox = sheet.comboBoxes["Repository combo box"]
         expectation(for: NSPredicate(format: "value == 'ccmenu2'"), evaluatedWith: repositoryBox)
-        let branchPicker = sheet.popUpButtons["Branch picker"]
-        expectation(for: NSPredicate(format: "value == 'all branches'"), evaluatedWith: branchPicker)
+        let branchBox = sheet.comboBoxes["Branch combo box"]
+        expectation(for: NSPredicate(format: "value == ''"), evaluatedWith: branchBox)
         waitForExpectations(timeout: 5)
 
-        // Open the branch picker, select the main branch, and close the sheet
-        branchPicker.click()
-        branchPicker.menuItems["main"].click()
+        // Open the branch combo box, select the main branch, and close the sheet
+        branchBox.descendants(matching: .button).firstMatch.click()
+        branchBox.textFields["main"].click()
+        expectation(for: NSPredicate(format: "value == 'main'"), evaluatedWith: branchBox)
+        waitForExpectations(timeout: 2)
         sheet.buttons["Apply"].click()
 
         // Make sure the status is fetched and the request uses the branch