Improve disable logic for branch combo box.

ccmenu · Feb 9, 2025 · 39c5b9b · 39c5b9b
1 parent d0f84e8
commit 39c5b9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CCMenu/Source/Pipeline Window/GitHub Sheets/AddGitHubPipelineSheet.swift b/CCMenu/Source/Pipeline Window/GitHub Sheets/AddGitHubPipelineSheet.swift
@@ -109,7 +109,7 @@ struct AddGitHubPipelineSheet: View {
                 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: "("))
+                        .disabled(!workflowList.selected.isValid)
                         .onReceive(branch.$text) { t in
                             builder.branch = t
                         }

diff --git a/CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubPipelineBuilder.swift b/CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubPipelineBuilder.swift
@@ -26,10 +26,10 @@ class GitHubPipelineBuilder: ObservableObject {
 
     var canMakePipeline: Bool {
         guard !name.isEmpty else { return false }
-        guard let owner else { return false }
-        guard let repository else { return false }
+        guard owner?.isEmpty == false else { return false }
+        guard repository?.isEmpty == false else { return false }
         guard let workflow, workflow.isValid else { return false }
-        guard let branch else { return false }
+        guard branch != nil else { return false }
         return true
     }