Skip to content

Commit 8e97195

Browse files
Merge pull request #143 from hdresearch/ty/remove-history
remove history
2 parents 83bdff8 + 00d946b commit 8e97195

File tree

7 files changed

+2
-254
lines changed

7 files changed

+2
-254
lines changed

cmd/history.go

Lines changed: 0 additions & 35 deletions
This file was deleted.

internal/handlers/history.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

internal/presenters/history_presenter.go

Lines changed: 0 additions & 95 deletions
This file was deleted.

internal/services/history/service.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

internal/tui/keys.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ type keyMap struct {
1313
Resume key.Binding
1414
Kill key.Binding
1515
Commit key.Binding
16-
History key.Binding
1716
Tree key.Binding
1817
}
1918

@@ -27,21 +26,19 @@ func defaultKeys() keyMap {
2726
Resume: key.NewBinding(key.WithKeys("r"), key.WithHelp("r", "resume VM")),
2827
Kill: key.NewBinding(key.WithKeys("k"), key.WithHelp("k", "delete")),
2928
Commit: key.NewBinding(key.WithKeys("c"), key.WithHelp("c", "commit VM")),
30-
History: key.NewBinding(key.WithKeys("h"), key.WithHelp("h", "history")),
3129
Tree: key.NewBinding(key.WithKeys("t"), key.WithHelp("t", "tree")),
3230
}
3331
}
3432

3533
// Implement help.KeyMap interface for bubbles/help
3634
func (k keyMap) ShortHelp() []key.Binding {
37-
return []key.Binding{k.Connect, k.Branch, k.Pause, k.Resume, k.History, k.Tree, k.Switch, k.Quit}
35+
return []key.Binding{k.Connect, k.Branch, k.Pause, k.Resume, k.Tree, k.Switch, k.Quit}
3836
}
3937

4038
func (k keyMap) FullHelp() [][]key.Binding {
4139
return [][]key.Binding{
4240
{k.Connect, k.Branch, k.Commit},
4341
{k.Pause, k.Resume, k.Kill},
44-
{k.History, k.Tree},
45-
{k.Switch, k.Quit},
42+
{k.Tree, k.Switch, k.Quit},
4643
}
4744
}

internal/tui/model.go

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/hdresearch/vers-cli/internal/app"
1414
"github.com/hdresearch/vers-cli/internal/handlers"
1515
delsvc "github.com/hdresearch/vers-cli/internal/services/deletion"
16-
histSvc "github.com/hdresearch/vers-cli/internal/services/history"
1716
svcstatus "github.com/hdresearch/vers-cli/internal/services/status"
1817
vmSvc "github.com/hdresearch/vers-cli/internal/services/vm"
1918
sshutil "github.com/hdresearch/vers-cli/internal/ssh"
@@ -46,10 +45,6 @@ type actionCompletedMsg struct {
4645
text string
4746
err error
4847
}
49-
type historyLoadedMsg struct {
50-
lines []string
51-
err error
52-
}
5348

5449
type Model struct {
5550
app *app.App
@@ -208,27 +203,6 @@ func (m Model) selectedVMID() (string, bool) {
208203
return "", false
209204
}
210205

211-
func loadHistoryCmd(m Model, vmID string) tea.Cmd {
212-
return func() tea.Msg {
213-
ctx, cancel := context.WithTimeout(context.Background(), m.app.Timeouts.APIMedium)
214-
defer cancel()
215-
commits, err := histSvc.GetCommits(ctx, m.app.Client, vmID)
216-
if err != nil {
217-
return historyLoadedMsg{err: err}
218-
}
219-
lines := make([]string, 0, len(commits))
220-
for _, c := range commits {
221-
line := c.ID
222-
if c.Alias != "" {
223-
line = c.Alias + " (" + c.ID + ")"
224-
}
225-
line += " | " + c.Author
226-
lines = append(lines, line)
227-
}
228-
return historyLoadedMsg{lines: lines}
229-
}
230-
}
231-
232206
func doCommitCmd(m Model, vmID string, tagCSV string) tea.Cmd {
233207
return func() tea.Msg {
234208
// Split and trim tags

internal/tui/update.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
3232
}
3333
m.loading = true
3434
return m, refreshVMsCmd(m)
35-
case historyLoadedMsg:
36-
m.status = ""
37-
if msg.err != nil {
38-
m.status = "History error: " + msg.err.Error()
39-
m.modalActive = false
40-
return m, nil
41-
}
42-
m.modalText = msg.lines
43-
m.modalActive = true
44-
m.modalKind = "text"
45-
m.modalPrompt = "History:"
46-
return m, nil
4735

4836
case tea.KeyMsg:
4937
switch msg.String() {
@@ -119,14 +107,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
119107
}
120108
return m, nil
121109
}
122-
case "h":
123-
if it, ok := m.vms.SelectedItem().(vmItem); ok {
124-
m.modalActive = true
125-
m.modalKind = "text"
126-
m.modalPrompt = "History:"
127-
m.status = "Loading history..."
128-
return m, loadHistoryCmd(m, it.ID)
129-
}
130110
}
131111
var cmd tea.Cmd
132112
m.vms, cmd = m.vms.Update(msg)

0 commit comments

Comments
 (0)