Add "State" to Question

TrueBlocks · Jan 23, 2025 · bca2183 · bca2183
1 parent 3294549
commit bca2183
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/app/action_init_services.go b/app/action_init_services.go
@@ -61,7 +61,7 @@ func updatePrepare(key, input string, q *wizard.Question) (string, error) {
 	if cfg, ok := q.Screen.Wizard.Backing.(*types.Config); ok {
 		service := cfg.Services[key]
 		bytes, _ := json.Marshal(service)
-		// q.State = colors.Yellow + string(bytes) + colors.Off
+		q.State = colors.Yellow + string(bytes) + colors.Off
 		if service.Enabled {
 			return "yes", validOk(`question proceeds`, input)
 		}

diff --git a/app/wizard/question.go b/app/wizard/question.go
@@ -21,6 +21,7 @@ type Question struct {
 	Question     string
 	Hint         string
 	Value        string
+	State        string
 	Response     string
 	ErrorStr     string
 	PrepareFn    func(string, *Question) (string, error)
@@ -76,7 +77,7 @@ func (q *Question) Prompt(str, spacer string, pad ...bool) string {
 	}
 
 	var reps = Replacement{Color: colors.Green, Values: []string{
-		"Question:", "Current:", "Answer:", "Error:", "Hint", "Response",
+		"Question:", "Current:", "Answer:", "Error:", "Hint", "Response", "State",
 	}}
 	return reps.Replace(str)
 }
@@ -88,6 +89,9 @@ func (q *Question) getLines() []string {
 		if q.Hint != "" {
 			lines = append(lines, q.Prompt("Hint", "")+q.Hint)
 		}
+		if q.State != "" {
+			lines = append(lines, q.Prompt("State", "")+q.State)
+		}
 		if q.Value != "" {
 			lines = append(lines, q.Prompt("Current", "")+colors.BrightBlue+q.Value+colors.Off)
 		}

diff --git a/app/wizard/question_test.go b/app/wizard/question_test.go
@@ -23,6 +23,7 @@ func TestQuestion(t *testing.T) {
 
 		assert.Equal(t, "What is your name?", question.Question)
 		assert.Equal(t, "", question.Value)
+		assert.Equal(t, "", question.State)
 		assert.Equal(t, "", question.ErrorStr) // Not initialized until processResponse
 		assert.NotNil(t, question.PrepareFn)
 		assert.NotNil(t, question.Validate)
@@ -44,19 +45,22 @@ func TestQuestion(t *testing.T) {
 		err := question.processResponse("download")
 		assert.NoError(t, err)
 		assert.Equal(t, "download", question.Value)
+		assert.Equal(t, "", question.State)
 		assert.Equal(t, "", question.ErrorStr)
 
 		// Invalid input
 		err = question.processResponse("invalid")
 		assert.Error(t, err)
 		assert.Equal(t, "invalid", question.Value)
+		assert.Equal(t, "", question.State)
 		assert.Contains(t, question.ErrorStr, "value must be either \"download\" or \"scratch\"")
 
 		// Empty input (uses current Value)
 		question.Value = "scratch"
 		err = question.processResponse("")
 		assert.NoError(t, err)
 		assert.Equal(t, "scratch", question.Value)
+		assert.Equal(t, "", question.State)
 		assert.Equal(t, "", question.ErrorStr)
 	}
 	t.Run("Process Response Test", func(t *testing.T) { processResponseTest() })
@@ -65,13 +69,15 @@ func TestQuestion(t *testing.T) {
 		emptyQuestion := &Question{
 			Question:  "",
 			Value:     "",
+			State:     "",
 			ErrorStr:  "",
 			PrepareFn: nil,
 			Validate:  nil,
 		}
 
 		assert.Equal(t, "", emptyQuestion.Question)
 		assert.Equal(t, "", emptyQuestion.Value)
+		assert.Equal(t, "", emptyQuestion.State)
 		assert.Equal(t, "", emptyQuestion.ErrorStr)
 		assert.Nil(t, emptyQuestion.PrepareFn)
 		assert.Nil(t, emptyQuestion.Validate)

diff --git a/app/wizard/screen_test.go b/app/wizard/screen_test.go
@@ -60,6 +60,7 @@ func TestProcessResponse(t *testing.T) {
 
 		assert.NoError(t, err)
 		assert.Equal(t, "valid", question.Value)
+		assert.Equal(t, "", question.State)
 		assert.Equal(t, "", question.ErrorStr)
 	}
 	t.Run("Valid Input Test", func(t *testing.T) { validInputTest() })
@@ -79,6 +80,7 @@ func TestProcessResponse(t *testing.T) {
 		assert.Error(t, err)
 		assert.Equal(t, "invalid input", question.ErrorStr)
 		assert.Equal(t, "", question.Value)
+		assert.Equal(t, "", question.State)
 	}
 	t.Run("Invalid Input Test", func(t *testing.T) { invalidInputTest() })