changes:

- added the boilerplate for an endpoints view
- added a way to order views so that they dont switch around in the heading

Author: yashranjan1

internal/tui/app/model.go

@@ -1,13 +1,15 @@
 package app
 
 import (
+	"sort"
 	"strings"
 
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/maniac-en/req/internal/tui/keybinds"
+	"github.com/maniac-en/req/internal/tui/messages"
 	"github.com/maniac-en/req/internal/tui/styles"
 	"github.com/maniac-en/req/internal/tui/views"
 )
@@ -16,8 +18,14 @@ type ViewName string
 
 const (
 	Collections ViewName = "collections"
+	Endpoints   ViewName = "endpoints"
 )
 
+type Heading struct {
+	name  string
+	order int
+}
+
 type AppModel struct {
 	ctx         *Context
 	width       int
@@ -39,9 +47,15 @@ func (a AppModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.WindowSizeMsg:
 		a.height = msg.Height
 		a.width = msg.Width
-		a.Views[a.focusedView], cmd = a.Views[a.focusedView].Update(tea.WindowSizeMsg{Height: a.AvailableHeight(), Width: msg.Width})
+		for key, _ := range a.Views {
+			a.Views[key], cmd = a.Views[key].Update(tea.WindowSizeMsg{Height: a.AvailableHeight(), Width: msg.Width})
+			cmds = append(cmds, cmd)
+		}
 		cmds = append(cmds, cmd)
 		return a, tea.Batch(cmds...)
+	case messages.ChooseCollection:
+		a.focusedView = Endpoints
+		return a, tea.Batch(cmds...)
 	case tea.KeyMsg:
 		switch {
 		case key.Matches(msg, keybinds.Keys.Quit):
@@ -82,14 +96,28 @@ func (a *AppModel) AvailableHeight() int {
 func (a AppModel) Header() string {
 	var b strings.Builder
 
-	for key, value := range a.Views {
-		if key == a.focusedView {
-			b.WriteString(styles.TabHeadingActive.Render(value.Name()))
+	// INFO: this might be a bit messy, could be a nice idea to look into OrderedMaps maybe?
+	views := []Heading{}
+	for key := range a.Views {
+		views = append(views, Heading{
+			name:  a.Views[key].Name(),
+			order: a.Views[key].Order(),
+		})
+	}
+	sort.Slice(views, func(i, j int) bool {
+		return views[i].order < views[j].order
+	})
+
+	for _, item := range views {
+		if item.name == a.Views[a.focusedView].Name() {
+			b.WriteString(styles.TabHeadingActive.Render(item.name))
 		} else {
-			b.WriteString(styles.TabHeadingInactive.Render(value.Name()))
+			b.WriteString(styles.TabHeadingInactive.Render(item.name))
 		}
 	}
+
 	b.WriteString(styles.TabHeadingInactive.Render(""))
+
 	return b.String()
 }
 
@@ -112,7 +140,8 @@ func NewAppModel(ctx *Context) AppModel {
 		keys:        appKeybinds,
 	}
 	model.Views = map[ViewName]views.ViewInterface{
-		Collections: views.NewCollectionsView(model.ctx.Collections),
+		Collections: views.NewCollectionsView(model.ctx.Collections, 1),
+		Endpoints:   views.NewEndpointsView(2),
 	}
 	return model
 }

internal/tui/components/OptionsProvider/component.go

@@ -67,6 +67,8 @@ func (o OptionsProvider[T, U]) Update(msg tea.Msg) (OptionsProvider[T, U], tea.C
 					return o, tea.Batch(cmds...)
 				case key.Matches(msg, o.keys.DeleteItem):
 					return o, func() tea.Msg { return messages.DeleteItem{ItemID: int64(o.GetSelected().ID)} }
+				case key.Matches(msg, o.keys.Choose):
+					return o, func() tea.Msg { return messages.ChooseCollection{} }
 				case key.Matches(msg, o.keys.EditItem):
 					o.list.SetSize(o.list.Width(), o.height-lipgloss.Height(o.input.View()))
 					o.input.SetInput(o.GetSelected().Name)

internal/tui/keybinds/collections-binds.go

@@ -14,6 +14,7 @@ type ListKeyMap struct {
 	AddItem              key.Binding
 	EditItem             key.Binding
 	DeleteItem           key.Binding
+	Choose               key.Binding
 	Accept               key.Binding
 	Back                 key.Binding
 }
@@ -41,6 +42,7 @@ func NewListKeyMap() *ListKeyMap {
 		AddItem:              Keys.InsertItem,
 		DeleteItem:           Keys.Remove,
 		EditItem:             Keys.EditItem,
+		Choose:               Keys.Choose,
 		Accept:               Keys.Choose,
 		Back:                 Keys.Back,
 	}

internal/tui/messages/messages.go

@@ -7,7 +7,11 @@ type ItemEdited struct {
 	Item   string
 	ItemID int64
 }
+
 type DeleteItem struct {
 	ItemID int64
 }
+
+type ChooseCollection struct{}
+
 type DeactivateView struct{}

internal/tui/views/collections-view.go

@@ -21,6 +21,7 @@ type CollectionsView struct {
 	manager *collections.CollectionsManager
 	help    help.Model
 	keys    *keybinds.ListKeyMap
+	order   int
 }
 
 func (c CollectionsView) Init() tea.Cmd {
@@ -67,6 +68,10 @@ func (c CollectionsView) View() string {
 	return c.list.View()
 }
 
+func (c CollectionsView) Order() int {
+	return c.order
+}
+
 func (c CollectionsView) OnFocus() {
 
 }
@@ -88,7 +93,7 @@ func itemMapper(items []collections.CollectionEntity) []list.Item {
 	return opts
 }
 
-func NewCollectionsView(collManager *collections.CollectionsManager) *CollectionsView {
+func NewCollectionsView(collManager *collections.CollectionsManager, order int) *CollectionsView {
 	keybinds := keybinds.NewListKeyMap()
 	config := defaultListConfig[collections.CollectionEntity, string](keybinds)
 
@@ -101,5 +106,6 @@ func NewCollectionsView(collManager *collections.CollectionsManager) *Collection
 		manager: collManager,
 		help:    help.New(),
 		keys:    keybinds,
+		order:   order,
 	}
 }

internal/tui/views/endpoints-view.go

@@ -0,0 +1,60 @@
+package views
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+)
+
+type EndpointsView struct {
+	height int
+	width  int
+	order  int
+}
+
+func (e EndpointsView) Init() tea.Cmd {
+	return nil
+}
+
+func (e EndpointsView) Name() string {
+	return "Endpoints"
+}
+
+func (e EndpointsView) Help() []key.Binding {
+	return []key.Binding{}
+}
+
+func (e EndpointsView) GetFooterSegment() string {
+	return ""
+}
+
+func (e EndpointsView) Update(msg tea.Msg) (ViewInterface, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		e.height = msg.Height
+		e.width = msg.Width
+	}
+	return e, nil
+}
+
+func (e EndpointsView) View() string {
+	return lipgloss.NewStyle().Height(e.height).Width(e.width).Align(lipgloss.Center, lipgloss.Center).Render("Endpoints View!")
+}
+
+func (e EndpointsView) OnFocus() {
+
+}
+
+func (e EndpointsView) OnBlur() {
+
+}
+
+func (e EndpointsView) Order() int {
+	return e.order
+}
+
+func NewEndpointsView(order int) *EndpointsView {
+	return &EndpointsView{
+		order: order,
+	}
+}

internal/tui/views/types.go

@@ -12,6 +12,7 @@ type ViewInterface interface {
 	GetFooterSegment() string
 	Update(tea.Msg) (ViewInterface, tea.Cmd)
 	View() string
+	Order() int
 	OnFocus()
 	OnBlur()
 }