fix check input empty not working (#47)

The validation function of text_input_model only work when there is some input.
So we check empty outside the model.

Author: xuanyu66

internal/cli/cluster/create.go

@@ -196,7 +196,13 @@ func CreateCmd(h *internal.Helper) *cobra.Command {
 				}
 
 				clusterName = inputModel.(ui.TextInputModel).Inputs[clusterNameIdx].Value()
+				if len(clusterName) == 0 {
+					return errors.New("cluster name is required")
+				}
 				rootPassword = inputModel.(ui.TextInputModel).Inputs[passwordIdx].Value()
+				if len(rootPassword) == 0 {
+					return errors.New("root password is required")
+				}
 			} else {
 				// non-interactive mode, get values from flags
 				var err error
@@ -368,22 +374,10 @@ func initialCreateInputModel() ui.TextInputModel {
 			t.Focus()
 			t.PromptStyle = focusedStyle
 			t.TextStyle = focusedStyle
-			t.Validate = func(s string) error {
-				if len(s) == 0 {
-					return errors.New("cluster Name is required")
-				}
-				return nil
-			}
 		case passwordIdx:
 			t.Placeholder = "Password"
 			t.EchoMode = textinput.EchoPassword
 			t.EchoCharacter = '•'
-			t.Validate = func(s string) error {
-				if len(s) == 0 {
-					return errors.New("password is required")
-				}
-				return nil
-			}
 		}
 
 		m.Inputs[i] = t

internal/cli/config/create.go

@@ -115,8 +115,17 @@ func CreateCmd(h *internal.Helper) *cobra.Command {
 
 				inputs := inputModel.(ui.TextInputModel).Inputs
 				profileName = inputs[profileNameIdx].Value()
+				if len(profileName) == 0 {
+					return errors.New("profile name is required")
+				}
 				publicKey = inputs[publicKeyIdx].Value()
+				if len(publicKey) == 0 {
+					return errors.New("public key is required")
+				}
 				privateKey = inputs[privateKeyIdx].Value()
+				if len(privateKey) == 0 {
+					return errors.New("private key is required")
+				}
 			} else {
 				pName, err := cmd.Flags().GetString(flag.ProfileName)
 				if err != nil {
@@ -184,12 +193,6 @@ func initialDeletionInputModel() ui.TextInputModel {
 			t.Focus()
 			t.PromptStyle = focusedStyle
 			t.TextStyle = focusedStyle
-			t.Validate = func(s string) error {
-				if len(s) == 0 {
-					return errors.New("profile name is required")
-				}
-				return nil
-			}
 		case publicKeyIdx:
 			t.Placeholder = "Public Key"
 			t.CharLimit = 128

internal/ui/spinner_model.go

@@ -73,7 +73,7 @@ func (m SpinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m SpinnerModel) View() string {
-	str := color.New(color.FgYellow).Sprintf("%s %s.", m.spinner.View(), color.BlueString(m.Hint)) + "\n"
+	str := color.New(color.FgYellow).Sprintf("%s %s", m.spinner.View(), color.BlueString(m.Hint)) + "\n"
 	if m.quitting {
 		return str + "\n"
 	}