chore(webui): refactored state creation page and route
This commit is contained in:
parent
ee4df34e1a
commit
169e2d0d9d
GPG key ID:
F92E51B86E07177E
7 changed files with 141 additions and 159 deletions
|
|
@ -104,7 +104,10 @@ func (db *DB) Close() error {
|
|||
_ = db.writeDB.Close()
|
||||
return fmt.Errorf("failed to close read database connection: %w", err)
|
||||
}
|
||||
return db.writeDB.Close()
|
||||
if err := db.writeDB.Close(); err != nil {
|
||||
return fmt.Errorf("failed to close write database connection: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) Exec(query string, args ...any) (sql.Result, error) {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<main class="responsive">
|
||||
<form action="/login" method="post">
|
||||
<fieldset>
|
||||
<div class="field border label{{ if .Forbidden }} invalid{{ end}}">
|
||||
<div class="field border label{{ if .Forbidden }} invalid{{ end }}">
|
||||
<input autofocus
|
||||
id="username"
|
||||
name="username"
|
||||
|
|
|
|||
|
|
@ -1,38 +1,71 @@
|
|||
{{ define "main" }}
|
||||
<main class="responsive" id="main">
|
||||
<a href="/states/new">
|
||||
<button class="small-round">
|
||||
<i>add</i>
|
||||
<span>New</span>
|
||||
</button>
|
||||
</a>
|
||||
<table class="clickable-rows no-space">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Path</th>
|
||||
<th>Updated</th>
|
||||
<th>Locked</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{ range .States }}
|
||||
<tr>
|
||||
<td><a href="/state/{{ .Id }}">{{ .Path }}</a></td>
|
||||
<td><a href="/state/{{ .Id }}">{{ .Updated }}</a></td>
|
||||
<td>
|
||||
<a href="/state/{{ .Id }}">
|
||||
{{ if eq .Lock nil }}no{{ else }}
|
||||
<span>yes</span>
|
||||
<div class="tooltip left max">
|
||||
<b>Lock</b>
|
||||
<p>{{ .Lock }}</p>
|
||||
</div>
|
||||
<div>
|
||||
<div class="tabs">
|
||||
<a data-ui="#explorer"{{ if eq .ActiveTab 0 }} class="active"{{ end }}>States</a>
|
||||
<a data-ui="#new"{{ if eq .ActiveTab 1 }} class="active"{{ end }}>Create New State</a>
|
||||
</div>
|
||||
<div id="explorer" class="page padding{{ if eq .ActiveTab 0 }} active{{ end }}">
|
||||
<table class="clickable-rows no-space">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Path</th>
|
||||
<th>Updated</th>
|
||||
<th>Locked</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{ range .States }}
|
||||
<tr>
|
||||
<td><a href="/state/{{ .Id }}">{{ .Path }}</a></td>
|
||||
<td><a href="/state/{{ .Id }}">{{ .Updated }}</a></td>
|
||||
<td>
|
||||
<a href="/state/{{ .Id }}">
|
||||
{{ if eq .Lock nil }}no{{ else }}
|
||||
<span>yes</span>
|
||||
<div class="tooltip left max">
|
||||
<b>Lock</b>
|
||||
<p>{{ .Lock }}</p>
|
||||
</div>
|
||||
{{ end }}
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div id="new" class="page padding{{ if eq .ActiveTab 1 }} active{{ end }}">
|
||||
<form action="/states" enctype="multipart/form-data" method="post">
|
||||
<fieldset>
|
||||
<div class="field border label{{ if .PathError }} invalid{{ end }}">
|
||||
<input autofocus
|
||||
id="path"
|
||||
name="path"
|
||||
required
|
||||
type="text"
|
||||
value="{{ .Path }}">
|
||||
<label for="path">Path</label>
|
||||
{{ if .PathDuplicate }}
|
||||
<span class="error">This path already exist</span>
|
||||
{{ else if .PathError }}
|
||||
<span class="error">Invalid path</span>
|
||||
{{ else }}
|
||||
<span class="helper">Valid URL path beginning with a /</span>
|
||||
{{ end }}
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="field label border">
|
||||
<input name="file"
|
||||
required
|
||||
type="file">
|
||||
<input type="text">
|
||||
<label>File</label>
|
||||
<span class="helper">JSON state file</span>
|
||||
</div>
|
||||
<button class="small-round" type="submit" value="submit">New</button>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
{{ end }}
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
{{ define "main" }}
|
||||
<main class="responsive">
|
||||
<form action="/states/new" enctype="multipart/form-data" method="post">
|
||||
<fieldset>
|
||||
<div class="field border label{{ if .PathError }} invalid{{ end }}">
|
||||
<input autofocus
|
||||
id="path"
|
||||
name="path"
|
||||
required
|
||||
type="text"
|
||||
value="{{ .Path }}">
|
||||
<label for="path">Path</label>
|
||||
{{ if .PathDuplicate }}
|
||||
<span class="error">This path already exist</span>
|
||||
{{ else if .PathError }}
|
||||
<span class="error">Invalid path</span>
|
||||
{{ else }}
|
||||
<span class="helper">Valid URL path beginning with a /</span>
|
||||
{{ end }}
|
||||
</div>
|
||||
<div class="field label border">
|
||||
<input name="file"
|
||||
required
|
||||
type="file">
|
||||
<input type="text">
|
||||
<label>File</label>
|
||||
<span class="helper">JSON state file</span>
|
||||
</div>
|
||||
<button class="small-round" type="submit" value="submit">New</button>
|
||||
</fieldset>
|
||||
</form>
|
||||
</main>
|
||||
{{ end }}
|
||||
|
|
@ -19,8 +19,7 @@ func addRoutes(
|
|||
mux.Handle("GET /settings", requireLogin(handleSettingsGET(db)))
|
||||
mux.Handle("POST /settings", requireLogin(handleSettingsPOST(db)))
|
||||
mux.Handle("GET /states", requireLogin(handleStatesGET(db)))
|
||||
mux.Handle("GET /states/new", requireLogin(handleStatesNewGET(db)))
|
||||
mux.Handle("POST /states/new", requireLogin(handleStatesNewPOST(db)))
|
||||
mux.Handle("POST /states", requireLogin(handleStatesPOST(db)))
|
||||
mux.Handle("GET /state/{id}", requireLogin(handleStateGET(db)))
|
||||
mux.Handle("GET /static/", cache(http.FileServer(http.FS(staticFS))))
|
||||
mux.Handle("GET /version/{id}", requireLogin(handleVersionGET(db)))
|
||||
|
|
|
|||
|
|
@ -1,29 +1,93 @@
|
|||
package webui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"html/template"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"path"
|
||||
"strconv"
|
||||
|
||||
"git.adyxax.org/adyxax/tfstated/pkg/database"
|
||||
"git.adyxax.org/adyxax/tfstated/pkg/model"
|
||||
)
|
||||
|
||||
type StatesPage struct {
|
||||
ActiveTab int
|
||||
Page *Page
|
||||
Path string
|
||||
PathError bool
|
||||
PathDuplicate bool
|
||||
States []model.State
|
||||
}
|
||||
|
||||
var statesTemplates = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/states.html"))
|
||||
|
||||
func handleStatesGET(db *database.DB) http.Handler {
|
||||
type StatesData struct {
|
||||
Page *Page
|
||||
States []model.State
|
||||
}
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
states, err := db.LoadStates()
|
||||
if err != nil {
|
||||
errorResponse(w, http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
render(w, statesTemplates, http.StatusOK, StatesData{
|
||||
render(w, statesTemplates, http.StatusOK, StatesPage{
|
||||
Page: makePage(r, &Page{Title: "States", Section: "states"}),
|
||||
States: states,
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
func handleStatesPOST(db *database.DB) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
// file upload limit of 20MB
|
||||
if err := r.ParseMultipartForm(20 << 20); err != nil {
|
||||
errorResponse(w, http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
file, _, err := r.FormFile("file")
|
||||
if err != nil {
|
||||
errorResponse(w, http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
statePath := r.FormValue("path")
|
||||
parsedStatePath, err := url.Parse(statePath)
|
||||
if err != nil || path.Clean(parsedStatePath.Path) != statePath || statePath[0] != '/' {
|
||||
render(w, statesTemplates, http.StatusBadRequest, StatesPage{
|
||||
ActiveTab: 1,
|
||||
Page: makePage(r, &Page{Title: "New State", Section: "states"}),
|
||||
Path: statePath,
|
||||
PathError: true,
|
||||
})
|
||||
return
|
||||
}
|
||||
data, err := io.ReadAll(file)
|
||||
if err != nil {
|
||||
errorResponse(w, http.StatusBadRequest, fmt.Errorf("failed to read uploaded file: %w", err))
|
||||
return
|
||||
}
|
||||
fileType := http.DetectContentType(data)
|
||||
if fileType != "text/plain; charset=utf-8" {
|
||||
errorResponse(w, http.StatusBadRequest, fmt.Errorf("invalid file type: expected \"text/plain; charset=utf-8\" but got \"%s\"", fileType))
|
||||
return
|
||||
}
|
||||
account := r.Context().Value(model.AccountContextKey{}).(*model.Account)
|
||||
version, err := db.CreateState(statePath, account.Id, data)
|
||||
if err != nil {
|
||||
errorResponse(w, http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
if version == nil {
|
||||
render(w, statesTemplates, http.StatusBadRequest, StatesPage{
|
||||
ActiveTab: 1,
|
||||
Page: makePage(r, &Page{Title: "New State", Section: "states"}),
|
||||
Path: statePath,
|
||||
PathDuplicate: true,
|
||||
})
|
||||
return
|
||||
}
|
||||
destination := path.Join("/version", strconv.Itoa(version.Id))
|
||||
http.Redirect(w, r, destination, http.StatusFound)
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
package webui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"html/template"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"path"
|
||||
"strconv"
|
||||
|
||||
"git.adyxax.org/adyxax/tfstated/pkg/database"
|
||||
"git.adyxax.org/adyxax/tfstated/pkg/model"
|
||||
)
|
||||
|
||||
type StatesNewPage struct {
|
||||
Page *Page
|
||||
fileError bool
|
||||
Path string
|
||||
PathDuplicate bool
|
||||
PathError bool
|
||||
}
|
||||
|
||||
var statesNewTemplates = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/states_new.html"))
|
||||
|
||||
func handleStatesNewGET(db *database.DB) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
render(w, statesNewTemplates, http.StatusOK, StatesNewPage{
|
||||
Page: makePage(r, &Page{Title: "New State", Section: "states"}),
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
func handleStatesNewPOST(db *database.DB) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
// file upload limit of 20MB
|
||||
if err := r.ParseMultipartForm(20 << 20); err != nil {
|
||||
errorResponse(w, http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
file, _, err := r.FormFile("file")
|
||||
if err != nil {
|
||||
errorResponse(w, http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
statePath := r.FormValue("path")
|
||||
parsedStatePath, err := url.Parse(statePath)
|
||||
if err != nil || path.Clean(parsedStatePath.Path) != statePath || statePath[0] != '/' {
|
||||
render(w, statesNewTemplates, http.StatusBadRequest, StatesNewPage{
|
||||
Page: makePage(r, &Page{Title: "New State", Section: "states"}),
|
||||
Path: statePath,
|
||||
PathError: true,
|
||||
})
|
||||
return
|
||||
}
|
||||
data, err := io.ReadAll(file)
|
||||
if err != nil {
|
||||
errorResponse(w, http.StatusBadRequest, fmt.Errorf("failed to read uploaded file: %w", err))
|
||||
return
|
||||
}
|
||||
fileType := http.DetectContentType(data)
|
||||
if fileType != "text/plain; charset=utf-8" {
|
||||
errorResponse(w, http.StatusBadRequest, fmt.Errorf("invalid file type: expected \"text/plain; charset=utf-8\" but got \"%s\"", fileType))
|
||||
return
|
||||
}
|
||||
account := r.Context().Value(model.AccountContextKey{}).(*model.Account)
|
||||
version, err := db.CreateState(statePath, account.Id, data)
|
||||
if err != nil {
|
||||
errorResponse(w, http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
if version == nil {
|
||||
render(w, statesNewTemplates, http.StatusBadRequest, StatesNewPage{
|
||||
Page: makePage(r, &Page{Title: "New State", Section: "states"}),
|
||||
Path: statePath,
|
||||
PathDuplicate: true,
|
||||
})
|
||||
return
|
||||
}
|
||||
destination := path.Join("/version", strconv.Itoa(version.Id))
|
||||
http.Redirect(w, r, destination, http.StatusFound)
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue