Merge pull request #163 from manifoldco/promptui

Create select prompts with details

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Add
+- Improved visuals for select boxes
+
 ### Fixed
 - Project create failure due to Name/Title change
 - Set-role should error before prompts

cmd/create.go

@@ -132,7 +132,7 @@ func create(cliCtx *cli.Context) error {
 		}
 
 		plans := filterPlansByProductID(catalog.Plans(), products[productIdx].ID)
-		planIdx, _, err := prompts.SelectPlan(plans, planName, false)
+		planIdx, _, err := prompts.SelectPlan(plans, planName)
 		if err != nil {
 			return prompts.HandleSelectError(err, "Could not select plan.")
 		}

cmd/resize.go

@@ -105,7 +105,7 @@ func resizeResourceCmd(cliCtx *cli.Context) error {
 		return errs.ErrNoPlans
 	}
 
-	pIdx, _, err := prompts.SelectPlan(plans, planName, false)
+	pIdx, _, err := prompts.SelectPlan(plans, planName)
 	if err != nil {
 		return prompts.HandleSelectError(err, "Could not select Plan")
 	}

data/catalog/catalog.go

@@ -3,6 +3,8 @@ package catalog
 import (
 	"context"
 	"errors"
+	"sort"
+	"strings"
 
 	"github.com/manifoldco/go-manifold"
 	hierr "github.com/reconquest/hierr-go"
@@ -54,6 +56,17 @@ func (c *Catalog) Plans() []*catalogModels.Plan {
 		plans = append(plans, p)
 	}
 
+	sort.Slice(plans, func(i, j int) bool {
+		a := plans[i]
+		b := plans[j]
+
+		if *a.Body.Cost == *b.Body.Cost {
+			return strings.ToLower(string(a.Body.Label)) <
+				strings.ToLower(string(b.Body.Label))
+		}
+		return *a.Body.Cost < *b.Body.Cost
+	})
+
 	return plans
 }
 
@@ -64,6 +77,12 @@ func (c *Catalog) Products() []*catalogModels.Product {
 		products = append(products, p)
 	}
 
+	sort.Slice(products, func(i, j int) bool {
+		a := string(products[i].Body.Label)
+		b := string(products[j].Body.Label)
+		return strings.ToLower(a) < strings.ToLower(b)
+	})
+
 	return products
 }
 
@@ -74,6 +93,12 @@ func (c *Catalog) Regions() []*catalogModels.Region {
 		regions = append(regions, r)
 	}
 
+	sort.Slice(regions, func(i, j int) bool {
+		a := regions[i]
+		b := regions[j]
+		return strings.ToLower(string(a.Body.Name)) < strings.ToLower(string(b.Body.Name))
+	})
+
 	return regions
 }