Merge pull request cli#11497 from cli/11409-pr-view-v2-projects

View v2 projects in `gh pr view` output

Author: andyfeller

api/queries_projects_v2.go

@@ -150,8 +150,9 @@ func ProjectsV2ItemsForPullRequest(client *Client, repo ghrepo.Interface, pr *Pu
 		Repository struct {
 			PullRequest struct {
 				ProjectItems struct {
-					Nodes    []*projectV2Item
-					PageInfo struct {
+					TotalCount int
+					Nodes      []*projectV2Item
+					PageInfo   struct {
 						HasNextPage bool
 						EndCursor   string
 					}

pkg/cmd/pr/view/fixtures/prViewPreviewWithMetadataByNumber.json

@@ -54,6 +54,33 @@
           ],
           "totalcount": 5
         },
+        "projectitems": {
+          "totalCount": 2,
+          "nodes": [
+            {
+              "id": "NO_STATUS_ITEM",
+              "project": {
+                "id": "PROJECT1",
+                "title": "v2 Project 1"
+              },
+              "status": {
+                "optionId": "",
+                "name": ""
+              }
+            },
+            {
+              "id": "DONE_STATUS_ITEM",
+              "project": {
+                "id": "PROJECT2",
+                "title": "v2 Project 2"
+              },
+              "status": {
+                "optionId": "PROJECTITEMFIELD1",
+                "name": "Done"
+              }
+            }
+          ]
+        },
         "projectcards": {
           "nodes": [
             {

pkg/cmd/pr/view/view.go

@@ -85,7 +85,7 @@ var defaultFields = []string{
 	"url", "number", "title", "state", "body", "author", "autoMergeRequest",
 	"isDraft", "maintainerCanModify", "mergeable", "additions", "deletions", "commitsCount",
 	"baseRefName", "headRefName", "headRepositoryOwner", "headRepository", "isCrossRepository",
-	"reviewRequests", "reviews", "assignees", "labels", "projectCards", "milestone",
+	"reviewRequests", "reviews", "assignees", "labels", "projectCards", "projectItems", "milestone",
 	"comments", "reactionGroups", "createdAt", "statusCheckRollup",
 }
 
@@ -439,11 +439,23 @@ func prLabelList(pr api.PullRequest, cs *iostreams.ColorScheme) string {
 }
 
 func prProjectList(pr api.PullRequest) string {
-	if len(pr.ProjectCards.Nodes) == 0 {
+	totalCount := pr.ProjectCards.TotalCount + pr.ProjectItems.TotalCount
+	count := len(pr.ProjectCards.Nodes) + len(pr.ProjectItems.Nodes)
+
+	if count == 0 {
 		return ""
 	}
 
 	projectNames := make([]string, 0, len(pr.ProjectCards.Nodes))
+
+	for _, project := range pr.ProjectItems.Nodes {
+		colName := project.Status.Name
+		if colName == "" {
+			colName = "No Status"
+		}
+		projectNames = append(projectNames, fmt.Sprintf("%s (%s)", project.Project.Title, colName))
+	}
+
 	for _, project := range pr.ProjectCards.Nodes {
 		if project == nil {
 			continue
@@ -456,7 +468,7 @@ func prProjectList(pr api.PullRequest) string {
 	}
 
 	list := strings.Join(projectNames, ", ")
-	if pr.ProjectCards.TotalCount > len(pr.ProjectCards.Nodes) {
+	if totalCount > count {
 		list += ", …"
 	}
 	return list

pkg/cmd/pr/view/view_test.go

@@ -286,7 +286,7 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`reviewers:\t1 \(Requested\)\n`,
 				`assignees:\tmarseilles, monaco\n`,
 				`labels:\tClosed: Duplicate, Closed: Won't Fix, help wanted, Status: In Progress, Type: Bug\n`,
-				`projects:\tProject 1 \(column A\), Project 2 \(column B\), Project 3 \(column C\), Project 4 \(Awaiting triage\)\n`,
+				`projects:\tv2 Project 1 \(No Status\), v2 Project 2 \(Done\), Project 1 \(column A\), Project 2 \(column B\), Project 3 \(column C\), Project 4 \(Awaiting triage\)\n`,
 				`milestone:\tuluru\n`,
 				`\*\*blueberries taste good\*\*`,
 			},
@@ -457,7 +457,7 @@ func TestPRView_Preview(t *testing.T) {
 				`Reviewers:.*1 \(.*Requested.*\)\n`,
 				`Assignees:.*marseilles, monaco\n`,
 				`Labels:.*Closed: Duplicate, Closed: Won't Fix, help wanted, Status: In Progress, Type: Bug\n`,
-				`Projects:.*Project 1 \(column A\), Project 2 \(column B\), Project 3 \(column C\), Project 4 \(Awaiting triage\)\n`,
+				`Projects:.*v2 Project 1 \(No Status\), v2 Project 2 \(Done\), Project 1 \(column A\), Project 2 \(column B\), Project 3 \(column C\), Project 4 \(Awaiting triage\)\n`,
 				`Milestone:.*uluru\n`,
 				`blueberries taste good`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/12`,