Merge pull request #8 from redis-field-engineering/more-edits

More edits

Author: slorello89

BulkUpdateConfirmation/BulkUpdateConfirmation.go

@@ -50,21 +50,21 @@ func (m Model) View() string {
 	body := strings.Builder{}
 
 	if len(m.rulesToAdd) > 0 {
-		body.WriteString("======Rules To Add======\n")
+		body.WriteString("====== Rules to Add ======\n")
 		for _, r := range m.rulesToAdd {
 			body.WriteString(r.Formatted() + "\n")
 		}
 	}
 
 	if len(m.rulesToUpdate) > 0 {
-		body.WriteString("\n\n======Rules To Update======b\n")
+		body.WriteString("\n\n====== Rules To Update ======\n")
 		for _, r := range m.rulesToUpdate {
 			body.WriteString(fmt.Sprintf("%s\n", r.Formatted()))
 		}
 	}
 
 	if len(m.rulesToDelete) > 0 {
-		body.WriteString("\n\n======Rules To Delete======\n")
+		body.WriteString("\n\n====== Rules to Delete ======\n")
 		for _, r := range m.rulesToDelete {
 			body.WriteString(fmt.Sprintf("%s\n", r.Formatted()))
 		}

RuleDialog/RuleDialog.go

@@ -2,16 +2,17 @@ package RuleDialog
 
 import (
 	"fmt"
-	"github.com/charmbracelet/bubbles/list"
-	"github.com/charmbracelet/bubbles/textinput"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
-	"github.com/redis/go-redis/v9"
 	"io"
 	"smart-cache-cli/ConfirmationDialog"
 	"smart-cache-cli/RedisCommon"
 	"smart-cache-cli/util"
 	"strings"
+
+	"github.com/charmbracelet/bubbles/list"
+	"github.com/charmbracelet/bubbles/textinput"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/redis/go-redis/v9"
 )
 
 type item struct{ ruleType RedisCommon.RuleType }
@@ -242,22 +243,22 @@ func (m Model) View() string {
 	var b strings.Builder
 
 	if m.ruleType == RedisCommon.Unknown {
-		b.WriteString("select a rule type, press ctrl+b to return to the previous screen\n")
+		b.WriteString("  == Create rule menu ==\n\n  Select the type of rule you want to create.\n  Press [CTRL+B] to return to the previous screen.\n\n")
 		b.WriteString(m.typeSelectorList.View())
 		return b.String()
 	} else if m.match == "" && m.ruleType != RedisCommon.All {
 		b.WriteString(m.ruleSoFar())
 		if m.ruleType == RedisCommon.Regex {
-			b.WriteString("Input a regular expression to match against:")
+			b.WriteString("Enter a regular expression to match against:")
 		} else if m.ruleType == RedisCommon.QueryIds {
-			b.WriteString("Input a comma delimited list of Query Ids to match against:")
+			b.WriteString("Enter a comma-separated list of Query IDs to match against:")
 		} else {
-			b.WriteString("Input a comma delimited list of tables to match against:")
+			b.WriteString("Enter a comma-separated list of tables to match against:")
 		}
 		b.WriteString(m.textInput.View())
 	} else {
 		b.WriteString(m.ruleSoFar())
-		b.WriteString("Input TTL in the form of a duration e.g. 1h, 300s, 5m: ")
+		b.WriteString("Enter a TTL in the form of a duration (e.g. 1h, 300s, 5m):")
 		b.WriteString(m.textInput.View())
 	}
 

TableList/TableList.go

@@ -93,7 +93,7 @@ func (m Model) View() string {
 	body := strings.Builder{}
 	body.WriteString("Press [ENTER] to update the TTL for a table\n")
 	body.WriteString("Press 'b' to go back\n")
-	body.WriteString("Press 's' to change sorting\n")
+	body.WriteString("Press 's' to change sorting\n\n")
 	body.WriteString(m.table.View())
 
 	return body.String()

cmd/listqueries.go

@@ -33,7 +33,7 @@ const (
 // listqCmd represents the listq command
 var listqCmd = &cobra.Command{
 	Use:   "listqueries",
-	Short: "List queries seen by Redis Smart Cache",
+	Short: "List the queries seen by Redis Smart Cache",
 	Long:  `List queries seen by `,
 	Run: func(cmd *cobra.Command, args []string) {
 		rdb := redis.NewClient(&redis.Options{

cmd/listtables.go

@@ -18,8 +18,8 @@ import (
 // listtablesCmd represents the listtables command
 var listtablesCmd = &cobra.Command{
 	Use:   "listtables",
-	Short: "List the tables being profiled by Redis Smart Cache.",
-	Long:  `List the tables being profiled by Redis Smart CAche.`,
+	Short: "List the tables being profiled by Redis Smart Cache",
+	Long:  `List the tables being profiled by Redis Smart Cache`,
 	Run: func(cmd *cobra.Command, args []string) {
 		rdb := redis.NewClient(&redis.Options{
 			Addr:     fmt.Sprintf("%s:%s", HostName, Port),

cmd/makerule.go

@@ -18,8 +18,8 @@ import (
 // makeruleCmd represents the makerule command
 var makeruleCmd = &cobra.Command{
 	Use:   "makerule",
-	Short: "Create a Redis Smart Cache caching rule",
-	Long:  `Creates a Redis Smart Cache caching rule`,
+	Short: "Create a caching rule",
+	Long:  `Creates a caching rule`,
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("makerule called")
 		rdb := redis.NewClient(&redis.Options{

cmd/root.go

@@ -79,7 +79,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&HostName, "host", "n", "localhost", "Redis host")
 	rootCmd.PersistentFlags().StringVarP(&Port, "port", "p", "6379", "Redis port")
 	rootCmd.PersistentFlags().StringVarP(&Password, "password", "a", "", "Redis password")
-	rootCmd.PersistentFlags().StringVarP(&User, "user", "u", "default", "Redis user. Defaults to 'default'")
-	rootCmd.PersistentFlags().StringVarP(&ApplicationName, "application", "s", "smartcache", "Application namespace. Defaults to 'smartcache'")
+	rootCmd.PersistentFlags().StringVarP(&User, "user", "u", "default", "Redis user")
+	rootCmd.PersistentFlags().StringVarP(&ApplicationName, "application", "s", "smartcache", "Application namespace")
 	rootCmd.Flags().BoolVarP(&versionCheck, "version", "v", false, "Smart Cache CLI version")
 }

mainMenu/mainMenu.go

@@ -144,7 +144,7 @@ func InitialModel(rdb *redis.Client, applicationName string, connectionInfo stri
 	const defaultWidth = 20
 
 	l := list.New(items, itemDelegate{}, defaultWidth, listHeight)
-	l.Title = "-- Main menu --"
+	l.Title = "== Main menu =="
 	l.SetShowStatusBar(false)
 	l.SetFilteringEnabled(false)
 	l.Styles.Title = titleStyle

queryList/queryList.go

@@ -178,7 +178,7 @@ func (m Model) View() string {
 	body.WriteString("Press [ENTER] to create a pending rule\n")
 	body.WriteString("Press 'c' to commit selected rules\n")
 	body.WriteString("Press 'b' to go back\n")
-	body.WriteString("Press [CTRL+C] to quit\n")
+	body.WriteString("Press [CTRL+C] to quit\n\n")
 
 	body.WriteString(m.table.View())