Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6fdb4bbbf8 | |||
| e336aeea97 | |||
| 85ad2d65ee | |||
| f75ae60e74 |
@@ -0,0 +1,65 @@
|
||||
name: CI
|
||||
|
||||
# The release workflow gates a tag, which is late: a broken commit sits green until
|
||||
# somebody decides to publish. This runs the same checks on the way in.
|
||||
#
|
||||
# push is scoped to main so that a branch pushed as part of a pull request is not checked
|
||||
# twice.
|
||||
#
|
||||
# No actions/checkout, deliberately -- same as the terdut-server, letsvisit and charts
|
||||
# workflows. The runner image is ubuntu:22.04 whose `nodejs` package is Node 12, and
|
||||
# actions/checkout@v4 is built with ES2022 static initialiser blocks, so it dies with
|
||||
# `SyntaxError: Unexpected token '{'` before running. Cloning with git directly avoids JS
|
||||
# actions entirely. This repo is public, so the clone needs no credential at all.
|
||||
#
|
||||
# `${{ }}` values are passed through `env:` and referenced as quoted shell variables: a
|
||||
# ref name is attacker-influenced by anyone who can push a branch or open a PR, and
|
||||
# expanding one straight into `run:` is a shell-injection vector.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
|
||||
# A rapid series of pushes only needs the last one checked.
|
||||
concurrency:
|
||||
group: ci-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
REPO_URL: https://git.ryuvia.com/niklas/terdut-tui.git
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: golang:1.26.6-bookworm
|
||||
# act_runner destroys a job's own volumes when it finishes, so without these every
|
||||
# run re-downloads the whole module graph. The names must appear in the runner's
|
||||
# container.valid_volumes allowlist (charts/act-runner in the k8s repo); unlisted
|
||||
# volumes are dropped silently, so a workflow that looks correct can still be
|
||||
# running uncached.
|
||||
volumes:
|
||||
- go-mod-cache:/go/pkg/mod
|
||||
- go-build-cache:/root/.cache/go-build
|
||||
- gobin-cache:/go/bin
|
||||
steps:
|
||||
- name: Checkout
|
||||
env:
|
||||
REF_NAME: ${{ github.ref_name }}
|
||||
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
|
||||
run: |
|
||||
if [ -n "$HEAD_SHA" ]; then
|
||||
# A pull_request ref_name is "<n>/merge", which is not a fetchable branch.
|
||||
git clone "$REPO_URL" .
|
||||
git checkout -q "$HEAD_SHA"
|
||||
else
|
||||
git clone --depth=1 --branch "$REF_NAME" "$REPO_URL" .
|
||||
fi
|
||||
|
||||
- name: Vet
|
||||
run: go vet ./...
|
||||
|
||||
# Covers the API client against a stub server, the Update state machine, and View
|
||||
# rendering -- all three are pure enough to test without a terminal.
|
||||
- name: Test
|
||||
run: go test ./...
|
||||
@@ -0,0 +1,118 @@
|
||||
name: Release
|
||||
|
||||
# Checkout, interpolation and caching conventions match ci.yaml -- see the header there
|
||||
# for why there are no JS actions and why every `${{ }}` goes through `env:`.
|
||||
#
|
||||
# There is no upload-artifact/download-artifact equivalent here (both are JS actions, and
|
||||
# this Gitea has no artifact store wired up), so the job that builds the binaries is also
|
||||
# the job that publishes them. Nothing is handed between jobs.
|
||||
#
|
||||
# The asset names matter beyond being tidy: internal/updater looks for exactly
|
||||
# terdut-tui-<tag>-<goos>-<goarch> in the latest release and reports every available name
|
||||
# when it cannot find one. Renaming the pattern here breaks self-update for every
|
||||
# installed binary.
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: release-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
REPO_URL: https://git.ryuvia.com/niklas/terdut-tui.git
|
||||
API: https://git.ryuvia.com/api/v1/repos/niklas/terdut-tui
|
||||
|
||||
jobs:
|
||||
# Gates the build, so a tag that fails here publishes no binaries.
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: golang:1.26.6-bookworm
|
||||
volumes:
|
||||
- go-mod-cache:/go/pkg/mod
|
||||
- go-build-cache:/root/.cache/go-build
|
||||
- gobin-cache:/go/bin
|
||||
steps:
|
||||
- name: Checkout
|
||||
env:
|
||||
REF_NAME: ${{ github.ref_name }}
|
||||
run: git clone --depth=1 --branch "$REF_NAME" "$REPO_URL" .
|
||||
|
||||
- name: Vet
|
||||
run: go vet ./...
|
||||
|
||||
- name: Test
|
||||
run: go test ./...
|
||||
|
||||
binaries:
|
||||
needs: test
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: golang:1.26.6-bookworm
|
||||
volumes:
|
||||
- go-mod-cache:/go/pkg/mod
|
||||
- go-build-cache:/root/.cache/go-build
|
||||
- gobin-cache:/go/bin
|
||||
steps:
|
||||
- name: Checkout
|
||||
env:
|
||||
REF_NAME: ${{ github.ref_name }}
|
||||
run: git clone --depth=1 --branch "$REF_NAME" "$REPO_URL" .
|
||||
|
||||
- name: Build every target
|
||||
env:
|
||||
REF_NAME: ${{ github.ref_name }}
|
||||
run: |
|
||||
set -eu
|
||||
mkdir -p dist
|
||||
for target in linux/amd64 linux/arm64 darwin/amd64 darwin/arm64; do
|
||||
GOOS="${target%/*}"
|
||||
GOARCH="${target#*/}"
|
||||
out="dist/terdut-tui-${REF_NAME}-${GOOS}-${GOARCH}"
|
||||
echo "building $out"
|
||||
GOOS="$GOOS" GOARCH="$GOARCH" go build \
|
||||
-ldflags "-X main.version=${REF_NAME}" \
|
||||
-o "$out" .
|
||||
done
|
||||
|
||||
# Creating the release is made idempotent rather than assumed-new: a re-run of a
|
||||
# failed release must not die on the release that already exists. Assets are
|
||||
# replaced the same way, so a re-run repairs a partial upload.
|
||||
- name: Publish the release
|
||||
env:
|
||||
REF_NAME: ${{ github.ref_name }}
|
||||
TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
||||
run: |
|
||||
set -eu
|
||||
auth="Authorization: token $TOKEN"
|
||||
|
||||
body=$(curl -sf -H "$auth" "$API/releases/tags/$REF_NAME" || true)
|
||||
if [ -z "$body" ]; then
|
||||
body=$(curl -sf -X POST -H "$auth" -H 'Content-Type: application/json' \
|
||||
-d "{\"tag_name\":\"$REF_NAME\",\"name\":\"$REF_NAME\"}" \
|
||||
"$API/releases")
|
||||
fi
|
||||
|
||||
# The release object serialises `id` first, so the first match is the release's
|
||||
# own id and not one of the nested author/asset ids.
|
||||
release_id=$(printf '%s' "$body" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
|
||||
[ -n "$release_id" ] || { echo "::error::could not determine release id"; exit 1; }
|
||||
echo "release id $release_id"
|
||||
|
||||
for f in dist/*; do
|
||||
name=$(basename "$f")
|
||||
# Drop an existing asset of the same name first: Gitea happily stores two
|
||||
# attachments with one name, and the updater matches by name.
|
||||
old=$(curl -sf -H "$auth" "$API/releases/$release_id/assets" \
|
||||
| tr '}' '\n' | grep "\"name\":\"$name\"" \
|
||||
| grep -o '"id":[0-9]*' | head -1 | cut -d: -f2 || true)
|
||||
if [ -n "$old" ]; then
|
||||
curl -sf -X DELETE -H "$auth" "$API/releases/$release_id/assets/$old" || true
|
||||
fi
|
||||
echo "uploading $name"
|
||||
curl -sf -X POST -H "$auth" -F "attachment=@$f" \
|
||||
"$API/releases/$release_id/assets?name=$name" > /dev/null
|
||||
done
|
||||
@@ -1,32 +0,0 @@
|
||||
name: CI
|
||||
|
||||
# The release workflow gates a tag, which is late: a broken commit sits green
|
||||
# until somebody decides to publish. This runs the same checks on the way in.
|
||||
#
|
||||
# push is scoped to main so that a branch pushed as part of a pull request is
|
||||
# not checked twice.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
|
||||
# A rapid series of pushes only needs the last one checked.
|
||||
concurrency:
|
||||
group: ci-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version-file: go.mod
|
||||
|
||||
- name: Vet
|
||||
run: go vet ./...
|
||||
|
||||
- name: Test
|
||||
run: go test ./...
|
||||
@@ -1,76 +0,0 @@
|
||||
name: Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
# Gates the build, so a tag that fails here publishes no binaries. The suite
|
||||
# covers the API client against a stub server, the Update state machine, and
|
||||
# View rendering — all three are pure enough to test without a terminal.
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version-file: go.mod
|
||||
|
||||
- name: Vet
|
||||
run: go vet ./...
|
||||
|
||||
- name: Test
|
||||
run: go test ./...
|
||||
|
||||
build:
|
||||
needs: test
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- goos: linux
|
||||
goarch: amd64
|
||||
- goos: linux
|
||||
goarch: arm64
|
||||
- goos: darwin
|
||||
goarch: amd64
|
||||
- goos: darwin
|
||||
goarch: arm64
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version-file: go.mod
|
||||
|
||||
- name: Build
|
||||
env:
|
||||
GOOS: ${{ matrix.goos }}
|
||||
GOARCH: ${{ matrix.goarch }}
|
||||
run: |
|
||||
go build \
|
||||
-ldflags "-X main.version=${{ github.ref_name }}" \
|
||||
-o terdut-tui-${{ github.ref_name }}-${{ matrix.goos }}-${{ matrix.goarch }} \
|
||||
.
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: terdut-tui-${{ github.ref_name }}-${{ matrix.goos }}-${{ matrix.goarch }}
|
||||
path: terdut-tui-${{ github.ref_name }}-${{ matrix.goos }}-${{ matrix.goarch }}
|
||||
|
||||
release:
|
||||
needs: build
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
merge-multiple: true
|
||||
|
||||
- uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
files: 'terdut-tui-*'
|
||||
@@ -1,6 +1,6 @@
|
||||
# terdut-tui
|
||||
|
||||
TUI client for [terdut-server](https://github.com/terdut-server), a Prometheus Alertmanager receiver and incident manager. Requires server **v0.4.0+**.
|
||||
TUI client for [terdut-server](https://git.ryuvia.com/niklas/terdut-server), a Prometheus Alertmanager receiver and incident manager. Requires server **v0.4.0+**.
|
||||
|
||||
## Domain model
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# terdut-tui
|
||||
|
||||
A terminal user interface for [terdut-server](https://github.com/terdut-server). Communicates with the server over its REST API.
|
||||
A terminal user interface for [terdut-server](https://git.ryuvia.com/niklas/terdut-server). Communicates with the server over its REST API.
|
||||
|
||||
Written in Go using [Bubbletea](https://github.com/charmbracelet/bubbletea).
|
||||
|
||||
@@ -8,11 +8,11 @@ Written in Go using [Bubbletea](https://github.com/charmbracelet/bubbletea).
|
||||
|
||||
- **Incident queue** — open incidents with severity, status, assignee and age, auto-refreshing
|
||||
- **Incident actions** — acknowledge, assign, snooze, note, resolve and archive
|
||||
- **Timeline** — the full history of an incident, system events and notes together
|
||||
- **Timeline** — the full history of an incident, system events, pages and notes together
|
||||
- **Alert feed** — the raw read-only alerts underneath, each linked to its incident
|
||||
- **On-call schedule** — visual calendar of who is on duty, assign and remove entries
|
||||
- **Statistics** — MTTA and MTTR, plus alert frequency by name, hour and day
|
||||
- **User management** — add and remove users, manage API keys
|
||||
- **User management** — add and remove users, manage API keys, set each user's ntfy topic
|
||||
|
||||
> Requires terdut-server **v0.4.0 or later**. Earlier servers have no incidents API;
|
||||
> use terdut-tui v0.3.x with those.
|
||||
@@ -37,12 +37,28 @@ Two behaviours worth knowing before you press a key:
|
||||
- **Snooze is the "not now" button.** It hides an incident from the default queue
|
||||
without closing it, and expires on its own.
|
||||
|
||||
## Push notifications
|
||||
|
||||
When the server is configured for ntfy, an incident that opens pages whoever is
|
||||
on call. Each user has their own topic, shown as a column in the Users section
|
||||
and edited with `t`. A user with no topic falls back to the server's shared
|
||||
fallback topic, which carries **no Acknowledge button** — the topic is shared, so
|
||||
a button on it would let any subscriber acknowledge as somebody else.
|
||||
|
||||
Every delivery lands on the incident's timeline: `Notified <user> (triggered)`
|
||||
when ntfy accepted the page, and `Notification to <user> failed` when it ran out
|
||||
of retries. That second one is the one to look for when nobody's phone rang.
|
||||
|
||||
Editing topics needs terdut-server **v0.6.0 or later**; the timeline entries need
|
||||
**v0.7.0 or later**. Against an older server the topic column stays empty and
|
||||
editing one reports the server's 404.
|
||||
|
||||
## Installation
|
||||
|
||||
Download the latest release binary for your platform from the [releases page](https://github.com/yeniklas/terdut-tui/releases), or build from source:
|
||||
Download the latest release binary for your platform from the [releases page](https://git.ryuvia.com/niklas/terdut-tui/releases), or build from source:
|
||||
|
||||
```bash
|
||||
go install github.com/yeniklas/terdut-tui@latest
|
||||
go install git.ryuvia.com/niklas/terdut-tui@latest
|
||||
```
|
||||
|
||||
## Configuration
|
||||
@@ -123,10 +139,18 @@ Schedule section:
|
||||
| `d` | Remove the assignment |
|
||||
| `←` / `→` | Shift the week window |
|
||||
|
||||
One person holds a given day. Assigning over days somebody else already has
|
||||
asks first — naming them and how many days are being taken — and moves the whole
|
||||
selection at once when you accept, so reassigning a week is one confirmation
|
||||
rather than seven deletions. Taking somebody's shift needs terdut-server
|
||||
**v0.8.0 or later**; against an older server the assignment is refused with
|
||||
`date already assigned`.
|
||||
|
||||
Users section:
|
||||
|
||||
| Key | Action |
|
||||
|-----|--------|
|
||||
| `n` | Create a user |
|
||||
| `t` | Edit the user's ntfy topic — submit empty to clear it |
|
||||
| `d` | Delete a user |
|
||||
| `k` | API keys for the selected user |
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
module github.com/yeniklas/terdut-tui
|
||||
module git.ryuvia.com/niklas/terdut-tui
|
||||
|
||||
go 1.25.9
|
||||
|
||||
|
||||
+27
-4
@@ -358,11 +358,17 @@ func (c *Client) GetCurrentOnCall() (*ScheduleEntry, error) {
|
||||
return &entry, nil
|
||||
}
|
||||
|
||||
func (c *Client) AssignSchedule(userID int64, dates []string) ([]ScheduleEntry, error) {
|
||||
// AssignSchedule puts one user on call for the given dates.
|
||||
//
|
||||
// The server holds one person per day and refuses a date somebody already has,
|
||||
// so replace is what takes a shift off its current holder. It is all-or-nothing
|
||||
// either way: a week of free and taken days moves as a unit, or not at all.
|
||||
func (c *Client) AssignSchedule(userID int64, dates []string, replace bool) ([]ScheduleEntry, error) {
|
||||
body := struct {
|
||||
UserID int64 `json:"user_id"`
|
||||
Dates []string `json:"dates"`
|
||||
}{UserID: userID, Dates: dates}
|
||||
UserID int64 `json:"user_id"`
|
||||
Dates []string `json:"dates"`
|
||||
Replace bool `json:"replace,omitempty"`
|
||||
}{UserID: userID, Dates: dates, Replace: replace}
|
||||
req, err := c.newRequestWithBody(http.MethodPost, "/api/schedule", body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -401,6 +407,23 @@ func (c *Client) CreateUser(username, email string) (*User, error) {
|
||||
return &user, c.do(req, &user)
|
||||
}
|
||||
|
||||
// SetUserNotifyTarget points a user's push notifications at an ntfy topic.
|
||||
//
|
||||
// An empty topic clears it: the server stores NULL, and that user's incidents
|
||||
// page the shared fallback topic instead — which carries no Acknowledge button,
|
||||
// because anyone subscribed to it could otherwise acknowledge as somebody else.
|
||||
func (c *Client) SetUserNotifyTarget(userID int64, topic string) (*User, error) {
|
||||
body := struct {
|
||||
NtfyTopic string `json:"ntfy_topic"`
|
||||
}{NtfyTopic: topic}
|
||||
req, err := c.newRequestWithBody(http.MethodPut, fmt.Sprintf("/api/users/%d/notify", userID), body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var user User
|
||||
return &user, c.do(req, &user)
|
||||
}
|
||||
|
||||
func (c *Client) DeleteUser(id int64) error {
|
||||
req, err := c.newRequest(http.MethodDelete, fmt.Sprintf("/api/users/%d", id))
|
||||
if err != nil {
|
||||
|
||||
@@ -83,6 +83,8 @@ func TestClient_IncidentEndpoints(t *testing.T) {
|
||||
http.MethodDelete, "/api/incidents/7/notes/12", ""},
|
||||
{"stats", func(c *Client) error { _, err := c.GetIncidentStats(); return err },
|
||||
http.MethodGet, "/api/stats/incidents", ""},
|
||||
{"set notify target", func(c *Client) error { _, err := c.SetUserNotifyTarget(7, "t"); return err },
|
||||
http.MethodPut, "/api/users/7/notify", ""},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
@@ -163,6 +165,65 @@ func TestClient_RequestBodies(t *testing.T) {
|
||||
t.Errorf("expected duration 90m, got %q", body.Duration)
|
||||
}
|
||||
})
|
||||
|
||||
// replace is what takes a day off its current holder, so it has to reach the
|
||||
// wire when asked for — and stay off it when not.
|
||||
t.Run("assign schedule", func(t *testing.T) {
|
||||
c, got := stub(t, http.StatusCreated, `[]`)
|
||||
if _, err := c.AssignSchedule(3, []string{"2026-07-27"}, false); err != nil {
|
||||
t.Fatalf("assign: %v", err)
|
||||
}
|
||||
if got.body != `{"user_id":3,"dates":["2026-07-27"]}` {
|
||||
t.Errorf("unexpected body %q", got.body)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("assign schedule with replace", func(t *testing.T) {
|
||||
c, got := stub(t, http.StatusCreated, `[]`)
|
||||
if _, err := c.AssignSchedule(3, []string{"2026-07-27"}, true); err != nil {
|
||||
t.Fatalf("assign: %v", err)
|
||||
}
|
||||
if got.body != `{"user_id":3,"dates":["2026-07-27"],"replace":true}` {
|
||||
t.Errorf("unexpected body %q", got.body)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("set notify target", func(t *testing.T) {
|
||||
c, got := stub(t, http.StatusOK, `{}`)
|
||||
if _, err := c.SetUserNotifyTarget(3, "terdut-niklas"); err != nil {
|
||||
t.Fatalf("set notify target: %v", err)
|
||||
}
|
||||
if got.body != `{"ntfy_topic":"terdut-niklas"}` {
|
||||
t.Errorf("unexpected body %q", got.body)
|
||||
}
|
||||
})
|
||||
|
||||
// Clearing has to put an explicit empty string on the wire: omitting the
|
||||
// field would leave the topic untouched instead of removing it.
|
||||
t.Run("clear notify target", func(t *testing.T) {
|
||||
c, got := stub(t, http.StatusOK, `{}`)
|
||||
if _, err := c.SetUserNotifyTarget(3, ""); err != nil {
|
||||
t.Fatalf("clear notify target: %v", err)
|
||||
}
|
||||
if got.body != `{"ntfy_topic":""}` {
|
||||
t.Errorf("expected an explicit empty topic, got %q", got.body)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestUser_TopicFlattensNilAndEmpty(t *testing.T) {
|
||||
var users []User
|
||||
if err := json.Unmarshal([]byte(
|
||||
`[{"id":1,"username":"a"},{"id":2,"username":"b","ntfy_topic":""},
|
||||
{"id":3,"username":"c","ntfy_topic":"terdut-c"}]`), &users); err != nil {
|
||||
t.Fatalf("decode: %v", err)
|
||||
}
|
||||
want := []string{"", "", "terdut-c"}
|
||||
for i, u := range users {
|
||||
if got := u.Topic(); got != want[i] {
|
||||
t.Errorf("user %d: expected topic %q, got %q", u.ID, want[i], got)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The 409 on re-resolving is the server telling the user why nothing happened,
|
||||
|
||||
@@ -95,6 +95,13 @@ const (
|
||||
EventUnsnoozed = "unsnoozed"
|
||||
EventResolved = "resolved"
|
||||
EventNote = "note"
|
||||
|
||||
// Written by the server's notifier from the delivery result, not at enqueue.
|
||||
// Detail carries the notification kind ("triggered", "reminder", "resolved"),
|
||||
// and on a failure the reason after it. An absent user means the page went to
|
||||
// the shared fallback topic rather than to a person.
|
||||
EventNotified = "notified"
|
||||
EventNotifyFailed = "notify_failed"
|
||||
)
|
||||
|
||||
// IncidentEvent is one entry in an incident's timeline. An empty Username means
|
||||
@@ -158,6 +165,21 @@ type User struct {
|
||||
Username string `json:"username"`
|
||||
Email string `json:"email"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
|
||||
// NtfyTopic is where this user's push notifications go. Nil and empty mean
|
||||
// the same thing — no topic of their own — because the server stores a blank
|
||||
// string as NULL. Their incidents fall back to the server's shared fallback
|
||||
// topic, which carries no Acknowledge button.
|
||||
NtfyTopic *string `json:"ntfy_topic,omitempty"`
|
||||
}
|
||||
|
||||
// Topic reads the user's ntfy topic, flattening the nil and empty cases the
|
||||
// server treats alike.
|
||||
func (u User) Topic() string {
|
||||
if u.NtfyTopic == nil {
|
||||
return ""
|
||||
}
|
||||
return *u.NtfyTopic
|
||||
}
|
||||
|
||||
type APIKey struct {
|
||||
|
||||
+49
-5
@@ -10,7 +10,7 @@ import (
|
||||
"github.com/charmbracelet/bubbles/viewport"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/yeniklas/terdut-tui/internal/api"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/api"
|
||||
)
|
||||
|
||||
// ── Enums ──────────────────────────────────────────────────────────────────
|
||||
@@ -40,6 +40,7 @@ const (
|
||||
modeConfirm
|
||||
modeUserPicker
|
||||
modeUserCreate
|
||||
modeUserNotifyEdit
|
||||
modeAPIKeyMenu
|
||||
modeAPIKeyCreate
|
||||
modeAPIKeyReveal
|
||||
@@ -53,6 +54,7 @@ const (
|
||||
confirmResolveIncident
|
||||
confirmDeleteScheduleEntry
|
||||
confirmDeleteUser
|
||||
confirmReassignSchedule
|
||||
)
|
||||
|
||||
// pickerTarget says what the user picker is choosing a person for.
|
||||
@@ -142,6 +144,18 @@ type scheduleDay struct {
|
||||
entry *api.ScheduleEntry
|
||||
}
|
||||
|
||||
// pendingAssign is an on-call assignment held back by the reassignment
|
||||
// confirmation, because some of its dates belong to somebody else.
|
||||
type pendingAssign struct {
|
||||
userID int64
|
||||
username string
|
||||
dates []string
|
||||
// taken are the dates currently held by other people, and holders the
|
||||
// distinct names holding them — both only for wording the prompt.
|
||||
taken []string
|
||||
holders []string
|
||||
}
|
||||
|
||||
type Model struct {
|
||||
client *api.Client
|
||||
serverURL string
|
||||
@@ -193,6 +207,7 @@ type Model struct {
|
||||
confirmTarget confirmTarget
|
||||
pendingDeleteID int64 // note event ID
|
||||
pendingDeleteEntry *api.ScheduleEntry
|
||||
pendingAssign *pendingAssign
|
||||
|
||||
// Stats
|
||||
topAlerts []api.TopAlert
|
||||
@@ -224,6 +239,7 @@ type Model struct {
|
||||
selectedUser api.User
|
||||
userFormInputs [2]textinput.Model
|
||||
userFormFocus int
|
||||
ntfyTopicInput textinput.Model
|
||||
apiKeyNameInput textinput.Model
|
||||
apiKeyRevokeInput textinput.Model
|
||||
revealedAPIKey api.APIKey
|
||||
@@ -273,6 +289,10 @@ func NewModel(client *api.Client, serverURL string, refreshInterval time.Duratio
|
||||
emailIn.Placeholder = "email"
|
||||
emailIn.CharLimit = 128
|
||||
|
||||
topicIn := textinput.New()
|
||||
topicIn.Placeholder = "ntfy topic — empty clears it"
|
||||
topicIn.CharLimit = 128
|
||||
|
||||
keyNameIn := textinput.New()
|
||||
keyNameIn.Placeholder = "key name (e.g. laptop)"
|
||||
keyNameIn.CharLimit = 64
|
||||
@@ -310,6 +330,7 @@ func NewModel(client *api.Client, serverURL string, refreshInterval time.Duratio
|
||||
userPickerTable: pickerT,
|
||||
userManageTable: manageT,
|
||||
userFormInputs: [2]textinput.Model{usernameIn, emailIn},
|
||||
ntfyTopicInput: topicIn,
|
||||
apiKeyNameInput: keyNameIn,
|
||||
apiKeyRevokeInput: revokeIn,
|
||||
help: help.New(),
|
||||
@@ -371,7 +392,11 @@ func (m *Model) rebuildUserManageTable() {
|
||||
m.userManageTable.SetColumns(userManageColumns(m.width))
|
||||
rows := make([]table.Row, len(m.users))
|
||||
for i, u := range m.users {
|
||||
rows[i] = table.Row{u.Username, u.Email, u.CreatedAt.UTC().Format("2006-01-02")}
|
||||
topic := u.Topic()
|
||||
if topic == "" {
|
||||
topic = "—"
|
||||
}
|
||||
rows[i] = table.Row{u.Username, u.Email, topic, u.CreatedAt.UTC().Format("2006-01-02")}
|
||||
}
|
||||
m.userManageTable.SetRows(rows)
|
||||
m.userManageTable.SetHeight(tableHeight(m.height, 10))
|
||||
@@ -502,13 +527,16 @@ func userPickerColumns(width int) []table.Column {
|
||||
func userManageColumns(width int) []table.Column {
|
||||
createdW := 12
|
||||
usernameW := 25
|
||||
emailW := width - usernameW - createdW - 8
|
||||
topicW := 22
|
||||
// 8 = bubbles' Padding(0, 1) on each of the four cells.
|
||||
emailW := width - usernameW - topicW - createdW - 8
|
||||
if emailW < 15 {
|
||||
emailW = 15
|
||||
}
|
||||
return []table.Column{
|
||||
{Title: "Username", Width: usernameW},
|
||||
{Title: "Email", Width: emailW},
|
||||
{Title: "Ntfy Topic", Width: topicW},
|
||||
{Title: "Created", Width: createdW},
|
||||
}
|
||||
}
|
||||
@@ -852,9 +880,9 @@ func fetchScheduleCmd(client *api.Client, from, to time.Time) tea.Cmd {
|
||||
}
|
||||
}
|
||||
|
||||
func assignScheduleCmd(client *api.Client, userID int64, dates []string, from, to time.Time) tea.Cmd {
|
||||
func assignScheduleCmd(client *api.Client, userID int64, dates []string, replace bool, from, to time.Time) tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
if _, err := client.AssignSchedule(userID, dates); err != nil {
|
||||
if _, err := client.AssignSchedule(userID, dates, replace); err != nil {
|
||||
return scheduleActionErrMsg{err}
|
||||
}
|
||||
entries, err := client.GetSchedule(from.Format("2006-01-02"), to.Format("2006-01-02"))
|
||||
@@ -909,6 +937,22 @@ func createUserCmd(client *api.Client, username, email string) tea.Cmd {
|
||||
}
|
||||
}
|
||||
|
||||
// setUserNotifyTargetCmd points a user's pages at a topic, or clears it when
|
||||
// topic is empty. It re-lists afterwards so the table shows what the server
|
||||
// stored rather than what was typed.
|
||||
func setUserNotifyTargetCmd(client *api.Client, userID int64, topic string) tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
if _, err := client.SetUserNotifyTarget(userID, topic); err != nil {
|
||||
return userActionErrMsg{err}
|
||||
}
|
||||
users, err := client.ListUsers()
|
||||
if err != nil {
|
||||
return userActionErrMsg{err}
|
||||
}
|
||||
return usersFetchedMsg{users: users}
|
||||
}
|
||||
}
|
||||
|
||||
func deleteUserCmd(client *api.Client, userID int64) tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
if err := client.DeleteUser(userID); err != nil {
|
||||
|
||||
+133
-2
@@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/charmbracelet/bubbles/table"
|
||||
"github.com/yeniklas/terdut-tui/internal/api"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/api"
|
||||
)
|
||||
|
||||
func TestNextFilter(t *testing.T) {
|
||||
@@ -172,6 +172,32 @@ func TestAlertRows_ShowIncidentLink(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// A user with no ntfy topic gets no pages of their own — the row has to say so
|
||||
// rather than leaving a blank that reads as "not loaded yet".
|
||||
func TestUserManageRows_ShowMissingTopic(t *testing.T) {
|
||||
topic := "terdut-niklas"
|
||||
empty := ""
|
||||
m := NewModel(nil, "http://test", time.Minute)
|
||||
m.width, m.height = 120, 40
|
||||
m.users = []api.User{
|
||||
{ID: 1, Username: "niklas", NtfyTopic: &topic},
|
||||
{ID: 2, Username: "alex"},
|
||||
// The server stores a blank topic as NULL, but a stale client or an older
|
||||
// server can still hand one back; it means the same thing.
|
||||
{ID: 3, Username: "sam", NtfyTopic: &empty},
|
||||
}
|
||||
m.rebuildUserManageTable()
|
||||
|
||||
rows := m.userManageTable.Rows()
|
||||
if rows[0][2] != "terdut-niklas" {
|
||||
t.Errorf("expected the topic in the row, got %q", rows[0][2])
|
||||
}
|
||||
if rows[1][2] != "—" || rows[2][2] != "—" {
|
||||
t.Errorf("expected an em dash for nil and empty topics, got %q and %q",
|
||||
rows[1][2], rows[2][2])
|
||||
}
|
||||
}
|
||||
|
||||
// A previous release overflowed the terminal by two columns because the padding
|
||||
// budget was wrong. Columns plus bubbles' per-cell padding must land exactly on
|
||||
// the window width.
|
||||
@@ -191,6 +217,17 @@ func TestColumnWidthsFitTheTerminal(t *testing.T) {
|
||||
name, width, sum, padding, sum+padding)
|
||||
}
|
||||
}
|
||||
|
||||
// The users table is four cells, so its padding budget differs.
|
||||
sum := 0
|
||||
for _, w := range widths(userManageColumns(width)) {
|
||||
sum += w
|
||||
}
|
||||
const userPadding = 8
|
||||
if sum+userPadding != width {
|
||||
t.Errorf("user columns at width %d sum to %d+%d = %d",
|
||||
width, sum, userPadding, sum+userPadding)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -198,7 +235,9 @@ func TestColumnWidthsFitTheTerminal(t *testing.T) {
|
||||
// what must not happen is a negative or zero column.
|
||||
func TestColumnWidthsStayPositiveWhenNarrow(t *testing.T) {
|
||||
for _, width := range []int{20, 40, 60} {
|
||||
for _, w := range append(widths(incidentColumns(width)), widths(alertColumns(width))...) {
|
||||
cols := append(widths(incidentColumns(width)), widths(alertColumns(width))...)
|
||||
cols = append(cols, widths(userManageColumns(width))...)
|
||||
for _, w := range cols {
|
||||
if w < 1 {
|
||||
t.Errorf("width %d produced a non-positive column %d", width, w)
|
||||
}
|
||||
@@ -238,3 +277,95 @@ func TestBuildScheduleDays(t *testing.T) {
|
||||
t.Error("expected unassigned days to have no entry")
|
||||
}
|
||||
}
|
||||
|
||||
// ── Schedule reassignment ─────────────────────────────────────────────────
|
||||
|
||||
// scheduledWeek builds a model showing the week of 2026-07-27 with the given
|
||||
// entries already on the rota.
|
||||
func scheduledWeek(entries []api.ScheduleEntry) Model {
|
||||
m := NewModel(nil, "http://test", time.Minute)
|
||||
m.width, m.height = 120, 40
|
||||
m.connected = true
|
||||
m.activeSection = sectionSchedule
|
||||
m.scheduleWindow = time.Date(2026, 7, 27, 0, 0, 0, 0, time.UTC)
|
||||
m.scheduleEntries = entries
|
||||
m.scheduleDays = buildScheduleDays(m.scheduleWindow, entries)
|
||||
m.rebuildScheduleTable()
|
||||
return m
|
||||
}
|
||||
|
||||
func TestScheduleConflicts(t *testing.T) {
|
||||
m := scheduledWeek([]api.ScheduleEntry{
|
||||
{ID: 1, Date: "2026-07-27", UserID: 1, Username: "niklas"},
|
||||
{ID: 2, Date: "2026-07-28", UserID: 3, Username: "sam"},
|
||||
{ID: 3, Date: "2026-07-29", UserID: 2, Username: "alex"},
|
||||
})
|
||||
week := []string{"2026-07-27", "2026-07-28", "2026-07-29", "2026-07-30"}
|
||||
|
||||
// Assigning alex: the days niklas and sam hold are conflicts, the day alex
|
||||
// already holds is not, and the free day is not.
|
||||
taken, holders := m.scheduleConflicts(week, 2)
|
||||
if len(taken) != 2 || taken[0] != "2026-07-27" || taken[1] != "2026-07-28" {
|
||||
t.Errorf("expected the two other people's days, got %v", taken)
|
||||
}
|
||||
if len(holders) != 2 || holders[0] != "niklas" || holders[1] != "sam" {
|
||||
t.Errorf("expected both holders named once, got %v", holders)
|
||||
}
|
||||
}
|
||||
|
||||
// Reassigning somebody to a day they already hold takes nothing from anyone, so
|
||||
// it must not raise a prompt — but it still needs replace, because the server
|
||||
// rejects any date that already exists.
|
||||
func TestScheduleConflicts_OwnDayIsNotAConflict(t *testing.T) {
|
||||
m := scheduledWeek([]api.ScheduleEntry{
|
||||
{ID: 1, Date: "2026-07-27", UserID: 2, Username: "alex"},
|
||||
})
|
||||
dates := []string{"2026-07-27"}
|
||||
|
||||
if taken, _ := m.scheduleConflicts(dates, 2); len(taken) != 0 {
|
||||
t.Errorf("expected no conflict on the user's own day, got %v", taken)
|
||||
}
|
||||
if !m.scheduleOccupied(dates) {
|
||||
t.Error("expected the day to still count as occupied, so replace is sent")
|
||||
}
|
||||
}
|
||||
|
||||
func TestScheduleOccupied_FreeDays(t *testing.T) {
|
||||
m := scheduledWeek(nil)
|
||||
if m.scheduleOccupied([]string{"2026-07-27", "2026-07-28"}) {
|
||||
t.Error("expected an empty rota to need no replace")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDayCount(t *testing.T) {
|
||||
tests := []struct {
|
||||
taken, total int
|
||||
want string
|
||||
}{
|
||||
{1, 1, "This day is"},
|
||||
{7, 7, "All 7 days are"},
|
||||
{3, 7, "3 of 7 days are"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
if got := dayCount(tt.taken, tt.total); got != tt.want {
|
||||
t.Errorf("dayCount(%d, %d) = %q, want %q", tt.taken, tt.total, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestJoinNames(t *testing.T) {
|
||||
tests := []struct {
|
||||
names []string
|
||||
want string
|
||||
}{
|
||||
{nil, "somebody else"},
|
||||
{[]string{"niklas"}, "niklas"},
|
||||
{[]string{"niklas", "alex"}, "niklas and alex"},
|
||||
{[]string{"niklas", "alex", "sam"}, "niklas, alex and sam"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
if got := joinNames(tt.names); got != tt.want {
|
||||
t.Errorf("joinNames(%v) = %q, want %q", tt.names, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/yeniklas/terdut-tui/internal/api"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/api"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
+130
-2
@@ -7,7 +7,7 @@ import (
|
||||
"github.com/atotto/clipboard"
|
||||
"github.com/charmbracelet/bubbles/viewport"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/yeniklas/terdut-tui/internal/api"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/api"
|
||||
)
|
||||
|
||||
func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
@@ -258,6 +258,12 @@ func (m Model) routeKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
m2, ourCmd := m.handleKey(msg)
|
||||
return m2, tea.Batch(inputCmd, ourCmd)
|
||||
|
||||
case modeUserNotifyEdit:
|
||||
var inputCmd tea.Cmd
|
||||
m.ntfyTopicInput, inputCmd = m.ntfyTopicInput.Update(msg)
|
||||
m2, ourCmd := m.handleKey(msg)
|
||||
return m2, tea.Batch(inputCmd, ourCmd)
|
||||
|
||||
case modeAPIKeyCreate:
|
||||
var inputCmd tea.Cmd
|
||||
m.apiKeyNameInput, inputCmd = m.apiKeyNameInput.Update(msg)
|
||||
@@ -328,6 +334,8 @@ func (m Model) handleKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
return m.handleUserPickerKey(msg)
|
||||
case modeUserCreate:
|
||||
return m.handleUserCreateKey(msg)
|
||||
case modeUserNotifyEdit:
|
||||
return m.handleUserNotifyEditKey(msg)
|
||||
case modeAPIKeyMenu:
|
||||
return m.handleAPIKeyMenuKey(msg)
|
||||
case modeAPIKeyCreate:
|
||||
@@ -497,6 +505,23 @@ func (m Model) handleDashboardKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
m.mode = modeUserCreate
|
||||
return m, nil
|
||||
|
||||
case "t":
|
||||
if m.activeSection != sectionUsers || !m.connected || len(m.users) == 0 {
|
||||
return m, nil
|
||||
}
|
||||
cursor := m.userManageTable.Cursor()
|
||||
if cursor >= len(m.users) {
|
||||
return m, nil
|
||||
}
|
||||
m.selectedUser = m.users[cursor]
|
||||
// Prefilled with what they have, so editing a topic does not mean
|
||||
// retyping it, and clearing one is a deliberate wipe.
|
||||
m.ntfyTopicInput.SetValue(m.selectedUser.Topic())
|
||||
m.ntfyTopicInput.CursorEnd()
|
||||
m.ntfyTopicInput.Focus()
|
||||
m.mode = modeUserNotifyEdit
|
||||
return m, nil
|
||||
|
||||
case "k":
|
||||
if m.activeSection != sectionUsers || !m.connected || len(m.users) == 0 {
|
||||
return m, nil
|
||||
@@ -797,6 +822,7 @@ func (m Model) handleConfirmKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
}
|
||||
m.pendingDeleteID = 0
|
||||
m.pendingDeleteEntry = nil
|
||||
m.pendingAssign = nil
|
||||
return m, nil
|
||||
}
|
||||
|
||||
@@ -826,6 +852,17 @@ func (m Model) handleConfirmKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
m.mode = modeDashboard
|
||||
m.usersLoading = true
|
||||
return m, deleteUserCmd(m.client, userID)
|
||||
|
||||
case confirmReassignSchedule:
|
||||
p := m.pendingAssign
|
||||
m.mode = modeDashboard
|
||||
m.pendingAssign = nil
|
||||
if p == nil {
|
||||
return m, nil
|
||||
}
|
||||
m.scheduleLoading = true
|
||||
return m, assignScheduleCmd(m.client, p.userID, p.dates, true,
|
||||
m.scheduleWindow, m.scheduleWindow.AddDate(0, 0, 6))
|
||||
}
|
||||
|
||||
return m, nil
|
||||
@@ -874,15 +911,84 @@ func (m Model) handleUserPickerKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
} else {
|
||||
dates = []string{d.Format("2006-01-02")}
|
||||
}
|
||||
|
||||
// The server refuses a date somebody else holds, so ask before taking
|
||||
// it rather than letting the request come back 409. The answer is
|
||||
// already on screen — no round trip is needed to work out who loses
|
||||
// their shift.
|
||||
taken, holders := m.scheduleConflicts(dates, user.ID)
|
||||
if len(taken) > 0 {
|
||||
m.pendingAssign = &pendingAssign{
|
||||
userID: user.ID,
|
||||
username: user.Username,
|
||||
dates: dates,
|
||||
taken: taken,
|
||||
holders: holders,
|
||||
}
|
||||
m.confirmTarget = confirmReassignSchedule
|
||||
m.mode = modeConfirm
|
||||
return m, nil
|
||||
}
|
||||
|
||||
m.mode = modeDashboard
|
||||
m.scheduleLoading = true
|
||||
return m, assignScheduleCmd(m.client, user.ID, dates,
|
||||
// Nobody else loses anything, but the server rejects any date that
|
||||
// already exists — including days this same person already holds, which
|
||||
// is a no-op worth letting through silently.
|
||||
return m, assignScheduleCmd(m.client, user.ID, dates, m.scheduleOccupied(dates),
|
||||
m.scheduleWindow, m.scheduleWindow.AddDate(0, 0, 6))
|
||||
}
|
||||
|
||||
return m, nil
|
||||
}
|
||||
|
||||
// scheduleConflicts reports which of dates are already held by somebody other
|
||||
// than newUserID, and the distinct names holding them.
|
||||
//
|
||||
// Days the target already owns are not conflicts — reassigning somebody to
|
||||
// their own shift takes nothing from anyone, and prompting for it would be
|
||||
// noise. The server still needs replace for those, since it rejects any date
|
||||
// that exists.
|
||||
func (m Model) scheduleConflicts(dates []string, newUserID int64) (taken, holders []string) {
|
||||
held := make(map[string]api.ScheduleEntry, len(m.scheduleDays))
|
||||
for _, d := range m.scheduleDays {
|
||||
if d.entry != nil {
|
||||
held[d.entry.Date] = *d.entry
|
||||
}
|
||||
}
|
||||
seen := make(map[string]bool)
|
||||
for _, date := range dates {
|
||||
e, ok := held[date]
|
||||
if !ok || e.UserID == newUserID {
|
||||
continue
|
||||
}
|
||||
taken = append(taken, date)
|
||||
if !seen[e.Username] {
|
||||
seen[e.Username] = true
|
||||
holders = append(holders, e.Username)
|
||||
}
|
||||
}
|
||||
return taken, holders
|
||||
}
|
||||
|
||||
// scheduleOccupied reports whether any of dates already has an entry at all,
|
||||
// including one belonging to the incoming user. That is what decides whether
|
||||
// the request needs replace, as opposed to whether it needs confirming.
|
||||
func (m Model) scheduleOccupied(dates []string) bool {
|
||||
held := make(map[string]bool, len(m.scheduleDays))
|
||||
for _, d := range m.scheduleDays {
|
||||
if d.entry != nil {
|
||||
held[d.entry.Date] = true
|
||||
}
|
||||
}
|
||||
for _, date := range dates {
|
||||
if held[date] {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// ── User management ───────────────────────────────────────────────────────────
|
||||
|
||||
func (m Model) handleUserCreateKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
@@ -916,6 +1022,28 @@ func (m Model) handleUserCreateKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
return m, nil
|
||||
}
|
||||
|
||||
// handleUserNotifyEditKey edits one user's ntfy topic.
|
||||
//
|
||||
// Unlike the other forms here, an empty value is not a mistake to reject: it is
|
||||
// how a topic is cleared, which the server accepts and treats as NULL.
|
||||
func (m Model) handleUserNotifyEditKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
switch msg.String() {
|
||||
case "esc":
|
||||
m.ntfyTopicInput.Blur()
|
||||
m.mode = modeDashboard
|
||||
return m, nil
|
||||
|
||||
case "enter":
|
||||
topic := strings.TrimSpace(m.ntfyTopicInput.Value())
|
||||
m.ntfyTopicInput.Blur()
|
||||
m.mode = modeDashboard
|
||||
m.usersLoading = true
|
||||
return m, setUserNotifyTargetCmd(m.client, m.selectedUser.ID, topic)
|
||||
}
|
||||
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (m Model) handleAPIKeyMenuKey(msg tea.KeyMsg) (Model, tea.Cmd) {
|
||||
switch msg.String() {
|
||||
case "esc":
|
||||
|
||||
+187
-1
@@ -6,7 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/yeniklas/terdut-tui/internal/api"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/api"
|
||||
)
|
||||
|
||||
// press sends one key and returns the resulting model and command. A nil command
|
||||
@@ -309,6 +309,192 @@ func TestDeleteNote_ConfirmsThenActs(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// ── Schedule reassignment ─────────────────────────────────────────────────
|
||||
|
||||
// pickingOnCall opens the user picker for the schedule day at dayIndex, which
|
||||
// is where a reassignment actually starts.
|
||||
func pickingOnCall(entries []api.ScheduleEntry, dayIndex int, week bool) Model {
|
||||
m := scheduledWeek(entries)
|
||||
m.users = []api.User{
|
||||
{ID: 1, Username: "niklas", Email: "n@example.com"},
|
||||
{ID: 2, Username: "alex", Email: "a@example.com"},
|
||||
}
|
||||
m.rebuildUserPickerTable()
|
||||
m.scheduleTable.SetCursor(dayIndex)
|
||||
m.pickerAssignWeek = week
|
||||
m.pickerTarget = pickerSchedule
|
||||
m.mode = modeUserPicker
|
||||
m.userPickerTable.SetCursor(1) // alex
|
||||
return m
|
||||
}
|
||||
|
||||
// The bug: a day somebody already holds could not be handed to anybody else.
|
||||
// The server refuses it, so the TUI has to ask first and then say so.
|
||||
func TestSchedule_ReassigningATakenDayAsksFirst(t *testing.T) {
|
||||
m := pickingOnCall([]api.ScheduleEntry{
|
||||
{ID: 1, Date: "2026-07-27", UserID: 1, Username: "niklas"},
|
||||
}, 0, false)
|
||||
|
||||
m, cmd := press(t, m, "enter")
|
||||
|
||||
if m.mode != modeConfirm || m.confirmTarget != confirmReassignSchedule {
|
||||
t.Fatalf("expected a reassignment confirmation, got mode %v target %v",
|
||||
m.mode, m.confirmTarget)
|
||||
}
|
||||
if cmd != nil {
|
||||
t.Error("expected nothing sent to the server before confirming")
|
||||
}
|
||||
mustContain(t, m.confirmPrompt(), "This day is assigned to niklas", "Reassign to alex?")
|
||||
}
|
||||
|
||||
func TestSchedule_ReassignConfirmedSends(t *testing.T) {
|
||||
m := pickingOnCall([]api.ScheduleEntry{
|
||||
{ID: 1, Date: "2026-07-27", UserID: 1, Username: "niklas"},
|
||||
}, 0, false)
|
||||
m, _ = press(t, m, "enter")
|
||||
|
||||
m, cmd := press(t, m, "y")
|
||||
if cmd == nil {
|
||||
t.Fatal("expected the confirmed reassignment to be sent")
|
||||
}
|
||||
if m.mode != modeDashboard {
|
||||
t.Errorf("expected a return to the dashboard, got mode %v", m.mode)
|
||||
}
|
||||
if m.pendingAssign != nil {
|
||||
t.Error("expected the pending assignment cleared")
|
||||
}
|
||||
}
|
||||
|
||||
// Declining must leave the rota alone — that is the whole point of the guard.
|
||||
func TestSchedule_ReassignDeclinedSendsNothing(t *testing.T) {
|
||||
m := pickingOnCall([]api.ScheduleEntry{
|
||||
{ID: 1, Date: "2026-07-27", UserID: 1, Username: "niklas"},
|
||||
}, 0, false)
|
||||
m, _ = press(t, m, "enter")
|
||||
|
||||
m, cmd := press(t, m, "n")
|
||||
if cmd != nil {
|
||||
t.Error("expected nothing sent when the reassignment is declined")
|
||||
}
|
||||
if m.pendingAssign != nil {
|
||||
t.Error("expected the pending assignment discarded")
|
||||
}
|
||||
}
|
||||
|
||||
// A free day is the path that always worked, and must not grow a prompt.
|
||||
func TestSchedule_AssigningAFreeDayDoesNotAsk(t *testing.T) {
|
||||
m := pickingOnCall(nil, 0, false)
|
||||
|
||||
m, cmd := press(t, m, "enter")
|
||||
if m.mode != modeDashboard {
|
||||
t.Errorf("expected no prompt for a free day, got mode %v", m.mode)
|
||||
}
|
||||
if cmd == nil {
|
||||
t.Error("expected the assignment to be sent straight away")
|
||||
}
|
||||
}
|
||||
|
||||
// The week case is the one that was worst: a single taken day rejected all
|
||||
// seven. One prompt now covers the lot, and it says how much is being taken.
|
||||
func TestSchedule_ReassigningAPartlyTakenWeekAsksOnce(t *testing.T) {
|
||||
m := pickingOnCall([]api.ScheduleEntry{
|
||||
{ID: 1, Date: "2026-07-28", UserID: 1, Username: "niklas"},
|
||||
{ID: 2, Date: "2026-07-30", UserID: 3, Username: "sam"},
|
||||
}, 0, true)
|
||||
|
||||
m, _ = press(t, m, "enter")
|
||||
if m.confirmTarget != confirmReassignSchedule {
|
||||
t.Fatalf("expected one confirmation for the week, got target %v", m.confirmTarget)
|
||||
}
|
||||
if got := len(m.pendingAssign.dates); got != 7 {
|
||||
t.Errorf("expected all 7 days in the assignment, got %d", got)
|
||||
}
|
||||
mustContain(t, m.confirmPrompt(), "2 of 7 days are assigned to niklas and sam")
|
||||
}
|
||||
|
||||
// ── Ntfy topic ────────────────────────────────────────────────────────────
|
||||
|
||||
// onUsers puts the model in the Users section with a loaded table.
|
||||
func onUsers(users []api.User) Model {
|
||||
m := sized()
|
||||
m.activeSection = sectionUsers
|
||||
m.users = users
|
||||
m.rebuildUserManageTable()
|
||||
return m
|
||||
}
|
||||
|
||||
func userFixtures() []api.User {
|
||||
topic := "terdut-niklas"
|
||||
return []api.User{
|
||||
{ID: 1, Username: "niklas", Email: "niklas@example.com", NtfyTopic: &topic},
|
||||
{ID: 2, Username: "alex", Email: "alex@example.com"},
|
||||
}
|
||||
}
|
||||
|
||||
func TestNotifyTopic_EditPrefillsTheCurrentTopic(t *testing.T) {
|
||||
m, _ := press(t, onUsers(userFixtures()), "t")
|
||||
|
||||
if m.mode != modeUserNotifyEdit {
|
||||
t.Fatalf("expected the topic editor, got mode %v", m.mode)
|
||||
}
|
||||
if m.selectedUser.ID != 1 {
|
||||
t.Errorf("expected the user under the cursor, got %d", m.selectedUser.ID)
|
||||
}
|
||||
// Prefilled, so editing a topic does not mean retyping it from scratch.
|
||||
if got := m.ntfyTopicInput.Value(); got != "terdut-niklas" {
|
||||
t.Errorf("expected the current topic prefilled, got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
// A user with no topic opens an empty field rather than the previous user's.
|
||||
func TestNotifyTopic_EditStartsEmptyWhenUnset(t *testing.T) {
|
||||
m := onUsers(userFixtures())
|
||||
m, _ = press(t, m, "t")
|
||||
m, _ = press(t, m, "esc")
|
||||
m.userManageTable.SetCursor(1)
|
||||
|
||||
m, _ = press(t, m, "t")
|
||||
if got := m.ntfyTopicInput.Value(); got != "" {
|
||||
t.Errorf("expected an empty field for a user with no topic, got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNotifyTopic_EscapeAbandonsWithoutSaving(t *testing.T) {
|
||||
m, _ := press(t, onUsers(userFixtures()), "t")
|
||||
m, cmd := press(t, m, "esc")
|
||||
|
||||
if cmd != nil {
|
||||
t.Error("expected escape to save nothing")
|
||||
}
|
||||
if m.mode != modeDashboard {
|
||||
t.Errorf("expected a return to the dashboard, got mode %v", m.mode)
|
||||
}
|
||||
}
|
||||
|
||||
// Clearing a topic is a real action, not a no-op: it is how a user is taken off
|
||||
// their own topic and back onto the shared fallback. Contrast the snooze prompt,
|
||||
// where an empty value means "I changed my mind".
|
||||
func TestNotifyTopic_EmptyInputStillSubmits(t *testing.T) {
|
||||
m, _ := press(t, onUsers(userFixtures()), "t")
|
||||
m.ntfyTopicInput.SetValue("")
|
||||
|
||||
m, cmd := press(t, m, "enter")
|
||||
if cmd == nil {
|
||||
t.Fatal("expected clearing the topic to call the server")
|
||||
}
|
||||
if m.mode != modeDashboard {
|
||||
t.Errorf("expected a return to the dashboard, got mode %v", m.mode)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNotifyTopic_IsUsersSectionOnly(t *testing.T) {
|
||||
m := sized()
|
||||
m.activeSection = sectionIncidents
|
||||
if next, cmd := press(t, m, "t"); cmd != nil || next.mode != modeDashboard {
|
||||
t.Error("expected t to do nothing outside the Users section")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTab_CyclesEverySection(t *testing.T) {
|
||||
m := sized()
|
||||
if m.activeSection != sectionIncidents {
|
||||
|
||||
+88
-4
@@ -7,7 +7,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/yeniklas/terdut-tui/internal/api"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/api"
|
||||
)
|
||||
|
||||
// Order must match the section constants — renderTabs indexes this by ordinal.
|
||||
@@ -73,6 +73,8 @@ func (m Model) renderBody() string {
|
||||
return m.renderUserPicker()
|
||||
case modeUserCreate:
|
||||
return m.renderUserCreate()
|
||||
case modeUserNotifyEdit:
|
||||
return m.renderUserNotifyEdit()
|
||||
case modeAPIKeyMenu:
|
||||
return m.renderAPIKeyMenu()
|
||||
case modeAPIKeyCreate:
|
||||
@@ -127,6 +129,9 @@ func (m Model) renderFooter() string {
|
||||
case modeUserCreate:
|
||||
return withStatus(" tab·next field enter·create esc·cancel")
|
||||
|
||||
case modeUserNotifyEdit:
|
||||
return withStatus(" enter·save esc·cancel (empty clears the topic)")
|
||||
|
||||
case modeAPIKeyMenu:
|
||||
return withStatus(" n·new key r·revoke by ID esc·back")
|
||||
|
||||
@@ -152,7 +157,7 @@ func (m Model) renderFooter() string {
|
||||
case sectionSchedule:
|
||||
return withStatus(" +·assign day W·assign week d·del ←/→·shift week tab·section r·refresh q·quit")
|
||||
case sectionUsers:
|
||||
return withStatus(" n·new user d·delete k·API keys r·refresh tab·section q·quit")
|
||||
return withStatus(" n·new user t·topic d·delete k·API keys r·refresh tab·section q·quit")
|
||||
}
|
||||
return "\n" + styleFooter.Render(m.help.ShortHelpView(m.keys.ShortHelp()))
|
||||
}
|
||||
@@ -173,10 +178,44 @@ func (m Model) confirmPrompt() string {
|
||||
return "Delete schedule entry? [y/N]"
|
||||
case confirmDeleteUser:
|
||||
return fmt.Sprintf("Delete user %s (cascades all API keys)? [y/N]", m.selectedUser.Username)
|
||||
case confirmReassignSchedule:
|
||||
if p := m.pendingAssign; p != nil {
|
||||
return fmt.Sprintf("%s assigned to %s. Reassign to %s? [y/N]",
|
||||
dayCount(len(p.taken), len(p.dates)), joinNames(p.holders), p.username)
|
||||
}
|
||||
return "Reassign these days? [y/N]"
|
||||
}
|
||||
return "Are you sure? [y/N]"
|
||||
}
|
||||
|
||||
// dayCount phrases how much of an assignment is being taken from somebody. A
|
||||
// single day says so plainly; a partial week says which part, because "3 of 7"
|
||||
// is the difference between taking a shift and taking somebody's whole week.
|
||||
func dayCount(taken, total int) string {
|
||||
switch {
|
||||
case total == 1:
|
||||
return "This day is"
|
||||
case taken == total:
|
||||
return fmt.Sprintf("All %d days are", total)
|
||||
default:
|
||||
return fmt.Sprintf("%d of %d days are", taken, total)
|
||||
}
|
||||
}
|
||||
|
||||
// joinNames renders a list of people as prose.
|
||||
func joinNames(names []string) string {
|
||||
switch len(names) {
|
||||
case 0:
|
||||
return "somebody else"
|
||||
case 1:
|
||||
return names[0]
|
||||
case 2:
|
||||
return names[0] + " and " + names[1]
|
||||
default:
|
||||
return strings.Join(names[:len(names)-1], ", ") + " and " + names[len(names)-1]
|
||||
}
|
||||
}
|
||||
|
||||
// ── Dashboard ──────────────────────────────────────────────────────────────
|
||||
|
||||
func (m Model) renderDashboard() string {
|
||||
@@ -550,6 +589,15 @@ func eventLabel(e api.IncidentEvent) string {
|
||||
return " Resolved by " + who
|
||||
}
|
||||
return " Resolved (all alerts stopped firing)"
|
||||
case api.EventNotified:
|
||||
// An empty username here is not "the server acted": it means the page
|
||||
// went to the shared fallback topic, so it belongs to nobody.
|
||||
return fmt.Sprintf(" Notified %s%s", notifiedTarget(who), notifyKind(e.Detail))
|
||||
case api.EventNotifyFailed:
|
||||
// The detail is "<kind>: <reason>", and the reason is the point — it is
|
||||
// the only thing that says why nobody's phone rang.
|
||||
return truncate(fmt.Sprintf(" Notification to %s failed · %s",
|
||||
notifiedTarget(who), e.Detail), 52)
|
||||
default:
|
||||
label := " " + e.Type
|
||||
if e.Detail != "" {
|
||||
@@ -559,6 +607,25 @@ func eventLabel(e api.IncidentEvent) string {
|
||||
}
|
||||
}
|
||||
|
||||
// notifiedTarget names who a page reached. The server attaches no user when it
|
||||
// published to the shared fallback topic, and saying so is the difference
|
||||
// between "somebody was paged" and "the on-call rota was empty".
|
||||
func notifiedTarget(username string) string {
|
||||
if username == "" {
|
||||
return "the fallback topic"
|
||||
}
|
||||
return username
|
||||
}
|
||||
|
||||
// notifyKind renders the notification kind the server puts in Detail. It is an
|
||||
// open set, so anything unrecognised is shown rather than dropped.
|
||||
func notifyKind(detail string) string {
|
||||
if detail == "" {
|
||||
return ""
|
||||
}
|
||||
return " (" + detail + ")"
|
||||
}
|
||||
|
||||
func buildAlertDetailContent(alert api.Alert, width int) string {
|
||||
now := time.Now()
|
||||
var b strings.Builder
|
||||
@@ -733,6 +800,16 @@ func (m Model) renderUserCreate() string {
|
||||
emailLabel + m.userFormInputs[1].View() + "\n"
|
||||
}
|
||||
|
||||
func (m Model) renderUserNotifyEdit() string {
|
||||
header := fmt.Sprintf("\n Push notifications for %s\n", styleBold.Render(m.selectedUser.Username))
|
||||
hint := line(styleMuted,
|
||||
" The ntfy topic this user's pages go to. Leave it empty to clear it —\n"+
|
||||
" their incidents then page the server's shared fallback topic, which\n"+
|
||||
" carries no Acknowledge button.")
|
||||
label := styleSelected.Render(" Topic: ")
|
||||
return header + "\n" + hint + "\n" + label + m.ntfyTopicInput.View() + "\n"
|
||||
}
|
||||
|
||||
func (m Model) renderAPIKeyMenu() string {
|
||||
header := fmt.Sprintf("\n API keys for %s\n", styleBold.Render(m.selectedUser.Username))
|
||||
warning := line(styleMuted, " Keys cannot be listed — only new keys can be created,\n or existing ones revoked by their integer ID.")
|
||||
@@ -808,12 +885,19 @@ func renderBarWidth(count, maxCount, maxWidth int) int {
|
||||
return w
|
||||
}
|
||||
|
||||
// truncate shortens s to max terminal cells, marking the cut with an ellipsis.
|
||||
//
|
||||
// Counted in runes rather than bytes: these strings are laid out against
|
||||
// fixed-width columns, and a byte cut through a multi-byte rune would both
|
||||
// mis-measure the column and emit a broken character. Server-supplied text —
|
||||
// labels, annotations, delivery errors — is not guaranteed to be ASCII.
|
||||
func truncate(s string, max int) string {
|
||||
if max < 1 {
|
||||
return ""
|
||||
}
|
||||
if len(s) <= max {
|
||||
r := []rune(s)
|
||||
if len(r) <= max {
|
||||
return s
|
||||
}
|
||||
return s[:max-1] + "…"
|
||||
return string(r[:max-1]) + "…"
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"time"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/yeniklas/terdut-tui/internal/api"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/api"
|
||||
)
|
||||
|
||||
// ansi matches the escape sequences lipgloss emits when it decides the output
|
||||
@@ -175,6 +175,18 @@ func TestEventLabel_KnownTypes(t *testing.T) {
|
||||
{api.IncidentEvent{Type: api.EventResolved, Username: "bo"}, "Resolved by bo"},
|
||||
// No user means the server closed it via the alert cascade.
|
||||
{api.IncidentEvent{Type: api.EventResolved}, "all alerts stopped firing"},
|
||||
{api.IncidentEvent{Type: api.EventNotified, Username: "bo", Detail: "triggered"},
|
||||
"Notified bo (triggered)"},
|
||||
{api.IncidentEvent{Type: api.EventNotified, Username: "bo", Detail: "reminder"},
|
||||
"Notified bo (reminder)"},
|
||||
// On a notification, no user means the shared fallback topic — not that
|
||||
// the server acted on its own.
|
||||
{api.IncidentEvent{Type: api.EventNotified, Detail: "triggered"},
|
||||
"Notified the fallback topic (triggered)"},
|
||||
{api.IncidentEvent{Type: api.EventNotifyFailed, Username: "bo", Detail: "triggered: ntfy returned 502"},
|
||||
"Notification to bo failed"},
|
||||
{api.IncidentEvent{Type: api.EventNotifyFailed, Detail: "triggered: no route to host"},
|
||||
"Notification to the fallback topic failed"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.event.Type, func(t *testing.T) {
|
||||
@@ -183,6 +195,32 @@ func TestEventLabel_KnownTypes(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// The timeline is where a page that never landed becomes visible, so both
|
||||
// outcomes have to survive into the rendered pane.
|
||||
func TestIncidentDetail_RendersNotifications(t *testing.T) {
|
||||
now := time.Now()
|
||||
inc := api.Incident{ID: 1, Title: "DiskFull", Status: api.StatusTriggered, TriggeredAt: now}
|
||||
timeline := []api.IncidentEvent{
|
||||
{Type: api.EventTriggered, CreatedAt: now},
|
||||
{Type: api.EventNotified, Username: "niklas", Detail: "triggered", CreatedAt: now},
|
||||
{Type: api.EventNotifyFailed, Username: "niklas",
|
||||
Detail: "reminder: ntfy returned 502", CreatedAt: now},
|
||||
}
|
||||
|
||||
got := buildIncidentDetailContent(inc, timeline, -1, 120)
|
||||
mustContain(t, got, "Notified niklas (triggered)", "Notification to niklas failed")
|
||||
}
|
||||
|
||||
func TestUserNotifyEdit_SaysWhatAnEmptyValueDoes(t *testing.T) {
|
||||
m := sized()
|
||||
m.mode = modeUserNotifyEdit
|
||||
m.selectedUser = api.User{ID: 1, Username: "niklas"}
|
||||
|
||||
mustContain(t, m.View(), "niklas", "empty to clear it", "fallback topic")
|
||||
// The footer has to repeat it: that is where the reader looks for what a key does.
|
||||
mustContain(t, m.renderFooter(), "empty clears the topic")
|
||||
}
|
||||
|
||||
func TestAlertDetail_SaysItIsReadOnlyAndLinksTheIncident(t *testing.T) {
|
||||
now := time.Now()
|
||||
id := int64(7)
|
||||
|
||||
@@ -12,7 +12,14 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
const releaseAPI = "https://api.github.com/repos/yeniklas/terdut-tui/releases/latest"
|
||||
// Gitea's release payload carries the same tag_name, and its attachments the same name
|
||||
// and browser_download_url, so the types below are unchanged from the GitHub original.
|
||||
//
|
||||
// A binary installed before the move still polls api.github.com and will never see a
|
||||
// release published here. That GitHub repository is still in place, so such a build
|
||||
// reports itself up to date rather than erroring -- its last GitHub release is the
|
||||
// bridge, and crossing it is a one-time manual download.
|
||||
const releaseAPI = "https://git.ryuvia.com/api/v1/repos/niklas/terdut-tui/releases/latest"
|
||||
|
||||
type release struct {
|
||||
TagName string `json:"tag_name"`
|
||||
@@ -125,7 +132,7 @@ func fetchLatest() (*release, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Accept", "application/vnd.github+json")
|
||||
req.Header.Set("Accept", "application/json")
|
||||
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
if err != nil {
|
||||
@@ -134,7 +141,7 @@ func fetchLatest() (*release, error) {
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return nil, fmt.Errorf("GitHub API returned %s", resp.Status)
|
||||
return nil, fmt.Errorf("Gitea API returned %s", resp.Status)
|
||||
}
|
||||
|
||||
var rel release
|
||||
|
||||
@@ -6,10 +6,10 @@ import (
|
||||
"os"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/yeniklas/terdut-tui/internal/api"
|
||||
"github.com/yeniklas/terdut-tui/internal/config"
|
||||
"github.com/yeniklas/terdut-tui/internal/tui"
|
||||
"github.com/yeniklas/terdut-tui/internal/updater"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/api"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/config"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/tui"
|
||||
"git.ryuvia.com/niklas/terdut-tui/internal/updater"
|
||||
)
|
||||
|
||||
var version = "dev"
|
||||
|
||||
Reference in New Issue
Block a user