Add real-time deployment updates and refactor JavaScript
- Add deploy stats (last deploy time, total count) to dashboard - Add recent-deployments API endpoint for real-time updates - Add live build logs to deployments history page - Fix git clone regression (preserve entrypoint for simple clones) - Refactor JavaScript into shared app.js with page init functions - Deploy button disables immediately on click - Auto-refresh deployment list and logs during builds - Format JavaScript with Prettier (4-space indent)
This commit is contained in:
@@ -537,6 +537,49 @@ func (h *Handlers) HandleAppStatusAPI() http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// HandleRecentDeploymentsAPI returns JSON with recent deployments.
|
||||
func (h *Handlers) HandleRecentDeploymentsAPI() http.HandlerFunc {
|
||||
return func(writer http.ResponseWriter, request *http.Request) {
|
||||
appID := chi.URLParam(request, "id")
|
||||
|
||||
application, findErr := models.FindApp(request.Context(), h.db, appID)
|
||||
if findErr != nil || application == nil {
|
||||
http.NotFound(writer, request)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
deployments, deployErr := application.GetDeployments(
|
||||
request.Context(),
|
||||
recentDeploymentsLimit,
|
||||
)
|
||||
if deployErr != nil {
|
||||
h.log.Error("failed to get deployments", "error", deployErr, "app", appID)
|
||||
|
||||
deployments = []*models.Deployment{}
|
||||
}
|
||||
|
||||
// Build response with formatted data
|
||||
deploymentsData := make([]map[string]any, 0, len(deployments))
|
||||
|
||||
for _, d := range deployments {
|
||||
deploymentsData = append(deploymentsData, map[string]any{
|
||||
"id": d.ID,
|
||||
"status": string(d.Status),
|
||||
"duration": d.Duration(),
|
||||
"shortCommit": d.ShortCommit(),
|
||||
"finishedAtISO": d.FinishedAtISO(),
|
||||
"finishedAtLabel": d.FinishedAtFormatted(),
|
||||
})
|
||||
}
|
||||
|
||||
writer.Header().Set("Content-Type", "application/json")
|
||||
_ = json.NewEncoder(writer).Encode(map[string]any{
|
||||
"deployments": deploymentsData,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// containerAction represents a container operation type.
|
||||
type containerAction string
|
||||
|
||||
|
||||
@@ -2,17 +2,29 @@ package handlers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"git.eeqj.de/sneak/upaas/internal/models"
|
||||
"git.eeqj.de/sneak/upaas/templates"
|
||||
)
|
||||
|
||||
// AppStats holds deployment statistics for an app.
|
||||
type AppStats struct {
|
||||
App *models.App
|
||||
LastDeployTime *time.Time
|
||||
LastDeployISO string
|
||||
LastDeployLabel string
|
||||
DeployCount int
|
||||
}
|
||||
|
||||
// HandleDashboard returns the dashboard handler.
|
||||
func (h *Handlers) HandleDashboard() http.HandlerFunc {
|
||||
tmpl := templates.GetParsed()
|
||||
|
||||
return func(writer http.ResponseWriter, request *http.Request) {
|
||||
apps, fetchErr := models.AllApps(request.Context(), h.db)
|
||||
ctx := request.Context()
|
||||
|
||||
apps, fetchErr := models.AllApps(ctx, h.db)
|
||||
if fetchErr != nil {
|
||||
h.log.Error("failed to fetch apps", "error", fetchErr)
|
||||
http.Error(writer, "Internal Server Error", http.StatusInternalServerError)
|
||||
@@ -20,8 +32,41 @@ func (h *Handlers) HandleDashboard() http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
// Fetch stats for each app
|
||||
appStats := make([]*AppStats, 0, len(apps))
|
||||
|
||||
for _, app := range apps {
|
||||
stats := &AppStats{App: app}
|
||||
|
||||
// Get deploy count
|
||||
count, countErr := models.CountDeploymentsByAppID(ctx, h.db, app.ID)
|
||||
if countErr != nil {
|
||||
h.log.Error("failed to count deployments", "error", countErr, "app", app.ID)
|
||||
} else {
|
||||
stats.DeployCount = count
|
||||
}
|
||||
|
||||
// Get latest deployment
|
||||
latest, latestErr := models.LatestDeploymentForApp(ctx, h.db, app.ID)
|
||||
if latestErr != nil {
|
||||
h.log.Error("failed to get latest deployment", "error", latestErr, "app", app.ID)
|
||||
} else if latest != nil {
|
||||
if latest.FinishedAt.Valid {
|
||||
stats.LastDeployTime = &latest.FinishedAt.Time
|
||||
stats.LastDeployISO = latest.FinishedAt.Time.Format(time.RFC3339)
|
||||
stats.LastDeployLabel = latest.FinishedAt.Time.Format("2006-01-02 15:04:05")
|
||||
} else {
|
||||
stats.LastDeployTime = &latest.StartedAt
|
||||
stats.LastDeployISO = latest.StartedAt.Format(time.RFC3339)
|
||||
stats.LastDeployLabel = latest.StartedAt.Format("2006-01-02 15:04:05")
|
||||
}
|
||||
}
|
||||
|
||||
appStats = append(appStats, stats)
|
||||
}
|
||||
|
||||
data := h.addGlobals(map[string]any{
|
||||
"Apps": apps,
|
||||
"AppStats": appStats,
|
||||
})
|
||||
|
||||
execErr := tmpl.ExecuteTemplate(writer, "dashboard.html", data)
|
||||
|
||||
Reference in New Issue
Block a user