Merge pull request 'Add "Clear Completed" button to web dashboard (archie)' (#63) from archie/issue-62 into main
Reviewed-on: http://git.catlow.cloud/sam/archie-core/pulls/63
This commit is contained in:
commit
72f8020529
4 files changed
+85
-1
No files matched your search
@@ -278,6 +278,17 @@ func (s *Store) OpenPRs(ctx context.Context) (tasks []Task, retErr error) {
|
||||
return tasks, rows.Err()
|
||||
}
|
||||
|
||||
// ClearTerminalTasks deletes tasks whose status is terminal (merged, parked,
|
||||
// rejected, closed_wont_do). Returns the number of rows removed.
|
||||
func (s *Store) ClearTerminalTasks(ctx context.Context) (int64, error) {
|
||||
res, err := s.db.ExecContext(ctx,
|
||||
`DELETE FROM tasks WHERE status IN ('merged','parked','rejected','closed_wont_do')`)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return res.RowsAffected()
|
||||
}
|
||||
|
||||
func clip(s string, n int) string {
|
||||
if len(s) <= n {
|
||||
return s
|
||||
|
||||
@@ -22,6 +22,51 @@ func openTest(t *testing.T) *Store {
|
||||
return s
|
||||
}
|
||||
|
||||
func TestClearTerminalTasks(t *testing.T) {
|
||||
s := openTest(t)
|
||||
ctx := context.Background()
|
||||
|
||||
statuses := []string{StatusMerged, StatusParked, StatusRejected, StatusClosedWontDo, StatusQueued}
|
||||
for i, status := range statuses {
|
||||
if _, err := s.EnqueueIssue(ctx, "sam", "archie", i+1, "t", "b", ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task, err := s.TaskByIssue(ctx, "sam", "archie", i+1)
|
||||
if err != nil || task == nil {
|
||||
t.Fatalf("TaskByIssue(%d) = (%+v, %v)", i+1, task, err)
|
||||
}
|
||||
if status != StatusQueued {
|
||||
if err := s.Transition(ctx, task.ID, StatusQueued, status, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
n, err := s.ClearTerminalTasks(ctx)
|
||||
if err != nil || n != 4 {
|
||||
t.Fatalf("ClearTerminalTasks = (%d, %v), want (4, nil)", n, err)
|
||||
}
|
||||
|
||||
counts, err := s.StatusCounts(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if counts[StatusQueued] != 1 {
|
||||
t.Fatalf("expected 1 queued, got %d", counts[StatusQueued])
|
||||
}
|
||||
for _, status := range []string{StatusMerged, StatusParked, StatusRejected, StatusClosedWontDo} {
|
||||
if counts[status] != 0 {
|
||||
t.Fatalf("expected 0 for %s, got %d", status, counts[status])
|
||||
}
|
||||
}
|
||||
|
||||
// Idempotent: second call removes nothing.
|
||||
n, err = s.ClearTerminalTasks(ctx)
|
||||
if err != nil || n != 0 {
|
||||
t.Fatalf("second ClearTerminalTasks = (%d, %v), want (0, nil)", n, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnqueueIsIdempotent(t *testing.T) {
|
||||
s := openTest(t)
|
||||
ctx := context.Background()
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
padding: 1rem 1.2rem; max-width: 1500px; }
|
||||
section { background: var(--panel); border: 1px solid var(--line);
|
||||
border-radius: 8px; padding: .9rem 1rem; }
|
||||
section { min-height: 1.25rem; }
|
||||
section .table-wrap { position: relative; overflow-x: auto; }
|
||||
section h2 { font-size: .8rem; text-transform: uppercase; letter-spacing: .08em;
|
||||
color: var(--dim); margin: 0 0 .6rem; }
|
||||
.cards { display: flex; gap: .6rem; flex-wrap: wrap; grid-column: 1 / -1;
|
||||
@@ -54,6 +56,10 @@
|
||||
.bar { background: #253141; height: .6rem; border-radius: 3px; display: inline-block;
|
||||
vertical-align: middle; }
|
||||
.muted { color: var(--dim); }
|
||||
#clear-btn { background: var(--panel); color: var(--dim); border: 1px solid var(--line);
|
||||
padding: .2rem .6rem; border-radius: 4px; cursor: pointer; font-size: .75rem;
|
||||
margin-left: .75rem; }
|
||||
#clear-btn:hover { color: var(--bad); border-color: var(--bad); }
|
||||
@media (max-width: 950px) { main { grid-template-columns: 1fr; } }
|
||||
@media (max-width: 700px) {
|
||||
header { padding: .6rem .8rem; }
|
||||
@@ -77,7 +83,7 @@
|
||||
<div class="cards" id="cards"></div>
|
||||
|
||||
<section style="grid-column: 1">
|
||||
<h2>Tasks</h2>
|
||||
<h2>Tasks <button id="clear-btn" onclick="clearCompleted()">Clear Completed</button></h2>
|
||||
<div class="section-table"><table id="tasks"><thead><tr>
|
||||
<th>repo</th><th>issue</th><th>title</th><th>workflow</th><th>status</th>
|
||||
<th class="num">steps</th><th class="num">tokens</th>
|
||||
@@ -124,6 +130,18 @@ const esc = s => String(s ?? "").replace(/[&<>"]/g, c => ({"&":"&","<":"<
|
||||
const fmt = n => (n ?? 0).toLocaleString();
|
||||
const ms = v => v >= 60000 ? (v/60000).toFixed(1)+"m" : v >= 1000 ? (v/1000).toFixed(1)+"s" : v+"ms";
|
||||
|
||||
async function clearCompleted() {
|
||||
if (!confirm("Delete all merged, parked, rejected, and closed-wont-do tasks?")) return;
|
||||
const res = await fetch("/api/tasks/clear", { method: "POST" });
|
||||
const data = await res.json();
|
||||
if (res.ok) {
|
||||
alert(`Deleted ${data.deleted} task(s).`);
|
||||
refresh();
|
||||
} else {
|
||||
alert("Error: " + (data.error || res.statusText));
|
||||
}
|
||||
}
|
||||
|
||||
async function refresh() {
|
||||
const [summary, tasks] = await Promise.all([
|
||||
fetch("/api/summary").then(r => r.json()),
|
||||
|
||||
@@ -51,6 +51,7 @@ func (s *Server) Handler() http.Handler {
|
||||
mux.HandleFunc("GET /api/summary", s.handleSummary)
|
||||
mux.HandleFunc("GET /api/tasks", s.handleTasks)
|
||||
mux.HandleFunc("GET /api/tasks/{id}", s.handleTask)
|
||||
mux.HandleFunc("POST /api/tasks/clear", s.handleClearTasks)
|
||||
mux.HandleFunc("GET /events", s.handleSSE)
|
||||
return mux
|
||||
}
|
||||
@@ -101,6 +102,15 @@ func (s *Server) handleTasks(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, tasks)
|
||||
}
|
||||
|
||||
func (s *Server) handleClearTasks(w http.ResponseWriter, r *http.Request) {
|
||||
deleted, err := s.Store.ClearTerminalTasks(r.Context())
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 500)
|
||||
return
|
||||
}
|
||||
writeJSON(w, map[string]any{"deleted": deleted})
|
||||
}
|
||||
|
||||
func (s *Server) handleTask(w http.ResponseWriter, r *http.Request) {
|
||||
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user