fix: Fixes pages

kaytu-io · May 21, 2024 · 3dd8cdc · 3dd8cdc
1 parent 497f8e6
commit 3dd8cdc
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 100 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -218,11 +218,10 @@ func Execute() {
 						return err
 					} else {
 						helpController := controller.NewHelp()
-						helpPage := view.NewHelpPage(helpController)
 
 						jobsController := controller.NewJobs()
 						statusBar := view.NewStatusBarView(jobsController, helpController)
-						jobsPage := view.NewJobsPage(jobsController)
+						jobsPage := view.NewJobsPage(jobsController, helpController, statusBar)
 
 						optimizationsController := controller.NewOptimizations()
 						optimizationsPage := view.NewOptimizationsView(optimizationsController, helpController, statusBar)
@@ -235,7 +234,6 @@ func Execute() {
 							optimizationsPage,
 							optimizationsDetailsPage,
 							preferencesPage,
-							helpPage,
 							jobsPage,
 						), tea.WithFPS(10))
 						if _, err := p.Run(); err != nil {

diff --git a/view/app.go b/view/app.go
@@ -9,11 +9,10 @@ import (
 type PageEnum int
 
 const (
-	Page_Optimizations       = 0
-	Page_OptimizationDetails = 1
-	Page_Preferences         = 2
-	Page_Help                = 3
-	Page_Jobs                = 4
+	Page_Overview        = 0
+	Page_ResourceDetails = 1
+	Page_Preferences     = 2
+	Page_Jobs            = 3
 )
 
 type Page interface {
@@ -36,10 +35,9 @@ type App struct {
 }
 
 func NewApp(
-	optimizationsPage OptimizationsPage,
-	optimizationDetailsPage OptimizationDetailsPage,
-	preferencesPage PreferencesConfigurationPage,
-	helpPage HelpPage,
+	optimizationsPage OverviewPage,
+	optimizationDetailsPage ResourceDetailsPage,
+	preferencesPage PreferencesPage,
 	jobsPage JobsPage,
 ) *App {
 	app := &App{}
@@ -49,7 +47,6 @@ func NewApp(
 		optimizationsPage,
 		optimizationDetailsPage,
 		preferencesPage,
-		helpPage,
 		jobsPage,
 	}
 	return app
@@ -77,7 +74,7 @@ func (m *App) ChangePage(id PageEnum) tea.Cmd {
 }
 
 func (m *App) Init() tea.Cmd {
-	m.ChangePage(Page_Optimizations)
+	m.ChangePage(Page_Overview)
 	return tea.Batch(m.pages[m.activePageIdx].Init(), tea.EnterAltScreen, TickCmdWithDuration(100*time.Microsecond))
 }
 

diff --git a/view/page_help.go b/view/page_help.go
diff --git a/view/page_jobs.go b/view/page_jobs.go
@@ -11,27 +11,39 @@ import (
 )
 
 type JobsPage struct {
-	jobController *controller.Jobs
+	helpController *controller.Help
+	jobController  *controller.Jobs
+	statusBar      StatusBarView
 
 	responsive.ResponsiveView
 }
 
-func NewJobsPage(jobController *controller.Jobs) JobsPage {
+func NewJobsPage(jobController *controller.Jobs, helpController *controller.Help, statusBar StatusBarView) JobsPage {
 	return JobsPage{
-		jobController: jobController,
+		jobController:  jobController,
+		helpController: helpController,
+		statusBar:      statusBar,
 	}
 }
 
 func (m JobsPage) OnClose() Page {
 	return m
 }
 func (m JobsPage) OnOpen() Page {
+	m.helpController.SetKeyMap([]string{
+		"esc: back to main menu",
+		"q/ctrl+c: exit",
+	})
+
 	return m
 }
 
 func (m JobsPage) Init() tea.Cmd { return nil }
 
 func (m JobsPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	newStatusBar, _ := m.statusBar.Update(msg)
+	m.statusBar = newStatusBar.(StatusBarView)
+
 	return m, nil
 }
 
@@ -65,7 +77,8 @@ func (m JobsPage) View() string {
 		lines = append(lines, " no running job")
 	}
 
-	return "\n" + statusErr + strings.Join(lines, "\n")
+	return "\n" + statusErr + strings.Join(lines, "\n") + "\n\n" +
+		m.statusBar.View()
 }
 func (m JobsPage) SetResponsiveView(rv responsive.ResponsiveViewInterface) Page {
 	m.ResponsiveView = rv.(responsive.ResponsiveView)

diff --git a/view/page_optimization.go → view/page_overview.go b/view/page_optimization.go → view/page_overview.go
@@ -10,7 +10,7 @@ import (
 	"github.com/kaytu-io/kaytu/view/responsive"
 )
 
-type OptimizationsPage struct {
+type OverviewPage struct {
 	table       table.Model
 	clearScreen bool
 
@@ -26,7 +26,7 @@ func NewOptimizationsView(
 	optimizations *controller.Optimizations,
 	helpController *controller.Help,
 	statusBar StatusBarView,
-) OptimizationsPage {
+) OverviewPage {
 	columns := []table.Column{
 		table.NewColumn("0", "Resource Id", 23),
 		table.NewColumn("1", "Resource Name", 23),
@@ -44,17 +44,17 @@ func NewOptimizationsView(
 		BorderRounded().
 		HighlightStyle(style.HighlightStyle)
 
-	return OptimizationsPage{
+	return OverviewPage{
 		optimizations:  optimizations,
 		helpController: helpController,
 		table:          t,
 		statusBar:      statusBar,
 	}
 }
-func (m OptimizationsPage) OnClose() Page {
+func (m OverviewPage) OnClose() Page {
 	return m
 }
-func (m OptimizationsPage) OnOpen() Page {
+func (m OverviewPage) OnOpen() Page {
 	m.helpController.SetKeyMap([]string{
 		"↑/↓: move",
 		"pgdown/pgup: next/prev page",
@@ -69,11 +69,11 @@ func (m OptimizationsPage) OnOpen() Page {
 	return m
 }
 
-func (m OptimizationsPage) Init() tea.Cmd {
+func (m OverviewPage) Init() tea.Cmd {
 	return nil
 }
 
-func (m OptimizationsPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (m OverviewPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var rows Rows
 	for _, i := range m.optimizations.Items() {
 		totalSaving := 0.0
@@ -168,7 +168,7 @@ func (m OptimizationsPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			for _, i := range m.optimizations.Items() {
 				if selectedInstanceID == i.Id && !i.Skipped && !i.Loading && !i.LazyLoadingEnabled {
 					m.optimizations.SelectItem(i)
-					changePageCmd = m.app.ChangePage(Page_OptimizationDetails)
+					changePageCmd = m.app.ChangePage(Page_ResourceDetails)
 					break
 				} else if selectedInstanceID == i.Id && !i.Skipped && i.LazyLoadingEnabled {
 					i.LazyLoadingEnabled = false
@@ -194,7 +194,7 @@ func (m OptimizationsPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, cmd
 }
 
-func (m OptimizationsPage) View() string {
+func (m OverviewPage) View() string {
 	//if m.clearScreen {
 	//	m.clearScreen = false
 	//	return ""
@@ -216,12 +216,12 @@ func (m OptimizationsPage) View() string {
 	)
 }
 
-func (m OptimizationsPage) SetApp(app *App) OptimizationsPage {
+func (m OverviewPage) SetApp(app *App) OverviewPage {
 	m.app = app
 	return m
 }
 
-func (m OptimizationsPage) SetResponsiveView(rv responsive.ResponsiveViewInterface) Page {
+func (m OverviewPage) SetResponsiveView(rv responsive.ResponsiveViewInterface) Page {
 	m.ResponsiveView = rv.(responsive.ResponsiveView)
 	return m
 }
diff --git a/view/page_preferences_configuration.go → view/page_preferences.go b/view/page_preferences_configuration.go → view/page_preferences.go
@@ -17,7 +17,7 @@ type (
 	errMsg error
 )
 
-type PreferencesConfigurationPage struct {
+type PreferencesPage struct {
 	focused int
 	err     error
 
@@ -36,15 +36,15 @@ func NewPreferencesConfiguration(
 	helpController *controller.Help,
 	optimizations *controller.Optimizations,
 	statusBar StatusBarView,
-) PreferencesConfigurationPage {
-	return PreferencesConfigurationPage{
+) PreferencesPage {
+	return PreferencesPage{
 		helpController: helpController,
 		optimizations:  optimizations,
 		statusBar:      statusBar,
 	}
 }
 
-func (m PreferencesConfigurationPage) OnOpen() Page {
+func (m PreferencesPage) OnOpen() Page {
 	m.visibleStartIdx = 0
 	var preferences []*golang.PreferenceItem
 	if selectedItem := m.optimizations.SelectedItem(); selectedItem != nil {
@@ -84,7 +84,7 @@ func (m PreferencesConfigurationPage) OnOpen() Page {
 	return m
 }
 
-func (m PreferencesConfigurationPage) OnClose() Page {
+func (m PreferencesPage) OnClose() Page {
 	selectedItem := m.optimizations.SelectedItem()
 	if selectedItem == nil {
 		for _, selectedItem := range m.optimizations.Items() {
@@ -114,11 +114,11 @@ func (m PreferencesConfigurationPage) OnClose() Page {
 	return m
 }
 
-func (m PreferencesConfigurationPage) Init() tea.Cmd {
+func (m PreferencesPage) Init() tea.Cmd {
 	return textinput.Blink
 }
 
-func (m PreferencesConfigurationPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (m PreferencesPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		switch msg.Type {
@@ -162,7 +162,7 @@ func (m PreferencesConfigurationPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, cmd
 }
 
-func (m PreferencesConfigurationPage) View() string {
+func (m PreferencesPage) View() string {
 	builder := strings.Builder{}
 
 	builder.WriteString(style.SvcDisable.Render("Configure your preferences:"))
@@ -204,7 +204,7 @@ func (m PreferencesConfigurationPage) View() string {
 	return builder.String()
 }
 
-func (m *PreferencesConfigurationPage) ChangeService(svc string) {
+func (m *PreferencesPage) ChangeService(svc string) {
 	if svc == "All" {
 		for _, i := range m.items {
 			i.hidden = false
@@ -242,7 +242,7 @@ func numberValidator(s string) error {
 	return nil
 }
 
-func (m *PreferencesConfigurationPage) fixVisibleStartIdx() {
+func (m *PreferencesPage) fixVisibleStartIdx() {
 	for m.focused < m.visibleStartIdx {
 		m.visibleStartIdx--
 	}
@@ -253,14 +253,14 @@ func (m *PreferencesConfigurationPage) fixVisibleStartIdx() {
 	}
 }
 
-func (m *PreferencesConfigurationPage) nextInput() {
+func (m *PreferencesPage) nextInput() {
 	m.focused = (m.focused + 1) % len(m.items)
 	if m.items[m.focused].hidden {
 		m.nextInput()
 	}
 }
 
-func (m *PreferencesConfigurationPage) prevInput() {
+func (m *PreferencesPage) prevInput() {
 	m.focused--
 	// Wrap around
 	if m.focused < 0 {
@@ -271,7 +271,7 @@ func (m *PreferencesConfigurationPage) prevInput() {
 	}
 }
 
-func (m PreferencesConfigurationPage) SetResponsiveView(rv responsive.ResponsiveViewInterface) Page {
+func (m PreferencesPage) SetResponsiveView(rv responsive.ResponsiveViewInterface) Page {
 	m.ResponsiveView = rv.(responsive.ResponsiveView)
 	return m
 }