feat(webui): implement state versions list

This commit is contained in:
Julien Dessaux 2025-01-27 22:00:51 +01:00
parent 80958d5b0f
commit 26e10a9399
Signed by: adyxax
GPG key ID: F92E51B86E07177E
12 changed files with 195 additions and 10 deletions

View file

@ -47,6 +47,31 @@ func (db *DB) InitAdminAccount() error {
}) })
} }
func (db *DB) LoadAccountUsernames() (map[int]string, error) {
rows, err := db.Query(
`SELECT id, username FROM accounts;`)
if err != nil {
return nil, fmt.Errorf("failed to load accounts from database: %w", err)
}
defer rows.Close()
accounts := make(map[int]string)
for rows.Next() {
var (
id int
username string
)
err = rows.Scan(&id, &username)
if err != nil {
return nil, fmt.Errorf("failed to load account from row: %w", err)
}
accounts[id] = username
}
if err := rows.Err(); err != nil {
return nil, fmt.Errorf("failed to load accounts from rows: %w", err)
}
return accounts, nil
}
func (db *DB) LoadAccountById(id int) (*model.Account, error) { func (db *DB) LoadAccountById(id int) (*model.Account, error) {
account := model.Account{ account := model.Account{
Id: id, Id: id,

View file

@ -45,7 +45,29 @@ func (db *DB) GetState(path string) ([]byte, error) {
return db.dataEncryptionKey.DecryptAES256(encryptedData) return db.dataEncryptionKey.DecryptAES256(encryptedData)
} }
func (db *DB) LoadStatesByPath() ([]model.State, error) { func (db *DB) LoadStateById(stateId int) (*model.State, error) {
state := model.State{
Id: stateId,
}
var (
created int64
updated int64
)
err := db.QueryRow(
`SELECT created, lock, path, updated FROM states WHERE id = ?;`,
stateId).Scan(&created, &state.Lock, &state.Path, &updated)
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
return nil, fmt.Errorf("failed to load state id %s from database: %w", stateId, err)
}
state.Created = time.Unix(created, 0)
state.Updated = time.Unix(updated, 0)
return &state, nil
}
func (db *DB) LoadStates() ([]model.State, error) {
rows, err := db.Query( rows, err := db.Query(
`SELECT created, id, lock, path, updated FROM states;`) `SELECT created, id, lock, path, updated FROM states;`)
if err != nil { if err != nil {
@ -61,7 +83,7 @@ func (db *DB) LoadStatesByPath() ([]model.State, error) {
) )
err = rows.Scan(&created, &state.Id, &state.Lock, &state.Path, &updated) err = rows.Scan(&created, &state.Id, &state.Lock, &state.Path, &updated)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to load states from row: %w", err) return nil, fmt.Errorf("failed to load state from row: %w", err)
} }
state.Created = time.Unix(created, 0) state.Created = time.Unix(created, 0)
state.Updated = time.Unix(updated, 0) state.Updated = time.Unix(updated, 0)

35
pkg/database/versions.go Normal file
View file

@ -0,0 +1,35 @@
package database
import (
"fmt"
"time"
"git.adyxax.org/adyxax/tfstated/pkg/model"
)
func (db *DB) LoadVersionsByState(state *model.State) ([]model.Version, error) {
rows, err := db.Query(
`SELECT account_id, created, data, id, lock
FROM versions
WHERE state_id = ?
ORDER BY id DESC;`, state.Id)
if err != nil {
return nil, fmt.Errorf("failed to load versions from database: %w", err)
}
defer rows.Close()
versions := make([]model.Version, 0)
for rows.Next() {
var version model.Version
var created int64
err = rows.Scan(&version.AccountId, &created, &version.Data, &version.Id, &version.Lock)
if err != nil {
return nil, fmt.Errorf("failed to load version from row: %w", err)
}
version.Created = time.Unix(created, 0)
versions = append(versions, version)
}
if err := rows.Err(); err != nil {
return nil, fmt.Errorf("failed to load versions from rows: %w", err)
}
return versions, nil
}

14
pkg/model/version.go Normal file
View file

@ -0,0 +1,14 @@
package model
import (
"time"
)
type Version struct {
AccountId int
Created time.Time
Data []byte
Id int
Lock *string
StateId int
}

View file

@ -12,11 +12,10 @@
<span>Login</span> <span>Login</span>
</a> </a>
{{ else }} {{ else }}
<a href="/states"{{ if eq .Page.Section "states" }} class="active"{{ end}}> <a href="/states"{{ if eq .Page.Section "states" }} class="fill"{{ end}}>
<i>home_storage</i> <i>home_storage</i>
<span>States</span> <span>States</span>
</a> </a>
<hr>
<a href="/logout"> <a href="/logout">
<i>logout</i> <i>logout</i>
<span>Logout</span> <span>Logout</span>
@ -39,6 +38,11 @@
<nav class="bottom s">{{ template "nav" . }}</nav> <nav class="bottom s">{{ template "nav" . }}</nav>
<header> <header>
<nav> <nav>
{{ if ne .Page.Precedent "" }}
<a href="{{ .Page.Precedent }}" class="button circle chip">
<i>arrow_back</i>
</a>
{{ end }}
<h5 class="max center-align">{{ .Page.Title }}</h5> <h5 class="max center-align">{{ .Page.Title }}</h5>
</nav> </nav>
</header> </header>

30
pkg/webui/html/state.html Normal file
View file

@ -0,0 +1,30 @@
{{ define "main" }}
<main class="responsive" id="main">
<p>
Locked:
{{ if eq .State.Lock nil }}no{{ else }}
<span>yes</span>
<div class="tooltip left max">
<b>Lock</b>
<p>{{ .State.Lock }}</p>
</div>
{{ end }}
</p>
<table class="clickable-rows no-space">
<thead>
<tr>
<th>By</th>
<th>Created</th>
</tr>
</thead>
<tbody>
{{ range .Versions }}
<tr>
<td><a href="/version/{{ .Id }}">{{ index $.Usernames .AccountId }}</a></td>
<td><a href="/version/{{ .Id }}">{{ .Created }}</a></td>
</tr>
{{ end }}
</tbody>
</table>
</main>
{{ end }}

View file

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<main class="responsive" id="main"> <main class="responsive" id="main">
<table class="clickable-rows no-space stripes"> <table class="clickable-rows no-space">
<thead> <thead>
<tr> <tr>
<th>Path</th> <th>Path</th>

View file

@ -6,8 +6,9 @@ import (
) )
type Page struct { type Page struct {
Section string Precedent string
Title string Section string
Title string
} }
func handleIndexGET() http.Handler { func handleIndexGET() http.Handler {

View file

@ -17,6 +17,7 @@ func addRoutes(
mux.Handle("POST /login", requireSession(handleLoginPOST(db))) mux.Handle("POST /login", requireSession(handleLoginPOST(db)))
mux.Handle("GET /logout", requireLogin(handleLogoutGET(db))) mux.Handle("GET /logout", requireLogin(handleLogoutGET(db)))
mux.Handle("GET /states", requireLogin(handleStatesGET(db))) mux.Handle("GET /states", requireLogin(handleStatesGET(db)))
mux.Handle("GET /state/{id}", requireLogin(handleStateGET(db)))
mux.Handle("GET /static/", cache(http.FileServer(http.FS(staticFS)))) mux.Handle("GET /static/", cache(http.FileServer(http.FS(staticFS))))
mux.Handle("GET /", requireLogin(handleIndexGET())) mux.Handle("GET /", requireLogin(handleIndexGET()))
} }

54
pkg/webui/state.go Normal file
View file

@ -0,0 +1,54 @@
package webui
import (
"html/template"
"net/http"
"strconv"
"git.adyxax.org/adyxax/tfstated/pkg/database"
"git.adyxax.org/adyxax/tfstated/pkg/model"
)
var stateTemplate = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/state.html"))
func handleStateGET(db *database.DB) http.Handler {
type StatesData struct {
Page
State *model.State
Usernames map[int]string
Versions []model.Version
}
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
stateIdStr := r.PathValue("id")
stateId, err := strconv.Atoi(stateIdStr)
if err != nil {
errorResponse(w, http.StatusBadRequest, err)
return
}
state, err := db.LoadStateById(stateId)
if err != nil {
errorResponse(w, http.StatusInternalServerError, err)
return
}
versions, err := db.LoadVersionsByState(state)
if err != nil {
errorResponse(w, http.StatusInternalServerError, err)
return
}
usernames, err := db.LoadAccountUsernames()
if err != nil {
errorResponse(w, http.StatusInternalServerError, err)
return
}
render(w, stateTemplate, http.StatusOK, StatesData{
Page: Page{
Precedent: "/states",
Section: "states",
Title: state.Path,
},
State: state,
Usernames: usernames,
Versions: versions,
})
})
}

View file

@ -16,7 +16,7 @@ func handleStatesGET(db *database.DB) http.Handler {
States []model.State States []model.State
} }
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
states, err := db.LoadStatesByPath() states, err := db.LoadStates()
if err != nil { if err != nil {
errorResponse(w, http.StatusInternalServerError, err) errorResponse(w, http.StatusInternalServerError, err)
return return

View file

@ -1,6 +1,5 @@
.clickable-rows tbody a { table tbody a {
display: block; display: block;
padding: 0 1em 0;
text-decoration: none; text-decoration: none;
transition: all 0.25s ease-out; transition: all 0.25s ease-out;
} }