Merge remote-tracking branch 'origin/dev' into fix-approved-plugins

Author: artaasadi

Diff for: cmd/plugin/cmd.go

@@ -5,7 +5,8 @@ import (
 )
 
 var PluginCmd = &cobra.Command{
-	Use: "plugin",
+	Use:   "plugin",
+	Short: "Manage plugins",
 	PreRunE: func(cmd *cobra.Command, args []string) error {
 		return nil
 	},

Diff for: cmd/predef/login.go

@@ -11,7 +11,8 @@ import (
 const RetrySleep = 3
 
 var LoginCmd = &cobra.Command{
-	Use: "login",
+	Use:   "login",
+	Short: "Login to Kaytu",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		cfg, err := server.GetConfig()
 		if err != nil {

Diff for: cmd/predef/logout.go

@@ -6,7 +6,8 @@ import (
 )
 
 var LogoutCmd = &cobra.Command{
-	Use: "logout",
+	Use:   "logout",
+	Short: "Logout from Kaytu",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		err := server.RemoveConfig()
 		if err != nil {

Diff for: cmd/predef/version.go

@@ -9,7 +9,8 @@ import (
 
 // VersionCmd represents the version command
 var VersionCmd = &cobra.Command{
-	Use: "version",
+	Use:   "version",
+	Short: "Print the version number of Kaytu CLI",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println(version.VERSION)
 	},

Diff for: cmd/root.go

@@ -25,6 +25,8 @@ var optimizeCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	},
+	Short: "Identify right sizing opportunities based on your usage",
+	Long:  "Identify right sizing opportunities based on your usage",
 }
 
 // rootCmd represents the base command when called without any subcommands
@@ -89,8 +91,9 @@ func Execute() {
 		for _, loopCmd := range plg.Config.Commands {
 			cmd := loopCmd
 			theCmd := &cobra.Command{
-				Use:  cmd.Name,
-				Long: cmd.Description,
+				Use:   cmd.Name,
+				Short: cmd.Description,
+				Long:  cmd.Description,
 				RunE: func(c *cobra.Command, args []string) error {
 					cfg, err := server.GetConfig()
 					if err != nil {
@@ -218,11 +221,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 +237,6 @@ func Execute() {
 							optimizationsPage,
 							optimizationsDetailsPage,
 							preferencesPage,
-							helpPage,
 							jobsPage,
 						), tea.WithFPS(10))
 						if _, err := p.Run(); err != nil {

Diff for: 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 for: view/page_help.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 for: view/page_jobs.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
 }