Skip to content

Update app to use bubbletea instead of survey #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tedsmitt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update app to use bubbletea instead of survey #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 59 additions & 51 deletions internal/select.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,50 @@
"fmt"
"strings"

"github.com/AlecAivazis/survey/v2"
"github.com/charmbracelet/bubbletea"

Check failure on line 10 in internal/select.go

View workflow job for this annotation

GitHub Actions / Test 

no required module provides package github.com/charmbracelet/bubbletea; to add it:

Check failure on line 10 in internal/select.go

View workflow job for this annotation

GitHub Actions / Test 

no required module provides package github.com/charmbracelet/bubbletea; to add it:
"github.com/charmbracelet/bubbles/list"

Check failure on line 11 in internal/select.go

View workflow job for this annotation

GitHub Actions / Test 

no required module provides package github.com/charmbracelet/bubbles/list; to add it:

Check failure on line 11 in internal/select.go

View workflow job for this annotation

GitHub Actions / Test 

no required module provides package github.com/charmbracelet/bubbles/list; to add it:
"github.com/aws/aws-sdk-go-v2/aws"

ecsTypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
)

func init() {
survey.SelectQuestionTemplate = `
{{- if .ShowHelp }}{{- color .Config.Icons.Help.Format }}{{ .Config.Icons.Help.Text }} {{ .Help }}{{color "reset"}}{{"\n"}}{{end}}
{{- color .Config.Icons.Question.Format }}{{ .Config.Icons.Question.Text }} {{color "reset"}}
{{- color "default+hb"}}{{ .Message }}{{ .FilterMessage }}{{color "reset"}}
{{- if .ShowAnswer}}{{color "Cyan"}} {{""}}{{color "reset"}}
{{- else}}
{{- " "}}{{- color "Cyan"}}[Type to filter{{- if and .Help (not .ShowHelp)}}, {{ .Config.HelpInput }} for more help{{end}}]{{color "reset"}}{{- "\n"}}
{{- range $ix, $choice := .PageEntries}}
{{- if eq $ix $.SelectedIndex }}{{color $.Config.Icons.SelectFocus.Format }}{{ $.Config.Icons.SelectFocus.Text }} {{else}}{{color "default"}} {{end}}
{{- $choice.Value}}
{{- color "reset"}}{{"\n"}}
{{- end}}
{{- end}}`
type item struct {
title, desc string
}

func (i item) Title() string { return i.title }
func (i item) Description() string { return i.desc }
func (i item) FilterValue() string { return i.title }

func createList(items []list.Item, title string) list.Model {
const defaultWidth = 20
const listHeight = 14

l := list.New(items, list.NewDefaultDelegate(), defaultWidth, listHeight)
l.Title = title
l.SetShowStatusBar(false)
l.SetFilteringEnabled(true)
l.Styles.Title = titleStyle
l.Styles.PaginationStyle = paginationStyle
l.Styles.HelpStyle = helpStyle

return l
}

func runList(l list.Model) (string, error) {
p := tea.NewProgram(l)
m, err := p.StartReturningModel()
if err != nil {
return "", err
}

if l, ok := m.(list.Model); ok {
if len(l.SelectedItems()) > 0 {
return l.SelectedItems()[0].(item).title, nil
}
}

return "", fmt.Errorf("no item selected")
}

// createOpts builds the initial options for the survey prompts
Expand All @@ -46,17 +70,13 @@
return clusterNames[0], nil
}

prompt := &survey.Select{
Message: "Select a cluster:",
Options: clusterNames,
PageSize: pageSize,
var items []list.Item
for _, name := range clusterNames {
items = append(items, item{title: name})
}

var selection string
err := survey.AskOne(prompt, &selection, survey.WithIcons(func(icons *survey.IconSet) {
icons.SelectFocus.Text = "➡"
icons.SelectFocus.Format = "cyan"
}))
l := createList(items, "Select a cluster:")
selection, err := runList(l)
if err != nil {
return "", err
}
Expand All @@ -77,17 +97,13 @@

serviceNames = append(serviceNames, "*")

prompt := &survey.Select{
Message: fmt.Sprintf("Select a service: %s", Yellow("(choose * to display all tasks)")),
Options: createOpts(serviceNames),
PageSize: pageSize,
var items []list.Item
for _, name := range serviceNames {
items = append(items, item{title: name})
}

var selection string
err := survey.AskOne(prompt, &selection, survey.WithIcons(func(icons *survey.IconSet) {
icons.SelectFocus.Text = "➡"
icons.SelectFocus.Format = "magenta"
}))
l := createList(items, fmt.Sprintf("Select a service: %s", Yellow("(choose * to display all tasks)")))
selection, err := runList(l)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -118,17 +134,13 @@
taskOpts = append(taskOpts, fmt.Sprintf("%s | %s | (%s)", id, taskDefinition, strings.Join(containers, ",")))
}

prompt := &survey.Select{
Message: "Select a task:",
Options: createOpts(taskOpts),
PageSize: pageSize,
var items []list.Item
for _, opt := range taskOpts {
items = append(items, item{title: opt})
}

var selection string
err := survey.AskOne(prompt, &selection, survey.WithIcons(func(icons *survey.IconSet) {
icons.SelectFocus.Text = "➡"
icons.SelectFocus.Format = "green"
}))
l := createList(items, "Select a task:")
selection, err := runList(l)
if err != nil {
return &ecsTypes.Task{}, err
}
Expand All @@ -155,17 +167,13 @@
containerNames = append(containerNames, *c.Name)
}

var selection string
var prompt = &survey.Select{
Message: "Multiple containers found, please select:",
Options: createOpts(containerNames),
PageSize: pageSize,
var items []list.Item
for _, name := range containerNames {
items = append(items, item{title: name})
}

err := survey.AskOne(prompt, &selection, survey.WithIcons(func(icons *survey.IconSet) {
icons.SelectFocus.Text = "➡"
icons.SelectFocus.Format = "yellow"
}))
l := createList(items, "Multiple containers found, please select:")
selection, err := runList(l)
if err != nil {
return &ecsTypes.Container{}, err
}
Expand Down
Loading