Skip to content

Commit

Permalink
Allow to trigger stacks
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomasmik
tomasmik committed Dec 12, 2024
1 parent ea1b9dd commit 4113517
Show file tree
Hide file tree
Showing 3 changed files with 141 additions and 35 deletions.
4 changes: 2 additions & 2 deletions internal/cmd/draw/data/workerpools.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ type WorkerPool struct {
}

// Selected opens the selected worker pool in the browser.
func (q *WorkerPool) Selected(row table.Row) error {
return browser.OpenURL(authenticated.Client.URL("/stack/%s/run/%s", row[1], row[2]))
func (q *WorkerPool) Selected(row table.Row) ([]table.Row, error) {
return nil, browser.OpenURL(authenticated.Client.URL("/stack/%s/run/%s", row[1], row[2]))
}

func (q *WorkerPool) Filtered(string) error {
Expand Down
114 changes: 95 additions & 19 deletions internal/cmd/draw/table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package draw
import (
"context"
"fmt"
"strings"
"time"

"github.com/charmbracelet/bubbles/table"
Expand All @@ -23,14 +24,10 @@ type Table struct {
height int
baseStyle lipgloss.Style
lastErr error
}

type view string

const (
viewTable view = "table"
viewInput view = "input"
)
choices []table.Row
cursor int
}

// TableData is the data for a table.
type TableData interface {
Expand All @@ -42,7 +39,7 @@ type TableData interface {

// Selected is called when a row is selected.
// The entire row is passed to the function.
Selected(table.Row) error
Selected(table.Row) ([]table.Row, error)

Filtered(string) error
}
Expand Down Expand Up @@ -88,7 +85,7 @@ func NewTable(ctx context.Context, d TableData) (*Table, error) {
return nil, err
}

return &Table{
screen := &Table{
table: t,
td: d,
textInput: ti,
Expand All @@ -98,7 +95,9 @@ func NewTable(ctx context.Context, d TableData) (*Table, error) {
baseStyle: bs,

lastErr: nil,
}, nil
}

return screen, nil
}

// DrawTable should be called to draw the table.
Expand All @@ -116,9 +115,53 @@ func (t Table) Init() tea.Cmd {
return tickCmd(time.Second * 5)
}

func (t Table) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if t.choices != nil {
return t.choicesUpdate(msg)
}

return t.tableUpdate(msg)
}

func (t Table) choicesUpdate(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) {
case tea.KeyMsg:
switch msg.String() {
case "ctrl+c", "q", "esc":
t.choices = nil
t.cursor = 0

return t, nil
case "enter":
opts, err := t.td.Selected(t.choices[t.cursor])
if err != nil {
return t, t.saveErrorAndExit(err)
}

t.choices = opts
t.cursor = 0
case "down", "j":
t.cursor++
if t.cursor >= len(t.choices) {
t.cursor = 0
}

case "up", "k":
t.cursor--
if t.cursor < 0 {
t.cursor = len(t.choices) - 1
}
}
default:
// OK
}

return t, nil
}

// Update implements tea.Model.Update.
// Should not be called directly.
func (t Table) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
func (t Table) tableUpdate(msg tea.Msg) (tea.Model, tea.Cmd) {
cmds := []tea.Cmd{}
switch msg := msg.(type) {
case tea.WindowSizeMsg:
Expand All @@ -140,17 +183,21 @@ func (t Table) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
case "enter":
if t.table.Focused() {
err := t.td.Selected(t.table.SelectedRow())
opts, err := t.td.Selected(t.table.SelectedRow())
if err != nil {
return t, t.saveErrorAndExit(err)
}

t.choices = opts
t.cursor = 0
}
if t.textInput.Focused() {
err := t.td.Filtered(t.textInput.Value())
if err != nil {
return t, t.saveErrorAndExit(err)
}
}

cmds = append(cmds, tickCmd(time.Microsecond))
}
case tickMsg:
Expand All @@ -163,7 +210,7 @@ func (t Table) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}

t.table.SetRows(rows)
return t, tickCmd(time.Second * 5)
return t, tickCmd(time.Second * 3)
}

