diff --git a/jira/issues.go b/jira/issues.go index a8ad546f..35bedde1 100644 --- a/jira/issues.go +++ b/jira/issues.go @@ -13,6 +13,7 @@ type IssueFields struct { Summary string `json:"summary"` IssueType *IssueType `json:"issuetype"` + IssueStatus *IssueStatus `json:"status"` } type IssueType struct { @@ -23,3 +24,9 @@ type IssueType struct { Name string `json:"name"` Subtask bool `json:"subtask"` } + +type IssueStatus struct { + ISelf string `json:"self"` + IDescription string `json:"description"` + IName string `json:"name"` +} diff --git a/jira/widget.go b/jira/widget.go index 80942e7d..cd9f80f2 100644 --- a/jira/widget.go +++ b/jira/widget.go @@ -113,12 +113,13 @@ func (widget *Widget) contentFrom(searchResult *SearchResult) string { for idx, issue := range searchResult.Issues { fmtStr := fmt.Sprintf( - `["%d"][""][%s] [%s]%-6s[white] [green]%-10s[white] [%s]%s`, + `["%d"][""][%s] [%s]%-6s[white] [green]%-10s[white] [yellow][%s][white] [%s]%s`, idx, widget.rowColor(idx), widget.issueTypeColor(&issue), issue.IssueFields.IssueType.Name, issue.Key, + issue.IssueFields.IssueStatus.IName, widget.rowColor(idx), issue.IssueFields.Summary, ) diff --git a/zendesk/widget.go b/zendesk/widget.go index 816a48e4..7d1b08ab 100644 --- a/zendesk/widget.go +++ b/zendesk/widget.go @@ -125,6 +125,16 @@ func (widget *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey { return nil } switch event.Key() { + case tcell.KeyDown: + // Select the next item down + widget.next() + widget.display() + return nil + case tcell.KeyUp: + // Select the next item up + widget.prev() + widget.display() + return nil case tcell.KeyEnter: widget.openTicket() return nil