Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 63d0afb4e2 | |||
| 011addea5b | |||
| 7fa7d3f868 | |||
| f4c8826764 | |||
| 1fb3148444 | |||
| 6c43bd20d6 | |||
| c98b73bf39 | |||
| f5734fea10 |
@@ -39,6 +39,7 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
|
|||||||
// Issues.
|
// Issues.
|
||||||
mux.HandleFunc("GET /issues", h.ListIssues)
|
mux.HandleFunc("GET /issues", h.ListIssues)
|
||||||
mux.HandleFunc("GET /issues/new", h.NewIssue)
|
mux.HandleFunc("GET /issues/new", h.NewIssue)
|
||||||
|
mux.HandleFunc("GET /issues/new/labels", h.NewIssueLabels)
|
||||||
mux.HandleFunc("POST /issues", h.CreateIssue)
|
mux.HandleFunc("POST /issues", h.CreateIssue)
|
||||||
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/labels", h.ApplyLabels)
|
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/labels", h.ApplyLabels)
|
||||||
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/assignees", h.AssignIssue)
|
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/assignees", h.AssignIssue)
|
||||||
@@ -189,18 +190,30 @@ func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
token := getToken(r)
|
token := getToken(r)
|
||||||
orgs := h.getUserOrgs(r)
|
orgs := h.getUserOrgs(r)
|
||||||
|
selectedOrg := r.URL.Query().Get("org")
|
||||||
|
|
||||||
type dashboardData struct {
|
type dashboardData struct {
|
||||||
Items []giteaclient.TriageItem
|
Items []giteaclient.TriageItem
|
||||||
Error string
|
Orgs []string
|
||||||
|
SelectedOrg string
|
||||||
|
Error string
|
||||||
}
|
}
|
||||||
|
|
||||||
var data dashboardData
|
data := dashboardData{
|
||||||
|
Orgs: orgs,
|
||||||
|
SelectedOrg: selectedOrg,
|
||||||
|
}
|
||||||
|
|
||||||
if len(orgs) == 0 {
|
if len(orgs) == 0 {
|
||||||
data.Error = "No organizations found. Check your token permissions."
|
data.Error = "No organizations found. Check your token permissions."
|
||||||
} else {
|
} else {
|
||||||
queue, err := h.Client.GetTriageQueue(r.Context(), token, orgs)
|
// Determine which orgs to query.
|
||||||
|
queryOrgs := orgs
|
||||||
|
if selectedOrg != "" {
|
||||||
|
queryOrgs = []string{selectedOrg}
|
||||||
|
}
|
||||||
|
|
||||||
|
queue, err := h.Client.GetTriageQueue(r.Context(), token, queryOrgs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("failed to get triage queue", "error", err)
|
slog.Error("failed to get triage queue", "error", err)
|
||||||
data.Error = "Error loading triage queue."
|
data.Error = "Error loading triage queue."
|
||||||
@@ -321,23 +334,29 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
|
|||||||
orgNames := h.getUserOrgs(r)
|
orgNames := h.getUserOrgs(r)
|
||||||
|
|
||||||
type pullsData struct {
|
type pullsData struct {
|
||||||
Pulls []giteaclient.PullRequest
|
Pulls []giteaclient.PullRequest
|
||||||
Orgs []string
|
Orgs []string
|
||||||
SelectedOrg string
|
SelectedOrg string
|
||||||
HasMore bool
|
SelectedState string
|
||||||
NextPage int
|
HasMore bool
|
||||||
Error string
|
NextPage int
|
||||||
|
Error string
|
||||||
}
|
}
|
||||||
|
|
||||||
selectedOrg := r.URL.Query().Get("org")
|
selectedOrg := r.URL.Query().Get("org")
|
||||||
|
selectedState := r.URL.Query().Get("state")
|
||||||
|
if selectedState == "" {
|
||||||
|
selectedState = "open"
|
||||||
|
}
|
||||||
page, _ := strconv.Atoi(r.URL.Query().Get("page"))
|
page, _ := strconv.Atoi(r.URL.Query().Get("page"))
|
||||||
if page < 1 {
|
if page < 1 {
|
||||||
page = 1
|
page = 1
|
||||||
}
|
}
|
||||||
|
|
||||||
data := pullsData{
|
data := pullsData{
|
||||||
Orgs: orgNames,
|
Orgs: orgNames,
|
||||||
SelectedOrg: selectedOrg,
|
SelectedOrg: selectedOrg,
|
||||||
|
SelectedState: selectedState,
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(orgNames) == 0 {
|
if len(orgNames) == 0 {
|
||||||
@@ -348,7 +367,7 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
|
|||||||
queryOrgs = []string{selectedOrg}
|
queryOrgs = []string{selectedOrg}
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := h.Client.ListAllPullRequests(r.Context(), token, queryOrgs, "open", page)
|
result, err := h.Client.ListAllPullRequests(r.Context(), token, queryOrgs, selectedState, page)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("failed to list pull requests", "error", err)
|
slog.Error("failed to list pull requests", "error", err)
|
||||||
data.Error = "Error loading pull requests."
|
data.Error = "Error loading pull requests."
|
||||||
@@ -513,6 +532,13 @@ func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fetch comments for this PR (Gitea uses the issues endpoint for PR comments).
|
||||||
|
comments, err := h.Client.GetIssueComments(r.Context(), token, owner, repo, index)
|
||||||
|
if err != nil {
|
||||||
|
slog.Warn("failed to fetch PR comments", "error", err, "owner", owner, "repo", repo, "index", index)
|
||||||
|
// Non-fatal: continue rendering without comments.
|
||||||
|
}
|
||||||
|
|
||||||
// Build the content HTML using the template.
|
// Build the content HTML using the template.
|
||||||
tmpl, err := template.ParseFiles("internal/templates/pull_detail.html")
|
tmpl, err := template.ParseFiles("internal/templates/pull_detail.html")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -524,11 +550,13 @@ func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
|
|||||||
type templateData struct {
|
type templateData struct {
|
||||||
Pull *giteaclient.PullRequest
|
Pull *giteaclient.PullRequest
|
||||||
RenderedBody template.HTML
|
RenderedBody template.HTML
|
||||||
|
Comments []giteaclient.Comment
|
||||||
}
|
}
|
||||||
|
|
||||||
data := templateData{
|
data := templateData{
|
||||||
Pull: pr,
|
Pull: pr,
|
||||||
RenderedBody: renderedBody,
|
RenderedBody: renderedBody,
|
||||||
|
Comments: comments,
|
||||||
}
|
}
|
||||||
|
|
||||||
var buf strings.Builder
|
var buf strings.Builder
|
||||||
@@ -576,6 +604,38 @@ func (h *Handler) NewIssue(w http.ResponseWriter, r *http.Request) {
|
|||||||
renderPage(w, r, "New Issue", "issues", buf.String())
|
renderPage(w, r, "New Issue", "issues", buf.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewIssueLabels handles GET /issues/new/labels — returns label checkboxes for a repo.
|
||||||
|
func (h *Handler) NewIssueLabels(w http.ResponseWriter, r *http.Request) {
|
||||||
|
token := getToken(r)
|
||||||
|
owner := r.URL.Query().Get("owner")
|
||||||
|
repo := r.URL.Query().Get("repo")
|
||||||
|
|
||||||
|
if owner == "" || repo == "" {
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
fmt.Fprint(w, `<span class="empty">Select a repository first.</span>`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
labels, err := h.Client.GetRepoLabels(r.Context(), token, owner, repo)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to fetch labels", "error", err, "owner", owner, "repo", repo)
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
fmt.Fprint(w, `<span class="empty">Error loading labels.</span>`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
if len(labels) == 0 {
|
||||||
|
fmt.Fprint(w, `<span class="empty">No labels available for this repository.</span>`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, l := range labels {
|
||||||
|
fmt.Fprintf(w, `<label style="display:inline-block;margin:0.25rem 0.5rem 0.25rem 0;cursor:pointer;"><input type="checkbox" name="label_ids" value="%d" style="margin-right:0.25rem;"> <span class="label" style="color:#%s;border:1px solid #%s">%s</span></label>`,
|
||||||
|
l.ID, template.HTMLEscapeString(l.Color), template.HTMLEscapeString(l.Color), template.HTMLEscapeString(l.Name))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// CreateIssue handles POST /issues.
|
// CreateIssue handles POST /issues.
|
||||||
func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
||||||
token := getToken(r)
|
token := getToken(r)
|
||||||
@@ -589,6 +649,15 @@ func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
|||||||
title := r.FormValue("title")
|
title := r.FormValue("title")
|
||||||
body := r.FormValue("body")
|
body := r.FormValue("body")
|
||||||
|
|
||||||
|
// Parse label IDs from form checkboxes.
|
||||||
|
var labelIDs []int64
|
||||||
|
for _, idStr := range r.Form["label_ids"] {
|
||||||
|
id, err := strconv.ParseInt(idStr, 10, 64)
|
||||||
|
if err == nil {
|
||||||
|
labelIDs = append(labelIDs, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if owner == "" || repo == "" || title == "" {
|
if owner == "" || repo == "" || title == "" {
|
||||||
if isHTMX(r) {
|
if isHTMX(r) {
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
@@ -600,7 +669,7 @@ func (h *Handler) CreateIssue(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
issue, err := h.Client.CreateIssue(r.Context(), token, owner, repo, title, body, nil)
|
issue, err := h.Client.CreateIssue(r.Context(), token, owner, repo, title, body, labelIDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("failed to create issue", "error", err)
|
slog.Error("failed to create issue", "error", err)
|
||||||
if isHTMX(r) {
|
if isHTMX(r) {
|
||||||
|
|||||||
@@ -20,6 +20,11 @@
|
|||||||
<input type="hidden" name="repo" id="repo-input">
|
<input type="hidden" name="repo" id="repo-input">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group" id="label-section" style="display:none;">
|
||||||
|
<label>Labels</label>
|
||||||
|
<div id="label-list"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="title">Title</label>
|
<label for="title">Title</label>
|
||||||
<input type="text" id="title" name="title" placeholder="Issue title" required>
|
<input type="text" id="title" name="title" placeholder="Issue title" required>
|
||||||
@@ -52,7 +57,19 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repoSelect.addEventListener('change', splitOwnerRepo);
|
repoSelect.addEventListener('change', function() {
|
||||||
|
splitOwnerRepo();
|
||||||
|
var labelSection = document.getElementById('label-section');
|
||||||
|
var labelList = document.getElementById('label-list');
|
||||||
|
if (ownerInput.value && repoInput.value) {
|
||||||
|
labelList.innerHTML = '<span class="empty">Loading labels...</span>';
|
||||||
|
labelSection.style.display = 'block';
|
||||||
|
htmx.ajax('GET', '/issues/new/labels?owner=' + encodeURIComponent(ownerInput.value) + '&repo=' + encodeURIComponent(repoInput.value), {target: '#label-list', swap: 'innerHTML'});
|
||||||
|
} else {
|
||||||
|
labelSection.style.display = 'none';
|
||||||
|
labelList.innerHTML = '';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Validate before HTMX submit.
|
// Validate before HTMX submit.
|
||||||
document.getElementById('create-issue-form').addEventListener('htmx:configRequest', function(evt) {
|
document.getElementById('create-issue-form').addEventListener('htmx:configRequest', function(evt) {
|
||||||
|
|||||||
@@ -1,6 +1,17 @@
|
|||||||
{{define "content"}}
|
{{define "content"}}
|
||||||
<h1>Dashboard</h1>
|
<h1>Dashboard</h1>
|
||||||
|
|
||||||
|
{{if gt (len .Orgs) 1}}
|
||||||
|
<div class="filter-bar">
|
||||||
|
<select name="org" hx-get="/" hx-trigger="change" hx-target="#main-content" hx-swap="innerHTML" hx-push-url="true">
|
||||||
|
<option value="">All orgs</option>
|
||||||
|
{{range .Orgs}}
|
||||||
|
<option value="{{.}}" {{if eq . $.SelectedOrg}}selected{{end}}>{{.}}</option>
|
||||||
|
{{end}}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
{{if .Error}}
|
{{if .Error}}
|
||||||
<p class="empty">{{.Error}}</p>
|
<p class="empty">{{.Error}}</p>
|
||||||
{{else if not .Items}}
|
{{else if not .Items}}
|
||||||
|
|||||||
@@ -46,4 +46,21 @@
|
|||||||
<button type="submit" class="btn btn-primary">Submit Review</button>
|
<button type="submit" class="btn btn-primary">Submit Review</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{if .Comments}}
|
||||||
|
<h2>Comments</h2>
|
||||||
|
<div id="comments-list">
|
||||||
|
{{range .Comments}}
|
||||||
|
<div class="comment">
|
||||||
|
<div class="comment-header">
|
||||||
|
<strong>{{.User}}</strong>
|
||||||
|
<span>{{.CreatedAt}}</span>
|
||||||
|
</div>
|
||||||
|
<div class="comment-body">{{.Body}}</div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
{{else}}
|
||||||
|
<p class="empty" style="margin-top:1rem;">No comments yet.</p>
|
||||||
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if .HasMore}}
|
{{if .HasMore}}
|
||||||
<div class="scroll-sentinel" hx-get="/pulls?page={{.NextPage}}&org={{.SelectedOrg}}" hx-trigger="revealed" hx-swap="outerHTML" hx-target="this">
|
<div class="scroll-sentinel" hx-get="/pulls?page={{.NextPage}}&org={{.SelectedOrg}}&state={{.SelectedState}}" hx-trigger="revealed" hx-swap="outerHTML" hx-target="this">
|
||||||
<div class="spinner htmx-indicator"></div>
|
<div class="spinner htmx-indicator"></div>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
@@ -27,18 +27,22 @@
|
|||||||
<h1>Pull Requests</h1>
|
<h1>Pull Requests</h1>
|
||||||
|
|
||||||
<div class="filter-bar">
|
<div class="filter-bar">
|
||||||
<select name="org" hx-get="/pulls" hx-trigger="change" hx-target="#main-content" hx-swap="innerHTML" hx-push-url="true">
|
<select name="org" hx-get="/pulls" hx-trigger="change" hx-target="#main-content" hx-swap="innerHTML" hx-push-url="true" hx-include="[name='state']">
|
||||||
<option value="">All orgs</option>
|
<option value="">All orgs</option>
|
||||||
{{range .Orgs}}
|
{{range .Orgs}}
|
||||||
<option value="{{.}}" {{if eq . $.SelectedOrg}}selected{{end}}>{{.}}</option>
|
<option value="{{.}}" {{if eq . $.SelectedOrg}}selected{{end}}>{{.}}</option>
|
||||||
{{end}}
|
{{end}}
|
||||||
</select>
|
</select>
|
||||||
|
<select name="state" hx-get="/pulls" hx-trigger="change" hx-target="#main-content" hx-swap="innerHTML" hx-push-url="true" hx-include="[name='org']">
|
||||||
|
<option value="open" {{if eq .SelectedState "open"}}selected{{end}}>Open</option>
|
||||||
|
<option value="closed" {{if eq .SelectedState "closed"}}selected{{end}}>Closed</option>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{if .Error}}
|
{{if .Error}}
|
||||||
<p class="empty">{{.Error}}</p>
|
<p class="empty">{{.Error}}</p>
|
||||||
{{else if not .Pulls}}
|
{{else if not .Pulls}}
|
||||||
<p class="empty">No open pull requests found.</p>
|
<p class="empty">No {{.SelectedState}} pull requests found.</p>
|
||||||
{{else}}
|
{{else}}
|
||||||
<div id="pull-list">
|
<div id="pull-list">
|
||||||
{{template "cards" .}}
|
{{template "cards" .}}
|
||||||
|
|||||||
Reference in New Issue
Block a user