From 16ddfc496a0cd79738dab0941652fb20eb694ada Mon Sep 17 00:00:00 2001
From: Reagan Lopez <reagan.lopez@intel.com>
Date: Mon, 22 Apr 2019 17:10:16 +0000
Subject: [PATCH] gui: Make User Add page as Required

Signed-off-by: Reagan Lopez <reagan.lopez@intel.com>
---
 gui/pages/init.go     | 6 +++---
 gui/pages/user_add.go | 4 ++--
 gui/window.go         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gui/pages/init.go b/gui/pages/init.go
index fd367d4..c380408 100644
--- a/gui/pages/init.go
+++ b/gui/pages/init.go
@@ -79,12 +79,12 @@ const (
 	// PageIDTelemetry is the telemetry page key
 	PageIDTelemetry = iota
 
-	// PageIDDiskConfig is the disk configuration page key
-	PageIDDiskConfig = iota
-
 	// PageIDUserAdd is the user add page key
 	PageIDUserAdd = iota
 
+	// PageIDDiskConfig is the disk configuration page key
+	PageIDDiskConfig = iota
+
 	// PageIDHostname is the hostname page key
 	PageIDHostname = iota
 
diff --git a/gui/pages/user_add.go b/gui/pages/user_add.go
index f826627..04f6202 100644
--- a/gui/pages/user_add.go
+++ b/gui/pages/user_add.go
@@ -257,12 +257,12 @@ func (page *UserAddPage) onDeleteClick(button *gtk.Button) {
 
 // IsRequired will return false as we have default values
 func (page *UserAddPage) IsRequired() bool {
-	return false
+	return true
 }
 
 // IsDone checks if all the steps are completed
 func (page *UserAddPage) IsDone() bool {
-	return page.GetConfiguredValue() != ""
+	return len(page.model.Users) != 0
 }
 
 // GetID returns the ID for this page
diff --git a/gui/window.go b/gui/window.go
index fb0b029..606103b 100644
--- a/gui/window.go
+++ b/gui/window.go
@@ -230,11 +230,11 @@ func (window *Window) createMenuPages() (*Window, error) {
 		pages.NewTimezonePage,
 		pages.NewKeyboardPage,
 		pages.NewDiskConfigPage,
+		pages.NewUserAddPage,
 		pages.NewTelemetryPage,
 
 		// advanced
 		pages.NewBundlePage,
-		pages.NewUserAddPage,
 		pages.NewHostnamePage,
 
 		// always last