Unify checking whether search filters were passed by the user

mislav · mislav · commit 2fa8a85813a8 · 2021-03-24T18:11:21.000+01:00
diff --git a/pkg/cmd/issue/list/list.go b/pkg/cmd/issue/list/list.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/MakeNowJust/heredoc"
 	"github.com/cli/cli/api"
@@ -96,7 +97,7 @@ func listRun(opts *ListOptions) error {
 
 	filterOptions := prShared.FilterOptions{
 		Entity:    "issue",
-		State:     opts.State,
+		State:     strings.ToLower(opts.State),
 		Assignee:  opts.Assignee,
 		Labels:    opts.Labels,
 		Author:    opts.Author,
@@ -132,8 +133,7 @@ func listRun(opts *ListOptions) error {
 	defer opts.IO.StopPager()
 
 	if isTerminal {
-		hasFilters := opts.State != "open" || len(opts.Labels) > 0 || opts.Assignee != "" || opts.Author != "" || opts.Mention != "" || opts.Milestone != "" || opts.Search != ""
-		title := prShared.ListHeader(ghrepo.FullName(baseRepo), "issue", len(listResult.Issues), listResult.TotalCount, hasFilters)
+		title := prShared.ListHeader(ghrepo.FullName(baseRepo), "issue", len(listResult.Issues), listResult.TotalCount, !filterOptions.IsDefault())
 		fmt.Fprintf(opts.IO.Out, "\n%s\n\n", title)
 	}
 
diff --git a/pkg/cmd/pr/list/list.go b/pkg/cmd/pr/list/list.go
@@ -120,8 +120,7 @@ func listRun(opts *ListOptions) error {
 	defer opts.IO.StopPager()
 
 	if opts.IO.IsStdoutTTY() {
-		hasFilters := opts.State != "open" || len(opts.Labels) > 0 || opts.BaseBranch != "" || opts.Author != "" || opts.Assignee != "" || opts.Search != ""
-		title := shared.ListHeader(ghrepo.FullName(baseRepo), "pull request", len(listResult.PullRequests), listResult.TotalCount, hasFilters)
+		title := shared.ListHeader(ghrepo.FullName(baseRepo), "pull request", len(listResult.PullRequests), listResult.TotalCount, !filters.IsDefault())
 		fmt.Fprintf(opts.IO.Out, "\n%s\n\n", title)
 	}
 
diff --git a/pkg/cmd/pr/shared/params.go b/pkg/cmd/pr/shared/params.go
@@ -153,6 +153,34 @@ type FilterOptions struct {
 	Search     string
 }
 
+func (opts *FilterOptions) IsDefault() bool {
+	if opts.State != "open" {
+		return false
+	}
+	if len(opts.Labels) > 0 {
+		return false
+	}
+	if opts.Assignee != "" {
+		return false
+	}
+	if opts.Author != "" {
+		return false
+	}
+	if opts.BaseBranch != "" {
+		return false
+	}
+	if opts.Mention != "" {
+		return false
+	}
+	if opts.Milestone != "" {
+		return false
+	}
+	if opts.Search != "" {
+		return false
+	}
+	return true
+}
+
 func ListURLWithQuery(listURL string, options FilterOptions) (string, error) {
 	u, err := url.Parse(listURL)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,7 @@ func listRun(opts *ListOptions) error {`
`120`	`120`	`defer opts.IO.StopPager()`
`121`	`121`
`122`	`122`	`if opts.IO.IsStdoutTTY() {`
`123`		`- hasFilters := opts.State != "open" \|\| len(opts.Labels) > 0 \|\| opts.BaseBranch != "" \|\| opts.Author != "" \|\| opts.Assignee != "" \|\| opts.Search != ""`
`124`		`- title := shared.ListHeader(ghrepo.FullName(baseRepo), "pull request", len(listResult.PullRequests), listResult.TotalCount, hasFilters)`
	`123`	`+ title := shared.ListHeader(ghrepo.FullName(baseRepo), "pull request", len(listResult.PullRequests), listResult.TotalCount, !filters.IsDefault())`
`125`	`124`	`fmt.Fprintf(opts.IO.Out, "\n%s\n\n", title)`
`126`	`125`	`}`
`127`	`126`