var cmd tea.Cmd
Expand All @@ -183,6 +230,21 @@ func (t Table) View() string {
return fmt.Sprintln("Exited with an error:", t.lastErr)
}

var views []string
if t.choices != nil {
views = t.choicesView()
} else {
views = t.tableView()
}

return lipgloss.Place(
t.width, t.height,
lipgloss.Center, lipgloss.Center,
lipgloss.JoinVertical(lipgloss.Top, views...),
)
}

func (t Table) tableView() []string {
tableView := t.baseStyle.Render(t.table.View()) + "\n"

filterText := "Filter stacks by name (CTRL+f to start)"
Expand All @@ -196,12 +258,26 @@ func (t Table) View() string {
t.textInput.View(),
)

views := []string{tableView, filterView}
return lipgloss.Place(
t.width, t.height,
lipgloss.Center, lipgloss.Center,
lipgloss.JoinVertical(lipgloss.Top, views...),
)
return []string{tableView, filterView}
}

func (t Table) choicesView() []string {
s := strings.Builder{}
s.WriteString("What how to proceed?\n\n")

for i := 0; i < len(t.choices); i++ {
if t.cursor == i {
s.WriteString("(•) ")
} else {
s.WriteString("( ) ")
}

s.WriteString(t.choices[i][0])
s.WriteString("\n")
}
s.WriteString("\n(press CTRL+C to go back)\n")

return []string{s.String()}
}

func (t *Table) saveErrorAndExit(err error) tea.Cmd {
Expand Down
58 changes: 44 additions & 14 deletions internal/cmd/stack/watch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package stack
import (
"context"
"fmt"
"strings"
"time"

"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"strings"
"time"

"github.com/charmbracelet/bubbles/table"
"github.com/pkg/errors"
Expand Down Expand Up @@ -49,15 +50,44 @@ func (q *Stacks) Filtered(s string) error {
}

// Selected opens the selected worker pool in the browser.
func (q *Stacks) Selected(row table.Row) error {
ctx := context.Background()
st := &StackWatch{row[0]}
t, err := draw.NewTable(ctx, st)
if err != nil {
return err
}
func (q *Stacks) Selected(row table.Row) ([]table.Row, error) {
switch row[0] {
case "Inspect":
ctx := context.Background()
st := &StackWatch{row[1]}
t, err := draw.NewTable(ctx, st)
if err != nil {
return nil, err
}

return t.DrawTable()
return nil, t.DrawTable()
case "Trigger":
var mutation struct {
RunTrigger struct {
ID string `graphql:"id"`
} `graphql:"runTrigger(stack: $stack, commitSha: $sha, runType: $type)"`
}

ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()

variables := map[string]interface{}{
"stack": graphql.ID(row[1]),
"sha": (*graphql.String)(nil),
"type": structs.NewRunType("TRACKED"),
}

if err := authenticated.Client.Mutate(ctx, &mutation, variables); err != nil {
return nil, err
}

return nil, nil
default:
return []table.Row{
[]string{"Inspect", row[0]},
[]string{"Trigger", row[0]},
}, nil
}
}

// Columns returns the columns of the worker pool table.
Expand Down Expand Up @@ -140,7 +170,7 @@ func (s *StackWatch) Rows(ctx context.Context) (rows []table.Row, err error) {
return rows, nil
}

func (s *StackWatch) Selected(row table.Row) error {
func (s *StackWatch) Selected(row table.Row) ([]table.Row, error) {
ctx := context.Background()
if row[0] == "<-back" {
input := structs.SearchInput{
Expand All @@ -153,10 +183,10 @@ func (s *StackWatch) Selected(row table.Row) error {
st := &Stacks{input}
t, err := draw.NewTable(ctx, st)
if err != nil {
return err
return nil, err
}

return t.DrawTable()
return nil, t.DrawTable()
}

//return browser.OpenURL(authenticated.Client.URL("/stack/%s/run/%s", row[7], row[0]))
Expand All @@ -179,7 +209,7 @@ func (s *StackWatch) Selected(row table.Row) error {

_, err := p.Run()

return err
return nil, err
}

func listRuns(ctx context.Context, stackID string, maxResults int) ([][]string, error) {
Expand Down

0 comments on commit 4113517

Please sign in to comment.