Merge pull request #148 from kaytu-io/fix-pages

salehkhazaei · web-flow · commit cea196dbb084 · 2024-05-21T19:23:22.000+04:00
fix: Fixes pages
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_overview.go b/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.go b/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
 }
diff --git a/view/page_resource_details.go b/view/page_resource_details.go

Original file line number	Diff line number	Diff line change
`@@ -11,27 +11,39 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type JobsPage struct {`
`14`		`- jobController *controller.Jobs`
	`14`	`+ helpController *controller.Help`
	`15`	`+ jobController *controller.Jobs`
	`16`	`+ statusBar StatusBarView`
`15`	`17`
`16`	`18`	`responsive.ResponsiveView`
`17`	`19`	`}`
`18`	`20`
`19`		`-func NewJobsPage(jobController *controller.Jobs) JobsPage {`
	`21`	`+func NewJobsPage(jobController controller.Jobs, helpController controller.Help, statusBar StatusBarView) JobsPage {`
`20`	`22`	`return JobsPage{`
`21`		`- jobController: jobController,`
	`23`	`+ jobController: jobController,`
	`24`	`+ helpController: helpController,`
	`25`	`+ statusBar: statusBar,`
`22`	`26`	`}`
`23`	`27`	`}`
`24`	`28`
`25`	`29`	`func (m JobsPage) OnClose() Page {`
`26`	`30`	`return m`
`27`	`31`	`}`
`28`	`32`	`func (m JobsPage) OnOpen() Page {`
	`33`	`+ m.helpController.SetKeyMap([]string{`
	`34`	`+ "esc: back to main menu",`
	`35`	`+ "q/ctrl+c: exit",`
	`36`	`+ })`
	`37`	`+`
`29`	`38`	`return m`
`30`	`39`	`}`
`31`	`40`
`32`	`41`	`func (m JobsPage) Init() tea.Cmd { return nil }`
`33`	`42`
`34`	`43`	`func (m JobsPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {`
	`44`	`+ newStatusBar, _ := m.statusBar.Update(msg)`
	`45`	`+ m.statusBar = newStatusBar.(StatusBarView)`
	`46`	`+`
`35`	`47`	`return m, nil`
`36`	`48`	`}`
`37`	`49`
`@@ -65,7 +77,8 @@ func (m JobsPage) View() string {`
`65`	`77`	`lines = append(lines, " no running job")`
`66`	`78`	`}`
`67`	`79`
`68`		`- return "\n" + statusErr + strings.Join(lines, "\n")`
	`80`	`+ return "\n" + statusErr + strings.Join(lines, "\n") + "\n\n" +`
	`81`	`+ m.statusBar.View()`
`69`	`82`	`}`
`70`	`83`	`func (m JobsPage) SetResponsiveView(rv responsive.ResponsiveViewInterface) Page {`
`71`	`84`	`m.ResponsiveView = rv.(responsive.ResponsiveView)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type (`
`17`	`17`	`errMsg error`
`18`	`18`	`)`
`19`	`19`
`20`		`-type PreferencesConfigurationPage struct {`
	`20`	`+type PreferencesPage struct {`
`21`	`21`	`focused int`
`22`	`22`	`err error`
`23`	`23`
`@@ -36,15 +36,15 @@ func NewPreferencesConfiguration(`
`36`	`36`	`helpController *controller.Help,`
`37`	`37`	`optimizations *controller.Optimizations,`
`38`	`38`	`statusBar StatusBarView,`
`39`		`-) PreferencesConfigurationPage {`
`40`		`- return PreferencesConfigurationPage{`
	`39`	`+) PreferencesPage {`
	`40`	`+ return PreferencesPage{`
`41`	`41`	`helpController: helpController,`
`42`	`42`	`optimizations: optimizations,`
`43`	`43`	`statusBar: statusBar,`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`-func (m PreferencesConfigurationPage) OnOpen() Page {`
	`47`	`+func (m PreferencesPage) OnOpen() Page {`
