Merge pull request cli#550 from rista404/draft-pr-212

Nate Smith · web-flow · commit 39bdeee13b7a · 2020-02-25T16:51:59.000-06:00
Use gray color for PR number if PR is a draft
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -40,6 +40,7 @@ type PullRequest struct {
 		}
 	}
 	IsCrossRepository   bool
+	IsDraft             bool
 	MaintainerCanModify bool
 
 	ReviewDecision string
@@ -156,6 +157,7 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
 			login
 		}
 		isCrossRepository
+		isDraft
 		commits(last: 1) {
 			nodes {
 				commit {
@@ -366,6 +368,7 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, branch string)
 						login
 					}
 					isCrossRepository
+					isDraft
 				}
 			}
 		}
@@ -460,6 +463,7 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]
 			login
 		}
 		isCrossRepository
+		isDraft
 	}
 	`
 
diff --git a/command/pr.go b/command/pr.go
@@ -214,7 +214,7 @@ func prList(cmd *cobra.Command, args []string) error {
 		if table.IsTTY() {
 			prNum = "#" + prNum
 		}
-		table.AddField(prNum, nil, colorFuncForState(pr.State))
+		table.AddField(prNum, nil, colorFuncForPR(pr))
 		table.AddField(replaceExcessiveWhitespace(pr.Title), nil, nil)
 		table.AddField(pr.HeadLabel(), nil, utils.Cyan)
 		table.EndRow()
@@ -227,6 +227,14 @@ func prList(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+func colorFuncForPR(pr api.PullRequest) func(string) string {
+	if pr.State == "OPEN" && pr.IsDraft {
+		return utils.Gray
+	} else {
+		return colorFuncForState(pr.State)
+	}
+}
+
 func colorFuncForState(state string) func(string) string {
 	switch state {
 	case "OPEN":
@@ -385,7 +393,13 @@ func prSelectorForCurrentBranch(ctx context.Context) (prNumber int, prHeadRef st
 func printPrs(w io.Writer, totalCount int, prs ...api.PullRequest) {
 	for _, pr := range prs {
 		prNumber := fmt.Sprintf("#%d", pr.Number)
-		fmt.Fprintf(w, "  %s  %s %s", utils.Green(prNumber), text.Truncate(50, replaceExcessiveWhitespace(pr.Title)), utils.Cyan("["+pr.HeadLabel()+"]"))
+
+		prNumberColorFunc := utils.Green
+		if pr.IsDraft {
+			prNumberColorFunc = utils.Gray
+		}
+
+		fmt.Fprintf(w, "  %s  %s %s", prNumberColorFunc(prNumber), text.Truncate(50, replaceExcessiveWhitespace(pr.Title)), utils.Cyan("["+pr.HeadLabel()+"]"))
 
 		checks := pr.ChecksStatus()
 		reviews := pr.ReviewStatus()

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ type PullRequest struct {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`IsCrossRepository bool`
	`43`	`+ IsDraft bool`
`43`	`44`	`MaintainerCanModify bool`
`44`	`45`
`45`	`46`	`ReviewDecision string`
`@@ -156,6 +157,7 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu`
`156`	`157`	`login`
`157`	`158`	`}`
`158`	`159`	`isCrossRepository`
	`160`	`+ isDraft`
`159`	`161`	`commits(last: 1) {`
`160`	`162`	`nodes {`
`161`	`163`	`commit {`
`@@ -366,6 +368,7 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, branch string)`
`366`	`368`	`login`
`367`	`369`	`}`
`368`	`370`	`isCrossRepository`
	`371`	`+ isDraft`
`369`	`372`	`}`
`370`	`373`	`}`
`371`	`374`	`}`
`@@ -460,6 +463,7 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]`
`460`	`463`	`login`
`461`	`464`	`}`
`462`	`465`	`isCrossRepository`
	`466`	`+ isDraft`
`463`	`467`	`}`
`464`	`468`	`
`465`	`469`