IMPROVEMENT-24: In progress

internal/ui/component/edithost/edit_host.go

@@ -35,6 +35,15 @@ type (
 	MsgSave struct{}
 )
 
+const (
+	inputTitle int = iota
+	inputAddress
+	inputDescription
+	inputLogin
+	inputNetworkPort
+	inputIdentityFile
+)
+
 // ItemID is a key to extract item id from application context.
 var ItemID = struct{}{}
 
@@ -55,7 +64,9 @@ func networkPortValidator(s string) error {
 		return nil
 	}
 
-	if num, err := strconv.ParseInt(s, 10, 16); err != nil || num < 1 {
+	auto := 0 // 0 is used to autodetect base, see strconv.ParseUint
+	maxLengthBit := 16
+	if num, err := strconv.ParseUint(s, auto, maxLengthBit); err != nil || num < 1 {
 		return fmt.Errorf("network port must be a number which is less than 65 535")
 	}
 
@@ -64,56 +75,64 @@ func networkPortValidator(s string) error {
 
 // New - returns new edit host form.
 func New(ctx context.Context, storage storage.HostStorage, state *state.ApplicationState, log logger) editModel {
+	initialFocusedInput := inputTitle
+	isNewHost := false
+
 	// if we can't cast host id to int, that means we're adding a new host. Ignoring the error
 	hostID, _ := ctx.Value(ItemID).(int)
 	host, err := storage.Get(hostID)
 	if err != nil {
 		host = model.Host{}
+		initialFocusedInput = inputAddress
+		isNewHost = true
 	}
 
 	m := editModel{
-		inputs:      make([]labeledInput, 6),
-		hostStorage: storage,
-		host:        host,
-		help:        help.New(),
-		keyMap:      keys,
-		appState:    state,
-		logger:      log,
+		inputs:       make([]labeledInput, 6),
+		hostStorage:  storage,
+		host:         host,
+		help:         help.New(),
+		keyMap:       keys,
+		appState:     state,
+		logger:       log,
+		focusedInput: initialFocusedInput,
+		isNewHost:    isNewHost,
 	}
 
 	var t labeledInput
 	for i := range m.inputs {
 		t = NewLabelInput()
 		t.Cursor.Style = cursorStyle
-		t.Placeholder = "n/a"
 
 		switch i {
-		case 0:
+		case inputTitle:
 			t.Label = "Title"
-			t.Focus()
 			t.SetValue(host.Title)
+			t.Placeholder = "title"
 			t.Validate = notEmptyValidator
-		case 1:
+		case inputAddress:
 			t.Label = "IP Address or Hostname"
 			t.CharLimit = 128
 			t.SetValue(host.Address)
+			t.Placeholder = "address"
 			t.Validate = notEmptyValidator
-		case 2:
+		case inputDescription:
 			t.Label = "Description"
 			t.CharLimit = 512
+			t.Placeholder = "n/a"
 			t.SetValue(host.Description)
-		case 3:
+		case inputLogin:
 			t.Label = "Login"
 			t.CharLimit = 128
 			t.Placeholder = fmt.Sprintf("default: %s", utils.CurrentUsername())
 			t.SetValue(host.LoginName)
-		case 4:
-			t.Label = "Port"
+		case inputNetworkPort:
+			t.Label = "Network port"
 			t.CharLimit = 5
 			t.Placeholder = "default: 22"
 			t.SetValue(host.RemotePort)
 			t.Validate = networkPortValidator
-		case 5:
+		case inputIdentityFile:
 			t.Label = "Identity file path"
 			t.CharLimit = 512
 			t.Placeholder = "default: $HOME/.ssh/id_rsa"
@@ -123,20 +142,23 @@ func New(ctx context.Context, storage storage.HostStorage, state *state.Applicat
 		m.inputs[i] = t
 	}
 
+	m.inputs[m.focusedInput].Focus()
+
 	return m
 }
 
 type editModel struct {
-	keyMap      keyMap
-	hostStorage storage.HostStorage
-	focusIndex  int
-	inputs      []labeledInput
-	host        model.Host
-	viewport    viewport.Model
-	help        help.Model
-	ready       bool
-	appState    *state.ApplicationState
-	logger      logger
+	keyMap       keyMap
+	hostStorage  storage.HostStorage
+	focusedInput int
+	inputs       []labeledInput
+	host         model.Host
+	isNewHost    bool
+	viewport     viewport.Model
+	help         help.Model
+	ready        bool
+	appState     *state.ApplicationState
+	logger       logger
 }
 
 func (m editModel) Init() tea.Cmd {
@@ -164,8 +186,7 @@ func (m editModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, m.keyMap.Save):
 			m, cmd = m.save(msg)
 			cmds = append(cmds, cmd)
-		case key.Matches(msg, m.keyMap.Down) ||
-			key.Matches(msg, m.keyMap.Up):
+		case key.Matches(msg, m.keyMap.Down) || key.Matches(msg, m.keyMap.Up):
 			m, cmd = m.inputFocusChange(msg)
 			cmds = append(cmds, cmd)
 		}
@@ -188,17 +209,17 @@ func (m editModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 func (m editModel) save(_ tea.Msg) (editModel, tea.Cmd) {
 	for i := range m.inputs {
 		switch i {
-		case 0:
+		case inputTitle:
 			m.host.Title = m.inputs[i].Value()
-		case 1:
+		case inputAddress:
 			m.host.Address = m.inputs[i].Value()
-		case 2:
+		case inputDescription:
 			m.host.Description = m.inputs[i].Value()
-		case 3:
+		case inputLogin:
 			m.host.LoginName = m.inputs[i].Value()
-		case 4:
+		case inputNetworkPort:
 			m.host.RemotePort = m.inputs[i].Value()
-		case 5:
+		case inputIdentityFile:
 			m.host.PrivateKeyPath = m.inputs[i].Value()
 		}
 	}
@@ -210,9 +231,41 @@ func (m editModel) save(_ tea.Msg) (editModel, tea.Cmd) {
 	)
 }
 
+func (m editModel) copyAddressToTitle() {
+	newValue := m.inputs[inputAddress].Value()
+
+	// Temprorary remove input validator.
+	// It's necessary, because input.SetValue(...) invokes Validate function,
+	// if the input contains invalid value, Validate function returns error and
+	// rejects new value. That leads to a problem - when user removes all symbols
+	// from address input, title input still preserves the very last letter.
+	// A better way would be to use own validation logic instead of relying
+	// on input.Validate.
+	validator := m.inputs[inputTitle].Validate
+	m.inputs[inputTitle].Validate = nil
+	m.inputs[inputTitle].SetValue(newValue)
+	m.inputs[inputTitle].SetCursor(len(newValue))
+	m.inputs[inputTitle].Validate = validator
+	m.inputs[inputTitle].Err = m.inputs[inputTitle].Validate(newValue)
+}
+
 func (m editModel) focusedInputProcessKeyEvent(msg tea.Msg) (editModel, tea.Cmd) {
 	var cmd tea.Cmd
-	m.inputs[m.focusIndex], cmd = m.inputs[m.focusIndex].Update(msg)
+	var shouldUpdateTitle bool
+
+	// Decide if we need to propagate hostname to title
+	if m.focusedInput == inputAddress {
+		addressEqualsTitle := m.inputs[inputAddress].Value() == m.inputs[inputTitle].Value()
+		shouldUpdateTitle = m.isNewHost && addressEqualsTitle
+	}
+
+	// Update focused input
+	m.inputs[m.focusedInput], cmd = m.inputs[m.focusedInput].Update(msg)
+
+	// Then, update title if we should
+	if shouldUpdateTitle {
+		m.copyAddressToTitle()
+	}
 
 	return m, cmd
 }
@@ -242,27 +295,30 @@ func (m editModel) inputFocusChange(msg tea.Msg) (editModel, tea.Cmd) {
 	inputHeight := 0
 
 	if len(m.inputs) > 0 {
-		inputHeight = lipgloss.Height(m.inputsView()) / len(m.inputs)
-	}
-
-	// Update index of the focused element
-	if key.Matches(keyMsg, m.keyMap.Up) && m.focusIndex > minFocusIndex { //nolint:gocritic // no need switch block here
-		m.focusIndex--
-
 		// Control viewport manually because height of input element is greater than one
 		// therefore, we need to scroll several lines at once instead of just a single line.
 		// Normally we don't need to handle scroll events, other than forward app messages to
 		// the viewport: m.viewport, cmd = m.viewport.Update(msg)
+		inputHeight = lipgloss.Height(m.inputsView()) / len(m.inputs)
+	}
+
+	// Update index of the focused element
+	if key.Matches(keyMsg, m.keyMap.Up) && m.focusedInput > minFocusIndex { //nolint:gocritic // no need switch block here
+		m.focusedInput--
 		m.viewport.LineUp(inputHeight)
-	} else if key.Matches(keyMsg, m.keyMap.Down) && m.focusIndex < maxFocusIndex {
-		m.focusIndex++
+	} else if key.Matches(keyMsg, m.keyMap.Down) && m.focusedInput < maxFocusIndex {
+		m.focusedInput++
 		m.viewport.LineDown(inputHeight)
 	} else {
 		return m, nil
 	}
 
 	for i := 0; i <= len(m.inputs)-1; i++ {
-		if i == m.focusIndex {
+		if m.inputs[i].Validate != nil {
+			m.inputs[i].Err = m.inputs[i].Validate(m.inputs[i].Value())
+		}
+
+		if i == m.focusedInput {
 			// Set focused state
 			cmd = m.inputs[i].Focus()
 		} else {

internal/ui/component/edithost/label_input.go

@@ -22,6 +22,7 @@ func NewLabelInput() labeledInput {
 		InputStyle:        noStyle,
 		FocusedLabelStyle: focusedStyle,
 		FocusedInputStyle: focusedStyle,
+		ErrorStyle:        errorStyle,
 	}
 }
 
@@ -32,6 +33,7 @@ type labeledInput struct {
 	InputStyle        lipgloss.Style
 	FocusedLabelStyle lipgloss.Style
 	FocusedInputStyle lipgloss.Style
+	ErrorStyle        lipgloss.Style
 	FocusedPrompt     string
 	Err               error
 }
@@ -40,7 +42,10 @@ func (l labeledInput) Update(msg tea.Msg) (labeledInput, tea.Cmd) {
 	var cmd tea.Cmd
 
 	l.Model, cmd = l.Model.Update(msg)
-	l.Err = l.Model.Err
+
+	if l.Model.Validate != nil {
+		l.Err = l.Model.Validate(l.Model.Value())
+	}
 
 	return l, cmd
 }
@@ -54,7 +59,9 @@ func (l labeledInput) prompt() string {
 }
 
 func (l labeledInput) labelView() string {
-	if l.Focused() {
+	if l.Err != nil {
+		return l.prompt() + l.ErrorStyle.Render(l.Label)
+	} else if l.Focused() {
 		return l.prompt() + l.FocusedLabelStyle.Render(l.Label)
 	}
 
@@ -64,12 +71,14 @@ func (l labeledInput) labelView() string {
 func (l labeledInput) View() string {
 	var view string
 	if l.Focused() {
-		if l.Err != nil {
-			view = lipgloss.NewStyle().Foreground(lipgloss.Color("#FF7783")).Render(l.Model.Err.Error())
-		} else {
-			view = lipgloss.NewStyle().Foreground(lipgloss.Color("#AD58B4")).Render(l.Model.View())
-		}
+		view = lipgloss.NewStyle().Foreground(lipgloss.Color("#AD58B4")).Render(l.Model.View())
 	} else {
+		// if l.Err != nil {
+		// 	view = lipgloss.NewStyle().Foreground(lipgloss.Color("#FF7783")).Render(l.Err.Error())
+		// } else {
+		// 	view = l.Model.View()
+		// }
+
 		view = l.Model.View()
 	}
 

internal/ui/component/edithost/style.go

@@ -7,6 +7,9 @@ var (
 	focusedStyle = lipgloss.NewStyle().
 			BorderForeground(lipgloss.AdaptiveColor{Light: "#F793FF", Dark: "#AD58B4"}).
 			Foreground(lipgloss.AdaptiveColor{Light: "#EE6FF8", Dark: "#EE6FF8"})
+	errorStyle = lipgloss.NewStyle().
+			BorderForeground(lipgloss.AdaptiveColor{Light: "#F793FF", Dark: "#AD58B4"}).
+			Foreground(lipgloss.AdaptiveColor{Light: "#FF7783", Dark: "#FF7783"})
 	cursorStyle = focusedStyle.Copy()
 	noStyle     = lipgloss.NewStyle()