minor: edits

Author: banker

RedisCommon/redis.go

@@ -574,7 +574,7 @@ func (r Rule) AsRow(rowId int) table.Row {
 	}
 
 	if r.Regex != nil {
-		rd["Matches"] = r.Regex
+		rd["Matches"] = *r.Regex
 	}
 
 	rd["RowId"] = rowId
@@ -638,7 +638,7 @@ func GetRules(rdb *redis.Client, applicationName string) ([]Rule, error) {
 				rule.QueryIds = make([]string, 0)
 			}
 			rule.QueryIds = append(rule.QueryIds, value.(string))
-		case "Regex":
+		case "regex":
 			r := value.(string)
 			rule.Regex = &r
 		case "ttl":

RuleDialog/RuleDialog.go

@@ -74,11 +74,11 @@ type Model struct {
 	ttl              string
 	match            string
 	textInput        textinput.Model
+	wasPreset        bool
 }
 
-func New(parentModel tea.Model, rdb *redis.Client, rule *RedisCommon.Rule, confirm bool, applicationName string) Model {
+func New(parentModel tea.Model, rdb *redis.Client, rule *RedisCommon.Rule, confirm bool, applicationName string, ruleType RedisCommon.RuleType) Model {
 	items := []list.Item{
-		item{RedisCommon.QueryIds},
 		item{RedisCommon.Tables},
 		item{RedisCommon.TablesAll},
 		item{RedisCommon.TablesAny},
@@ -93,6 +93,7 @@ func New(parentModel tea.Model, rdb *redis.Client, rule *RedisCommon.Rule, confi
 	ti.Focus()
 	ti.CharLimit = 30
 	ti.Width = 30
+	wasPreset := ruleType != RedisCommon.Unknown
 
 	m := Model{
 		parentModel:      parentModel,
@@ -101,9 +102,10 @@ func New(parentModel tea.Model, rdb *redis.Client, rule *RedisCommon.Rule, confi
 		isNew:            rule == nil,
 		applicationName:  applicationName,
 		typeSelectorList: typeSelectList,
-		ruleType:         RedisCommon.Unknown,
+		ruleType:         ruleType,
 		textInput:        ti,
 		ttl:              "",
+		wasPreset:        wasPreset,
 	}
 
 	return m
@@ -166,7 +168,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if m.match != "" {
 				m.match = ""
 				return m, nil
-			} else if m.ruleType != RedisCommon.Unknown {
+			} else if m.ruleType != RedisCommon.Unknown && !m.wasPreset {
 				m.ruleType = RedisCommon.Unknown
 				return m, nil
 			}
@@ -241,16 +243,22 @@ func (m Model) View() string {
 	var b strings.Builder
 
 	if m.ruleType == RedisCommon.Unknown {
-		b.WriteString("Select the type of rule you want to create.\nPress [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())
-		b.WriteString("Enter the string to match against (e.g., table names, regular expression, etc.): ")
+		if m.ruleType == RedisCommon.Regex {
+			b.WriteString("Enter a regular expression to match against:")
+		} else if m.ruleType == RedisCommon.QueryIds {
+			b.WriteString("Enter a comma-separated list of Query IDs to match against:")
+		} else {
+			b.WriteString("Enter a comma-separated list of tables to match against:")
+		}
 		b.WriteString(m.textInput.View())
 	} else {
 		b.WriteString(m.ruleSoFar())
-		b.WriteString("Enter a 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())
 	}
 

RuleList/RuleList.go

@@ -86,7 +86,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.parentModel, _ = m.parentModel.Update(ConfirmationDialog.ConfirmationMessage{ConfirmedUpdate: true})
 			return m.parentModel, nil
 		case "n":
-			return RuleDialog.New(m, m.rdb, nil, false, m.applicationName), nil
+			return RuleDialog.New(m, m.rdb, nil, false, m.applicationName, RedisCommon.Unknown), nil
 		case "r":
 			idxInDelete := indexOf(rowId, m.indexesWithPendingDeletes)
 			if idxInDelete >= 0 {
@@ -130,7 +130,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if rowId >= 0 {
 				// pop open editor
 				rule := m.rules[rowId]
-				return RuleDialog.New(m, m.rdb, &rule, false, m.applicationName), nil
+				return RuleDialog.New(m, m.rdb, &rule, false, m.applicationName, rule.GetType()), nil
 			}
 		}
 	case BulkUpdateConfirmation.BulkConfirmationMessage:
@@ -192,6 +192,7 @@ func (m Model) View() string {
 	body.WriteString("press 'b' to go back\n")
 	body.WriteString("press [ENTER] to edit a rule\n")
 	body.WriteString("press 'n' to create a rule\n")
+	body.WriteString("press 'd' to delete a rule\n")
 	body.WriteString("press 'c' to commit rule updates\n")
 	body.WriteString(m.table.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()

mainMenu/mainMenu.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"smart-cache-cli/ConfirmationDialog"
+	"smart-cache-cli/RedisCommon"
 	"smart-cache-cli/RuleDialog"
 	"smart-cache-cli/RuleList"
 	"smart-cache-cli/TableList"
@@ -99,7 +100,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				if string(i) == listQueries {
 					return queryList.InitialModel(m, m.rdb, m.applicationName, m.width), nil
 				} else if string(i) == createRule {
-					return RuleDialog.New(m, m.rdb, nil, true, m.applicationName), nil
+					return RuleDialog.New(m, m.rdb, nil, true, m.applicationName, RedisCommon.Unknown), nil
 				} else if string(i) == listRules {
 					return RuleList.New(m, m.rdb, m.applicationName), nil
 				} else if string(i) == listTables {
@@ -143,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