From 7e5e3dc76c1e1a3d0154340a6dfc5f1d13e025e5 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Mon, 24 Apr 2023 08:36:22 +0100 Subject: [PATCH] refactor: rename updateBoard to updateColumns --- internal/ui/column.go | 31 +++++++++++++++++++++++++++++++ internal/ui/ui.go | 31 +------------------------------ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/internal/ui/column.go b/internal/ui/column.go index a0985a7..7f3a3bc 100644 --- a/internal/ui/column.go +++ b/internal/ui/column.go @@ -1,6 +1,10 @@ package ui import ( + "fmt" + + "codeflow.dananglin.me.uk/apollo/canal/internal/board" + "github.com/gdamore/tcell/v2" "github.com/rivo/tview" ) @@ -69,3 +73,30 @@ func (u *UI) shiftColumnFocus(s int) { u.setColumnFocus() } + +func (u *UI) updateColumns(statusList []board.Status) error { + u.flex.Clear() + + columns := make([]column, len(statusList)) + + for i := range statusList { + columns[i] = u.newColumn(statusList[i].ID, statusList[i].Name) + + if len(statusList[i].CardIds) > 0 { + cards, err := u.board.CardList(statusList[i].CardIds) + if err != nil { + return fmt.Errorf("unable to get the card list. %w", err) + } + + for _, c := range cards { + columns[i].cards.AddItem(fmt.Sprintf("[%d] %s", c.Id(), c.Title), "", 0, nil) + } + } + + u.flex.AddItem(columns[i].cards, 0, 1, false) + } + + u.columns = columns + + return nil +} diff --git a/internal/ui/ui.go b/internal/ui/ui.go index 327aa4a..d30f015 100644 --- a/internal/ui/ui.go +++ b/internal/ui/ui.go @@ -1,7 +1,5 @@ package ui -// TODO: Update card status (card ID, oldStatus, newStatus) - import ( "fmt" @@ -147,7 +145,7 @@ func (u *UI) refresh() error { return fmt.Errorf("unable to get the status list, %w", err) } - u.updateBoard(statusList) + u.updateColumns(statusList) u.setColumnFocus() @@ -159,30 +157,3 @@ func (u *UI) shutdown() { u.closeBoard() u.Stop() } - -func (u *UI) updateBoard(statusList []board.Status) error { - u.flex.Clear() - - columns := make([]column, len(statusList)) - - for i := range statusList { - columns[i] = u.newColumn(statusList[i].ID, statusList[i].Name) - - if len(statusList[i].CardIds) > 0 { - cards, err := u.board.CardList(statusList[i].CardIds) - if err != nil { - return fmt.Errorf("unable to get the card list. %w", err) - } - - for _, c := range cards { - columns[i].cards.AddItem(fmt.Sprintf("[%d] %s", c.Id(), c.Title), "", 0, nil) - } - } - - u.flex.AddItem(columns[i].cards, 0, 1, false) - } - - u.columns = columns - - return nil -}