feat: show loading indicator in tab name

Author: dlvhdr

ui/components/issuessection/issuessection.go

@@ -142,7 +142,7 @@ func (m Model) Update(msg tea.Msg) (section.Section, tea.Cmd) {
 					currIssue.Assignees.Nodes = removeAssignees(currIssue.Assignees.Nodes, msg.RemovedAssignees.Nodes)
 				}
 				m.Issues[i] = currIssue
-				m.Table.SetIsLoading(false)
+				m.SetIsLoading(false)
 				m.Table.SetRows(m.BuildRows())
 				break
 			}
@@ -156,7 +156,7 @@ func (m Model) Update(msg tea.Msg) (section.Section, tea.Cmd) {
 				m.Issues = msg.Issues
 			}
 			m.TotalCount = msg.TotalCount
-			m.Table.SetIsLoading(false)
+			m.SetIsLoading(false)
 			m.PageInfo = &msg.PageInfo
 			m.Table.SetRows(m.BuildRows())
 			m.UpdateLastUpdated(time.Now())
@@ -435,19 +435,16 @@ func (m Model) GetItemPluralForm() string {
 	return "Issues"
 }
 
-func (m Model) GetTotalCount() *int {
-	if m.IsLoading() {
-		return nil
-	}
-	c := m.TotalCount
-	return &c
+func (m Model) GetTotalCount() int {
+	return m.TotalCount
 }
 
-func (m Model) IsLoading() bool {
-	return m.Table.IsLoading()
+func (m *Model) GetIsLoading() bool {
+	return m.IsLoading
 }
 
 func (m *Model) SetIsLoading(val bool) {
+	m.IsLoading = val
 	m.Table.SetIsLoading(val)
 }
 

ui/components/prssection/prssection.go

@@ -171,7 +171,7 @@ func (m Model) Update(msg tea.Msg) (section.Section, tea.Cmd) {
 					currPr.Mergeable = ""
 				}
 				m.Prs[i] = currPr
-				m.Table.SetIsLoading(false)
+				m.SetIsLoading(false)
 				m.Table.SetRows(m.BuildRows())
 				break
 			}
@@ -186,7 +186,7 @@ func (m Model) Update(msg tea.Msg) (section.Section, tea.Cmd) {
 			}
 			m.TotalCount = msg.TotalCount
 			m.PageInfo = &msg.PageInfo
-			m.Table.SetIsLoading(false)
+			m.SetIsLoading(false)
 			m.Table.SetRows(m.BuildRows())
 			m.Table.UpdateLastUpdated(time.Now())
 			m.UpdateTotalItemsCount(m.TotalCount)
@@ -448,10 +448,10 @@ func (m *Model) FetchNextPageSectionRows() []tea.Cmd {
 	}
 	cmds = append(cmds, fetchCmd)
 
+	m.IsLoading = true
 	if isFirstFetch {
-		m.Table.SetIsLoading(true)
+		m.SetIsLoading(true)
 		cmds = append(cmds, m.Table.StartLoadingSpinner())
-
 	}
 
 	return cmds
@@ -533,19 +533,12 @@ func (m Model) GetItemPluralForm() string {
 	return "PRs"
 }
 
-func (m Model) GetTotalCount() *int {
-	if m.IsLoading() {
-		return nil
-	}
-	c := m.TotalCount
-	return &c
-}
-
-func (m Model) IsLoading() bool {
-	return m.Table.IsLoading()
+func (m Model) GetTotalCount() int {
+	return m.TotalCount
 }
 
 func (m *Model) SetIsLoading(val bool) {
+	m.IsLoading = val
 	m.Table.SetIsLoading(val)
 }
 

ui/components/reposection/reposection.go

@@ -174,7 +174,7 @@ func (m *Model) Update(msg tea.Msg) (section.Section, tea.Cmd) {
 
 	case repoMsg:
 		m.repo = msg.repo
-		m.Table.SetIsLoading(false)
+		m.SetIsLoading(false)
 		m.Table.SetRows(m.BuildRows())
 		if msg.resetSelection {
 			m.Table.ResetCurrItem()
@@ -545,16 +545,12 @@ func (m *Model) GetItemPluralForm() string {
 	return "Branches"
 }
 
-func (m *Model) GetTotalCount() *int {
-	if m.IsLoading() {
-		return nil
-	}
-
-	c := len(m.Branches)
-	return &c
+func (m *Model) GetTotalCount() int {
+	return len(m.Branches)
 }
 
 func (m *Model) SetIsLoading(val bool) {
+	m.IsLoading = val
 	m.Table.SetIsLoading(val)
 }
 

ui/components/section/section.go

@@ -45,6 +45,7 @@ type BaseModel struct {
 	IsSearchSupported         bool
 	ShowAuthorIcon            bool
 	IsFilteredByCurrentRemote bool
+	IsLoading                 bool
 }
 
 type NewSectionOptions struct {
@@ -135,7 +136,7 @@ type Section interface {
 	GetPagerContent() string
 	GetItemSingularForm() string
 	GetItemPluralForm() string
-	GetTotalCount() *int
+	GetTotalCount() int
 }
 
 type Identifier interface {
@@ -159,7 +160,7 @@ type Table interface {
 	FetchNextPageSectionRows() []tea.Cmd
 	BuildRows() []table.Row
 	ResetRows()
-	IsLoading() bool
+	GetIsLoading() bool
 	SetIsLoading(val bool)
 }
 
@@ -293,6 +294,10 @@ func (m *BaseModel) IsSearchFocused() bool {
 	return m.IsSearching
 }
 
+func (m *BaseModel) GetIsLoading() bool {
+	return m.IsLoading
+}
+
 func (m *BaseModel) SetIsSearching(val bool) tea.Cmd {
 	m.IsSearching = val
 	if val {
@@ -414,10 +419,6 @@ func (m *BaseModel) UpdateTotalItemsCount(count int) {
 	m.Table.UpdateTotalItemsCount(count)
 }
 
-func (m *BaseModel) IsLoading() bool {
-	return m.Table.IsLoading()
-}
-
 func (m *BaseModel) GetPromptConfirmation() string {
 	if m.IsPromptConfirmationShown {
 		var prompt string

ui/components/tabs/tabs.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 
@@ -13,9 +14,15 @@ import (
 	"github.com/dlvhdr/gh-dash/v4/utils"
 )
 
+type SectionState struct {
+	Count     int
+	IsLoading bool
+	spinner   spinner.Model
+}
+
 type Model struct {
 	sectionsConfigs []config.SectionConfig
-	sectionCounts   []*int
+	sectionCounts   []SectionState
 	CurrSectionId   int
 }
 
@@ -26,16 +33,32 @@ func NewModel(ctx *context.ProgramContext) Model {
 }
 
 func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
-	return m, nil
+	cmds := make([]tea.Cmd, 0)
+	switch msg := msg.(type) {
+	case spinner.TickMsg:
+		for i, s := range m.sectionCounts {
+			if s.IsLoading {
+				var cmd tea.Cmd
+				m.sectionCounts[i].spinner, cmd = s.spinner.Update(msg)
+				cmds = append(cmds, cmd)
+			}
+		}
+	}
+
+	return m, tea.Batch(cmds...)
 }
 
 func (m Model) View(ctx *context.ProgramContext) string {
 	sectionTitles := make([]string, 0, len(m.sectionsConfigs))
 	for i, section := range m.sectionsConfigs {
 		title := section.Title
 		// handle search section
-		if i > 0 && m.sectionCounts[i] != nil && ctx.Config.Theme.Ui.SectionsShowCount {
-			title = fmt.Sprintf("%s (%s)", title, utils.ShortNumber(*m.sectionCounts[i]))
+		if i > 0 {
+			if m.sectionCounts[i].IsLoading {
+				title = fmt.Sprintf("%s %s", title, m.sectionCounts[i].spinner.View())
+			} else {
+				title = fmt.Sprintf("%s (%s)", title, utils.ShortNumber(m.sectionCounts[i].Count))
+			}
 		}
 		sectionTitles = append(sectionTitles, title)
 	}
@@ -68,11 +91,29 @@ func (m *Model) SetCurrSectionId(id int) {
 
 func (m *Model) UpdateSectionsConfigs(ctx *context.ProgramContext) {
 	m.sectionsConfigs = ctx.GetViewSectionsConfig()
+	m.sectionCounts = make([]SectionState, len(m.sectionsConfigs))
+	for i := range m.sectionsConfigs {
+		m.sectionCounts[i] = SectionState{
+			Count:     0,
+			IsLoading: false,
+			spinner:   spinner.New(spinner.WithSpinner(spinner.Dot), spinner.WithStyle(lipgloss.NewStyle().Foreground(ctx.Theme.FaintText).PaddingLeft(2))),
+		}
+	}
 }
 
 func (m *Model) UpdateSectionCounts(sections []section.Section) {
-	m.sectionCounts = make([]*int, len(sections))
 	for i, s := range sections {
-		m.sectionCounts[i] = s.GetTotalCount()
+		m.sectionCounts[i].Count = s.GetTotalCount()
+		m.sectionCounts[i].IsLoading = s.GetIsLoading()
 	}
 }
+
+func (m *Model) SetAllLoading() []tea.Cmd {
+	cmds := make([]tea.Cmd, 0)
+	for i := range m.sectionCounts {
+		m.sectionCounts[i].IsLoading = true
+		cmds = append(cmds, m.sectionCounts[i].spinner.Tick)
+	}
+
+	return cmds
+}

ui/ui.go

@@ -604,6 +604,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 	}
 
+	m.tabs, tabsCmd = m.tabs.Update(msg)
 	m.tabs.UpdateSectionCounts(m.getCurrentViewSections())
 
 	sectionCmd := m.updateCurrentSection(msg)
@@ -766,15 +767,23 @@ func (m *Model) syncSidebar() tea.Cmd {
 }
 
 func (m *Model) fetchAllViewSections() ([]section.Section, tea.Cmd) {
+	cmds := make([]tea.Cmd, 0)
+	cmds = append(cmds, m.tabs.SetAllLoading()...)
+
 	if m.ctx.View == config.RepoView {
 		var cmd tea.Cmd
 		s, cmd := reposection.FetchAllBranches(m.ctx)
+		cmds = append(cmds, cmd)
 		m.repo = &s
-		return nil, cmd
+		return nil, tea.Batch(cmds...)
 	} else if m.ctx.View == config.PRsView {
-		return prssection.FetchAllSections(m.ctx, m.prs)
+		s, prcmds := prssection.FetchAllSections(m.ctx, m.prs)
+		cmds = append(cmds, prcmds)
+		return s, tea.Batch(cmds...)
 	} else {
-		return issuessection.FetchAllSections(m.ctx)
+		s, issuecmds := issuessection.FetchAllSections(m.ctx)
+		cmds = append(cmds, issuecmds)
+		return s, tea.Batch(cmds...)
 	}
 }