`48`	`48`	`m.visibleStartIdx = 0`
`49`	`49`	`var preferences []*golang.PreferenceItem`
`50`	`50`	`if selectedItem := m.optimizations.SelectedItem(); selectedItem != nil {`
`@@ -84,7 +84,7 @@ func (m PreferencesConfigurationPage) OnOpen() Page {`
`84`	`84`	`return m`
`85`	`85`	`}`
`86`	`86`
`87`		`-func (m PreferencesConfigurationPage) OnClose() Page {`
	`87`	`+func (m PreferencesPage) OnClose() Page {`
`88`	`88`	`selectedItem := m.optimizations.SelectedItem()`
`89`	`89`	`if selectedItem == nil {`
`90`	`90`	`for _, selectedItem := range m.optimizations.Items() {`
`@@ -114,11 +114,11 @@ func (m PreferencesConfigurationPage) OnClose() Page {`
`114`	`114`	`return m`
`115`	`115`	`}`
`116`	`116`
`117`		`-func (m PreferencesConfigurationPage) Init() tea.Cmd {`
	`117`	`+func (m PreferencesPage) Init() tea.Cmd {`
`118`	`118`	`return textinput.Blink`
`119`	`119`	`}`
`120`	`120`
`121`		`-func (m PreferencesConfigurationPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {`
	`121`	`+func (m PreferencesPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {`
`122`	`122`	`switch msg := msg.(type) {`
`123`	`123`	`case tea.KeyMsg:`
`124`	`124`	`switch msg.Type {`
`@@ -162,7 +162,7 @@ func (m PreferencesConfigurationPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {`
`162`	`162`	`return m, cmd`
`163`	`163`	`}`
`164`	`164`
`165`		`-func (m PreferencesConfigurationPage) View() string {`
	`165`	`+func (m PreferencesPage) View() string {`
`166`	`166`	`builder := strings.Builder{}`
`167`	`167`
`168`	`168`	`builder.WriteString(style.SvcDisable.Render("Configure your preferences:"))`
`@@ -204,7 +204,7 @@ func (m PreferencesConfigurationPage) View() string {`
`204`	`204`	`return builder.String()`
`205`	`205`	`}`
`206`	`206`
`207`		`-func (m *PreferencesConfigurationPage) ChangeService(svc string) {`
	`207`	`+func (m *PreferencesPage) ChangeService(svc string) {`
`208`	`208`	`if svc == "All" {`
`209`	`209`	`for _, i := range m.items {`
`210`	`210`	`i.hidden = false`
`@@ -242,7 +242,7 @@ func numberValidator(s string) error {`
`242`	`242`	`return nil`
`243`	`243`	`}`
`244`	`244`
`245`		`-func (m *PreferencesConfigurationPage) fixVisibleStartIdx() {`
	`245`	`+func (m *PreferencesPage) fixVisibleStartIdx() {`
`246`	`246`	`for m.focused < m.visibleStartIdx {`
`247`	`247`	`m.visibleStartIdx--`
`248`	`248`	`}`
`@@ -253,14 +253,14 @@ func (m *PreferencesConfigurationPage) fixVisibleStartIdx() {`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
`256`		`-func (m *PreferencesConfigurationPage) nextInput() {`
	`256`	`+func (m *PreferencesPage) nextInput() {`
`257`	`257`	`m.focused = (m.focused + 1) % len(m.items)`
`258`	`258`	`if m.items[m.focused].hidden {`
`259`	`259`	`m.nextInput()`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`263`		`-func (m *PreferencesConfigurationPage) prevInput() {`
	`263`	`+func (m *PreferencesPage) prevInput() {`
`264`	`264`	`m.focused--`
`265`	`265`	`// Wrap around`
`266`	`266`	`if m.focused < 0 {`
`@@ -271,7 +271,7 @@ func (m *PreferencesConfigurationPage) prevInput() {`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`
`274`		`-func (m PreferencesConfigurationPage) SetResponsiveView(rv responsive.ResponsiveViewInterface) Page {`
	`274`	`+func (m PreferencesPage) SetResponsiveView(rv responsive.ResponsiveViewInterface) Page {`
`275`	`275`	`m.ResponsiveView = rv.(responsive.ResponsiveView)`
`276`	`276`	`return m`
`277`	`277`	`}`