Disable buttons during validation

OctopusSolutionsEngineering · Aug 21, 2024 · 81869ba · 81869ba
1 parent b51eb0f
commit 81869ba
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 17 deletions.
diff --git a/internal/steps/octopus_destination_details.go b/internal/steps/octopus_destination_details.go
@@ -16,16 +16,18 @@ import (
 
 type OctopusDestinationDetails struct {
 	BaseStep
-	Wizard  wizard.Wizard
-	server  *widget.Entry
-	apiKey  *widget.Entry
-	spaceId *widget.Entry
-	result  *widget.Label
+	Wizard   wizard.Wizard
+	server   *widget.Entry
+	apiKey   *widget.Entry
+	spaceId  *widget.Entry
+	result   *widget.Label
+	next     *widget.Button
+	previous *widget.Button
 }
 
 func (s OctopusDestinationDetails) GetContainer(parent fyne.Window) *fyne.Container {
 
-	bottom, _, next := s.BuildNavigation(func() {
+	bottom, previous, next := s.BuildNavigation(func() {
 		s.Wizard.ShowWizardStep(OctopusDetails{
 			Wizard:   s.Wizard,
 			BaseStep: BaseStep{State: s.getState()}})
@@ -34,9 +36,13 @@ func (s OctopusDestinationDetails) GetContainer(parent fyne.Window) *fyne.Contai
 		s.apiKey.Disable()
 		s.server.Disable()
 		s.spaceId.Disable()
+		s.next.Disable()
+		s.previous.Disable()
 		defer s.apiKey.Enable()
 		defer s.server.Enable()
 		defer s.spaceId.Enable()
+		defer s.next.Enable()
+		defer s.previous.Enable()
 
 		validationFailed := false
 		if !validators.ValidateDestinationCreds(s.getState()) {
@@ -58,7 +64,8 @@ func (s OctopusDestinationDetails) GetContainer(parent fyne.Window) *fyne.Contai
 			nexCallback(true)
 		}
 	})
-
+	s.next = next
+	s.previous = previous
 	s.result = widget.NewLabel("")
 
 	validation := func(input string) {

diff --git a/internal/steps/octopus_details.go b/internal/steps/octopus_details.go
@@ -15,16 +15,18 @@ import (
 
 type OctopusDetails struct {
 	BaseStep
-	Wizard  wizard.Wizard
-	server  *widget.Entry
-	apiKey  *widget.Entry
-	spaceId *widget.Entry
-	result  *widget.Label
+	Wizard   wizard.Wizard
+	server   *widget.Entry
+	apiKey   *widget.Entry
+	spaceId  *widget.Entry
+	result   *widget.Label
+	next     *widget.Button
+	previous *widget.Button
 }
 
 func (s OctopusDetails) GetContainer(parent fyne.Window) *fyne.Container {
 
-	bottom, _, next := s.BuildNavigation(func() {
+	bottom, previous, next := s.BuildNavigation(func() {
 		s.Wizard.ShowWizardStep(TestTerraformStep{
 			Wizard:   s.Wizard,
 			BaseStep: BaseStep{State: s.getState()}})
@@ -33,9 +35,13 @@ func (s OctopusDetails) GetContainer(parent fyne.Window) *fyne.Container {
 		s.apiKey.Disable()
 		s.server.Disable()
 		s.spaceId.Disable()
+		s.next.Disable()
+		s.previous.Disable()
 		defer s.apiKey.Enable()
 		defer s.server.Enable()
 		defer s.spaceId.Enable()
+		defer s.next.Enable()
+		defer s.previous.Enable()
 
 		validationFailed := false
 		if !validators.ValidateSourceCreds(s.getState()) {
@@ -57,7 +63,8 @@ func (s OctopusDetails) GetContainer(parent fyne.Window) *fyne.Container {
 			nexCallback(true)
 		}
 	})
-
+	s.next = next
+	s.previous = previous
 	s.result = widget.NewLabel("")
 
 	validation := func(input string) {

diff --git a/internal/steps/test_terraform.go b/internal/steps/test_terraform.go
@@ -13,17 +13,24 @@ import (
 
 type TestTerraformStep struct {
 	BaseStep
-	Wizard wizard.Wizard
-	result *widget.Label
+	Wizard   wizard.Wizard
+	result   *widget.Label
+	next     *widget.Button
+	previous *widget.Button
 }
 
 func (s TestTerraformStep) GetContainer(parent fyne.Window) *fyne.Container {
 
-	bottom, _, _ := s.BuildNavigation(func() {
+	bottom, previous, next := s.BuildNavigation(func() {
 		s.Wizard.ShowWizardStep(WelcomeStep{
 			Wizard:   s.Wizard,
 			BaseStep: BaseStep{State: s.State}})
 	}, func() {
+		s.next.Disable()
+		s.previous.Disable()
+		defer s.next.Enable()
+		defer s.previous.Enable()
+
 		s.result.SetText("🔵 Testing Terraform installation.")
 
 		if s.Execute() {
@@ -34,6 +41,8 @@ func (s TestTerraformStep) GetContainer(parent fyne.Window) *fyne.Container {
 			s.notInstalled()
 		}
 	})
+	s.next = next
+	s.previous = previous
 
 	heading := widget.NewLabel("Test Terraform")
 	heading.TextStyle = fyne.TextStyle{Bold: true}