added history network selector (#37)

* working history network selector * fixed test
taubyte · Aug 21, 2023 · 57c081e · 57c081e
1 parent d1a81d4
commit 57c081e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/cli/commands/resources/network/select.go b/cli/commands/resources/network/select.go
@@ -11,6 +11,7 @@ import (
 	"github.com/taubyte/tau-cli/singletons/config"
 	"github.com/taubyte/tau-cli/singletons/dreamland"
 	"github.com/taubyte/tau-cli/validate"
+	slices "github.com/taubyte/utils/slices/string"
 
 	networkFlags "github.com/taubyte/tau-cli/flags/network"
 	networkI18n "github.com/taubyte/tau-cli/i18n/network"
@@ -26,7 +27,6 @@ func (link) Select() cliCommon.Command {
 	)
 }
 
-// TODO: maybe save the old custom url when switching and prompt to use same as saved before
 func _select(ctx *cli.Context) error {
 	// Setting string flag with value counts as two
 	if ctx.NumFlags() > 2 {
@@ -47,6 +47,10 @@ func _select(ctx *cli.Context) error {
 			return err
 		}
 
+		if !slices.Contains(profile.History, profile.Network) {
+			profile.History = append(profile.History, profile.Network)
+		}
+
 	case ctx.IsSet(networkFlags.Universe.Name):
 		dreamClient, err := dreamland.Client(ctx.Context)
 		if err != nil {
@@ -77,19 +81,26 @@ func _select(ctx *cli.Context) error {
 			networkSelections = append(networkSelections, common.DreamlandNetwork)
 		}
 
+		networkSelections = append(networkSelections, profile.History...)
+
 		prev := []string{}
 		if len(profile.NetworkType) > 0 {
 			prev = append(prev, profile.NetworkType)
 		}
 
-		profile.NetworkType = prompts.GetOrAskForSelection(ctx, "Network", prompts.NetworkPrompts, networkSelections, prev...)
-		if profile.NetworkType == common.RemoteNetwork {
+		network := prompts.GetOrAskForSelection(ctx, "Network", prompts.NetworkPrompts, networkSelections, prev...)
+		if network == common.RemoteNetwork {
+			profile.NetworkType = common.RemoteNetwork
 			profile.Network = prompts.GetOrRequireAString(ctx, "", prompts.FQDN, validate.FQDNValidator, profile.Network)
 			if err := validate.SeerFQDN(ctx.Context, profile.Network); err != nil {
 				return err
 			}
 
-		} else if profile.NetworkType == common.DreamlandNetwork {
+			if !slices.Contains(profile.History, profile.Network) {
+				profile.History = append(profile.History, profile.Network)
+			}
+
+		} else if network == common.DreamlandNetwork {
 			universes, err := dreamClient.Status()
 			if err != nil {
 				return fmt.Errorf("calling dreamland status failed with: %w", err)
@@ -104,6 +115,9 @@ func _select(ctx *cli.Context) error {
 			if err != nil {
 				return fmt.Errorf("universe selection failed with: %w", err)
 			}
+		} else {
+			profile.NetworkType = common.RemoteNetwork
+			profile.Network = network
 		}
 	}
 

diff --git a/lib/login/select.go b/lib/login/select.go
@@ -41,6 +41,7 @@ func Select(ctx *cli.Context, name string, setDefault bool) error {
 		return err
 	}
 
-	env.SetSelectedNetwork(ctx, profile.Network)
+	env.SetSelectedNetwork(ctx, profile.NetworkType)
+	env.SetNetworkUrl(ctx, profile.Network)
 	return env.SetSelectedUser(ctx, name)
 }
diff --git a/singletons/config/profiles_test.go b/singletons/config/profiles_test.go
@@ -63,6 +63,7 @@ func TestProfiles(t *testing.T) {
         git_username: ""
         git_email: ""
         network: ""
+        history: []
 `
 
 	configData, err := readConfig()

diff --git a/singletons/config/types.go b/singletons/config/types.go
@@ -20,10 +20,11 @@ type Profile struct {
 
 	// TODO get from config when verifying token
 	// may need to fake in tests
-	GitUsername string `yaml:"git_username"`
-	GitEmail    string `yaml:"git_email"`
-	NetworkType string `yaml:"type,omitempty"`
-	Network     string `yaml:"network"`
+	GitUsername string   `yaml:"git_username"`
+	GitEmail    string   `yaml:"git_email"`
+	NetworkType string   `yaml:"type,omitempty"`
+	Network     string   `yaml:"network"`
+	History     []string `yaml:"history"`
 }
 
 type Project struct {