render info box but buggy

vilmibm · vilmibm · commit a8d032fcfd19 · 2020-11-25T17:14:59.000-08:00
diff --git a/pkg/cmd/project/http.go b/pkg/cmd/project/http.go
@@ -30,10 +30,6 @@ func getProject(client *api.Client, baseRepo ghrepo.Interface, projectID int) (*
 		return nil, err
 	}
 
-	titled := struct {
-		Title string
-	}{}
-
 	for _, column := range project.Columns {
 		data, err := client.GetProjectCards(baseRepo, column.ID)
 		if err != nil {
@@ -53,11 +49,10 @@ func getProject(client *api.Client, baseRepo ghrepo.Interface, projectID int) (*
 					return nil, err
 				}
 
-				err = json.Unmarshal(data, &titled)
+				err = json.Unmarshal(data, &card.Content)
 				if err != nil {
 					return nil, err
 				}
-				card.Note = titled.Title
 			}
 		}
 	}
diff --git a/pkg/cmd/project/project.go b/pkg/cmd/project/project.go
@@ -2,6 +2,7 @@ package project
 
 import (
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/cli/cli/api"
@@ -48,10 +49,16 @@ func NewCmdProject(f *cmdutil.Factory, runF func(*ProjectOptions) error) *cobra.
 	return cmd
 }
 
+type Content struct {
+	Title string
+	Body  string
+}
+
 type Card struct {
 	Note       string
 	ID         int
 	ContentURL string `json:"content_url"`
+	Content    *Content
 }
 
 type Column struct {
@@ -185,7 +192,10 @@ loop:
 				}
 				drawRect(s, cardStyle, colX+1, (ic*cardHeight)+colY+2, cardWidth, cardHeight, bold)
 				cardNote := card.Note
-				if len(card.Note) > cardWidth-2 {
+				if cardNote == "" {
+					cardNote = card.Content.Title
+				}
+				if len(cardNote) > cardWidth-2 {
 					cardNote = cardNote[0 : cardWidth-2]
 				} else if cardNote == "" {
 					cardNote = `¯\_(ツ)_/¯`
@@ -200,7 +210,29 @@ loop:
 		infoWidth := colWidth * 2
 		infoHeight := colHeight
 		drawRect(s, style, infoX, infoY, infoWidth, infoHeight, true)
-		drawStr(s, infoX+1, infoY+1, style, cardInfo.Note)
+		if cardInfo.Content != nil {
+			title := cardInfo.Content.Title
+			if len(title) > infoWidth-2 {
+				title = title[0 : infoWidth-2]
+			}
+			drawStr(s, infoX+1, infoY+1, style, title)
+
+			// TODO markdown rendering did _not_ output correctly; lots of escaped ANSI
+
+			bodyLines := strings.Split(cardInfo.Content.Body, "\n")
+			for i, line := range bodyLines {
+				if infoY+2+i > infoHeight-2 {
+					break
+				}
+				outLine := line
+				if len(outLine) > infoWidth-2 {
+					outLine = outLine[0 : infoWidth-2]
+				}
+				drawStr(s, infoX+1, infoY+2+i, style, outLine)
+			}
+		} else {
+			drawStr(s, infoX+1, infoY+1, style, cardInfo.Note)
+		}
 
 		s.Show()
 	}

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,6 @@ func getProject(client api.Client, baseRepo ghrepo.Interface, projectID int) (`
`30`	`30`	`return nil, err`
`31`	`31`	`}`
`32`	`32`
`33`		`- titled := struct {`
`34`		`- Title string`
`35`		`- }{}`
`36`		`-`
`37`	`33`	`for _, column := range project.Columns {`
`38`	`34`	`data, err := client.GetProjectCards(baseRepo, column.ID)`
`39`	`35`	`if err != nil {`
`@@ -53,11 +49,10 @@ func getProject(client api.Client, baseRepo ghrepo.Interface, projectID int) (`
`53`	`49`	`return nil, err`
`54`	`50`	`}`
`55`	`51`
`56`		`- err = json.Unmarshal(data, &titled)`
	`52`	`+ err = json.Unmarshal(data, &card.Content)`
`57`	`53`	`if err != nil {`
`58`	`54`	`return nil, err`
`59`	`55`	`}`
`60`		`- card.Note = titled.Title`
`61`	`56`	`}`
`62`	`57`	`}`
`63`	`58`	`}`