From 39c5b9bc0db2e7363a5c0533f387d7ea876fd676 Mon Sep 17 00:00:00 2001 From: Erik Doernenburg Date: Sun, 9 Feb 2025 19:47:40 +0100 Subject: [PATCH] Improve disable logic for branch combo box. --- .../GitHub Sheets/AddGitHubPipelineSheet.swift | 2 +- .../GitHub Sheets/GitHubPipelineBuilder.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CCMenu/Source/Pipeline Window/GitHub Sheets/AddGitHubPipelineSheet.swift b/CCMenu/Source/Pipeline Window/GitHub Sheets/AddGitHubPipelineSheet.swift index 1f20edb..1bca225 100644 --- 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 index 7d4efba..3c33f3c 100644 --- 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 }