Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3b17d76960 | |||
| 011addea5b | |||
| 7fa7d3f868 | |||
| f4c8826764 | |||
| 1fb3148444 | |||
| 6c43bd20d6 | |||
| 485aa3f853 | |||
| f5734fea10 |
@@ -325,7 +325,8 @@ type PaginatedPulls struct {
|
||||
|
||||
// ListAllIssues fetches issues across all repos in the given orgs,
|
||||
// using concurrent requests with a semaphore. Results are paginated.
|
||||
func (c *Client) ListAllIssues(ctx context.Context, token string, orgs []string, state string, page int) (PaginatedIssues, error) {
|
||||
// The label parameter filters issues by label name (empty string means no filter).
|
||||
func (c *Client) ListAllIssues(ctx context.Context, token string, orgs []string, state string, page int, label string) (PaginatedIssues, error) {
|
||||
if state == "" {
|
||||
state = "open"
|
||||
}
|
||||
@@ -333,7 +334,7 @@ func (c *Client) ListAllIssues(ctx context.Context, token string, orgs []string,
|
||||
page = 1
|
||||
}
|
||||
|
||||
cacheKey := fmt.Sprintf("issues-%s-%s", state, strings.Join(orgs, ","))
|
||||
cacheKey := fmt.Sprintf("issues-%s-%s-%s", state, strings.Join(orgs, ","), label)
|
||||
var allIssues []Issue
|
||||
if cached, ok := c.getFromCache(cacheKey); ok {
|
||||
allIssues = cached.([]Issue)
|
||||
@@ -362,6 +363,9 @@ func (c *Client) ListAllIssues(ctx context.Context, token string, orgs []string,
|
||||
defer func() { <-sem }()
|
||||
|
||||
path := fmt.Sprintf("/repos/%s/issues?state=%s&type=issues&limit=50", r.FullName, state)
|
||||
if label != "" {
|
||||
path += "&labels=" + label
|
||||
}
|
||||
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||
if err != nil {
|
||||
mu.Lock()
|
||||
@@ -424,8 +428,8 @@ func (c *Client) ListAllIssues(ctx context.Context, token string, orgs []string,
|
||||
}
|
||||
|
||||
// ListAllPullRequests fetches PRs across all repos in the given orgs.
|
||||
// Results are paginated.
|
||||
func (c *Client) ListAllPullRequests(ctx context.Context, token string, orgs []string, state string, page int) (PaginatedPulls, error) {
|
||||
// Results are paginated. The label parameter filters PRs by label name.
|
||||
func (c *Client) ListAllPullRequests(ctx context.Context, token string, orgs []string, state string, page int, label string) (PaginatedPulls, error) {
|
||||
if state == "" {
|
||||
state = "open"
|
||||
}
|
||||
@@ -433,7 +437,7 @@ func (c *Client) ListAllPullRequests(ctx context.Context, token string, orgs []s
|
||||
page = 1
|
||||
}
|
||||
|
||||
cacheKey := fmt.Sprintf("pulls-%s-%s", state, strings.Join(orgs, ","))
|
||||
cacheKey := fmt.Sprintf("pulls-%s-%s-%s", state, strings.Join(orgs, ","), label)
|
||||
var allPRs []PullRequest
|
||||
if cached, ok := c.getFromCache(cacheKey); ok {
|
||||
allPRs = cached.([]PullRequest)
|
||||
@@ -460,6 +464,9 @@ func (c *Client) ListAllPullRequests(ctx context.Context, token string, orgs []s
|
||||
defer func() { <-sem }()
|
||||
|
||||
path := fmt.Sprintf("/repos/%s/pulls?state=%s&limit=50", r.FullName, state)
|
||||
if label != "" {
|
||||
path += "&labels=" + label
|
||||
}
|
||||
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||
if err != nil {
|
||||
mu.Lock()
|
||||
@@ -524,7 +531,7 @@ func (c *Client) GetTriageQueue(ctx context.Context, token string, orgs []string
|
||||
// Collect all open issues across all pages.
|
||||
var issues []Issue
|
||||
for page := 1; ; page++ {
|
||||
result, err := c.ListAllIssues(ctx, token, orgs, "open", page)
|
||||
result, err := c.ListAllIssues(ctx, token, orgs, "open", page, "")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("fetching issues for triage: %w", err)
|
||||
}
|
||||
@@ -537,7 +544,7 @@ func (c *Client) GetTriageQueue(ctx context.Context, token string, orgs []string
|
||||
// Collect all open PRs across all pages.
|
||||
var prs []PullRequest
|
||||
for page := 1; ; page++ {
|
||||
result, err := c.ListAllPullRequests(ctx, token, orgs, "open", page)
|
||||
result, err := c.ListAllPullRequests(ctx, token, orgs, "open", page, "")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("fetching PRs for triage: %w", err)
|
||||
}
|
||||
@@ -753,6 +760,49 @@ func (c *Client) ApplyLabel(ctx context.Context, token, owner, repo string, inde
|
||||
return nil
|
||||
}
|
||||
|
||||
// ListCollaborators fetches the list of collaborators (users with access) for a repo.
|
||||
func (c *Client) ListCollaborators(ctx context.Context, token, owner, repo string) ([]string, error) {
|
||||
path := fmt.Sprintf("/repos/%s/%s/collaborators?limit=50", owner, repo)
|
||||
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("fetching collaborators: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var users []struct {
|
||||
Login string `json:"login"`
|
||||
}
|
||||
if err := json.NewDecoder(resp.Body).Decode(&users); err != nil {
|
||||
return nil, fmt.Errorf("decoding collaborators: %w", err)
|
||||
}
|
||||
|
||||
var logins []string
|
||||
for _, u := range users {
|
||||
logins = append(logins, u.Login)
|
||||
}
|
||||
return logins, nil
|
||||
}
|
||||
|
||||
// AssignIssue sets the assignees on an issue.
|
||||
func (c *Client) AssignIssue(ctx context.Context, token, owner, repo string, index int64, assignees []string) error {
|
||||
payload, err := json.Marshal(map[string]interface{}{
|
||||
"assignees": assignees,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("marshaling assignees: %w", err)
|
||||
}
|
||||
|
||||
path := fmt.Sprintf("/repos/%s/%s/issues/%d", owner, repo, index)
|
||||
resp, err := c.doRequest(ctx, token, http.MethodPatch, path, strings.NewReader(string(payload)))
|
||||
if err != nil {
|
||||
return fmt.Errorf("assigning issue: %w", err)
|
||||
}
|
||||
resp.Body.Close()
|
||||
|
||||
c.InvalidateAll()
|
||||
return nil
|
||||
}
|
||||
|
||||
// SubmitReview submits a review on a pull request.
|
||||
func (c *Client) SubmitReview(ctx context.Context, token, owner, repo string, index int64, reviewType, body string) error {
|
||||
payload := map[string]interface{}{
|
||||
|
||||
@@ -42,6 +42,7 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
|
||||
mux.HandleFunc("GET /issues/new/labels", h.NewIssueLabels)
|
||||
mux.HandleFunc("POST /issues", h.CreateIssue)
|
||||
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}/close", h.CloseIssue)
|
||||
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/state", h.SetIssueState)
|
||||
mux.HandleFunc("POST /issues/{owner}/{repo}/{index}/comments", h.AddComment)
|
||||
@@ -189,18 +190,30 @@ func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
token := getToken(r)
|
||||
orgs := h.getUserOrgs(r)
|
||||
selectedOrg := r.URL.Query().Get("org")
|
||||
|
||||
type dashboardData struct {
|
||||
Items []giteaclient.TriageItem
|
||||
Error string
|
||||
Items []giteaclient.TriageItem
|
||||
Orgs []string
|
||||
SelectedOrg string
|
||||
Error string
|
||||
}
|
||||
|
||||
var data dashboardData
|
||||
data := dashboardData{
|
||||
Orgs: orgs,
|
||||
SelectedOrg: selectedOrg,
|
||||
}
|
||||
|
||||
if len(orgs) == 0 {
|
||||
data.Error = "No organizations found. Check your token permissions."
|
||||
} 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 {
|
||||
slog.Error("failed to get triage queue", "error", err)
|
||||
data.Error = "Error loading triage queue."
|
||||
@@ -236,6 +249,7 @@ func (h *Handler) ListIssues(w http.ResponseWriter, r *http.Request) {
|
||||
Orgs []string
|
||||
SelectedOrg string
|
||||
SelectedState string
|
||||
SelectedLabel string
|
||||
HasMore bool
|
||||
NextPage int
|
||||
Error string
|
||||
@@ -246,6 +260,7 @@ func (h *Handler) ListIssues(w http.ResponseWriter, r *http.Request) {
|
||||
if selectedState == "" {
|
||||
selectedState = "open"
|
||||
}
|
||||
selectedLabel := r.URL.Query().Get("label")
|
||||
page, _ := strconv.Atoi(r.URL.Query().Get("page"))
|
||||
if page < 1 {
|
||||
page = 1
|
||||
@@ -255,6 +270,7 @@ func (h *Handler) ListIssues(w http.ResponseWriter, r *http.Request) {
|
||||
Orgs: orgNames,
|
||||
SelectedOrg: selectedOrg,
|
||||
SelectedState: selectedState,
|
||||
SelectedLabel: selectedLabel,
|
||||
}
|
||||
|
||||
if len(orgNames) == 0 {
|
||||
@@ -266,7 +282,7 @@ func (h *Handler) ListIssues(w http.ResponseWriter, r *http.Request) {
|
||||
queryOrgs = []string{selectedOrg}
|
||||
}
|
||||
|
||||
result, err := h.Client.ListAllIssues(r.Context(), token, queryOrgs, selectedState, page)
|
||||
result, err := h.Client.ListAllIssues(r.Context(), token, queryOrgs, selectedState, page, selectedLabel)
|
||||
if err != nil {
|
||||
slog.Error("failed to list issues", "error", err)
|
||||
data.Error = "Error loading issues."
|
||||
@@ -321,23 +337,32 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
|
||||
orgNames := h.getUserOrgs(r)
|
||||
|
||||
type pullsData struct {
|
||||
Pulls []giteaclient.PullRequest
|
||||
Orgs []string
|
||||
SelectedOrg string
|
||||
HasMore bool
|
||||
NextPage int
|
||||
Error string
|
||||
Pulls []giteaclient.PullRequest
|
||||
Orgs []string
|
||||
SelectedOrg string
|
||||
SelectedState string
|
||||
SelectedLabel string
|
||||
HasMore bool
|
||||
NextPage int
|
||||
Error string
|
||||
}
|
||||
|
||||
selectedOrg := r.URL.Query().Get("org")
|
||||
selectedState := r.URL.Query().Get("state")
|
||||
if selectedState == "" {
|
||||
selectedState = "open"
|
||||
}
|
||||
selectedLabel := r.URL.Query().Get("label")
|
||||
page, _ := strconv.Atoi(r.URL.Query().Get("page"))
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
|
||||
data := pullsData{
|
||||
Orgs: orgNames,
|
||||
SelectedOrg: selectedOrg,
|
||||
Orgs: orgNames,
|
||||
SelectedOrg: selectedOrg,
|
||||
SelectedState: selectedState,
|
||||
SelectedLabel: selectedLabel,
|
||||
}
|
||||
|
||||
if len(orgNames) == 0 {
|
||||
@@ -348,7 +373,7 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
|
||||
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, selectedLabel)
|
||||
if err != nil {
|
||||
slog.Error("failed to list pull requests", "error", err)
|
||||
data.Error = "Error loading pull requests."
|
||||
@@ -430,6 +455,12 @@ func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
|
||||
labels = nil
|
||||
}
|
||||
|
||||
collaborators, err := h.Client.ListCollaborators(r.Context(), token, owner, repo)
|
||||
if err != nil {
|
||||
slog.Error("failed to get collaborators", "error", err)
|
||||
collaborators = nil
|
||||
}
|
||||
|
||||
// Render markdown body if present.
|
||||
var renderedBody template.HTML
|
||||
if issue.Body != "" {
|
||||
@@ -454,6 +485,7 @@ func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
|
||||
RenderedBody template.HTML
|
||||
Comments []giteaclient.Comment
|
||||
AvailableLabels []giteaclient.Label
|
||||
Collaborators []string
|
||||
}
|
||||
|
||||
data := templateData{
|
||||
@@ -461,6 +493,7 @@ func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
|
||||
RenderedBody: renderedBody,
|
||||
Comments: comments,
|
||||
AvailableLabels: labels,
|
||||
Collaborators: collaborators,
|
||||
}
|
||||
|
||||
var buf strings.Builder
|
||||
@@ -702,6 +735,45 @@ func (h *Handler) ApplyLabels(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, fmt.Sprintf("/issues/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// AssignIssue handles POST /issues/{owner}/{repo}/{index}/assignees.
|
||||
func (h *Handler) AssignIssue(w http.ResponseWriter, r *http.Request) {
|
||||
token := getToken(r)
|
||||
owner := r.PathValue("owner")
|
||||
repo := r.PathValue("repo")
|
||||
indexStr := r.PathValue("index")
|
||||
|
||||
index, err := strconv.ParseInt(indexStr, 10, 64)
|
||||
if err != nil {
|
||||
http.Error(w, "invalid issue index", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if err := r.ParseForm(); err != nil {
|
||||
http.Error(w, "bad request", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
assignee := r.FormValue("assignee")
|
||||
if assignee == "" {
|
||||
http.Error(w, "assignee is required", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.Client.AssignIssue(r.Context(), token, owner, repo, index, []string{assignee}); err != nil {
|
||||
slog.Error("failed to assign issue", "error", err, "owner", owner, "repo", repo, "index", index, "assignee", assignee)
|
||||
http.Error(w, "failed to assign issue", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if isHTMX(r) {
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
fmt.Fprintf(w, `<span style="color:#3fb950">Assigned to %s</span>`, template.HTMLEscapeString(assignee))
|
||||
return
|
||||
}
|
||||
|
||||
http.Redirect(w, r, fmt.Sprintf("/issues/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// CloseIssue handles POST /issues/{owner}/{repo}/{index}/close.
|
||||
func (h *Handler) CloseIssue(w http.ResponseWriter, r *http.Request) {
|
||||
token := getToken(r)
|
||||
|
||||
@@ -1,6 +1,17 @@
|
||||
{{define "content"}}
|
||||
<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}}
|
||||
<p class="empty">{{.Error}}</p>
|
||||
{{else if not .Items}}
|
||||
|
||||
@@ -51,6 +51,18 @@
|
||||
|
||||
<div class="card" style="margin-top:1rem;">
|
||||
<h2>Actions</h2>
|
||||
{{if .Collaborators}}
|
||||
<form hx-post="/issues/{{.Issue.RepoOwner}}/{{.Issue.RepoName}}/{{.Issue.Number}}/assignees" hx-swap="outerHTML" style="margin-bottom:0.5rem;">
|
||||
<div class="filter-bar" style="margin-bottom:0.5rem;">
|
||||
<select name="assignee">
|
||||
{{range .Collaborators}}
|
||||
<option value="{{.}}">{{.}}</option>
|
||||
{{end}}
|
||||
</select>
|
||||
<button type="submit" class="btn btn-secondary" style="width:auto;padding:0.5rem 1rem;">Assign</button>
|
||||
</div>
|
||||
</form>
|
||||
{{end}}
|
||||
<form hx-post="/issues/{{.Issue.RepoOwner}}/{{.Issue.RepoName}}/{{.Issue.Number}}/labels" hx-swap="outerHTML" style="margin-bottom:0.5rem;">
|
||||
<div class="filter-bar" style="margin-bottom:0.5rem;">
|
||||
<select name="label_id">
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
</div>
|
||||
{{end}}
|
||||
{{if .HasMore}}
|
||||
<div class="scroll-sentinel" hx-get="/issues?page={{.NextPage}}&org={{.SelectedOrg}}&state={{.SelectedState}}" hx-trigger="revealed" hx-swap="outerHTML" hx-target="this">
|
||||
<div class="scroll-sentinel" hx-get="/issues?page={{.NextPage}}&org={{.SelectedOrg}}&state={{.SelectedState}}&label={{.SelectedLabel}}" hx-trigger="revealed" hx-swap="outerHTML" hx-target="this">
|
||||
<div class="spinner htmx-indicator"></div>
|
||||
</div>
|
||||
{{end}}
|
||||
@@ -24,16 +24,19 @@
|
||||
<h1>Issues</h1>
|
||||
|
||||
<div class="filter-bar">
|
||||
<select name="org" hx-get="/issues" hx-trigger="change" hx-target="#main-content" hx-swap="innerHTML" hx-push-url="true" hx-include="[name='state']">
|
||||
<select name="org" hx-get="/issues" hx-trigger="change" hx-target="#main-content" hx-swap="innerHTML" hx-push-url="true" hx-include="[name='state'],[name='label']">
|
||||
<option value="">All orgs</option>
|
||||
{{range .Orgs}}
|
||||
<option value="{{.}}" {{if eq . $.SelectedOrg}}selected{{end}}>{{.}}</option>
|
||||
{{end}}
|
||||
</select>
|
||||
<select name="state" hx-get="/issues" hx-trigger="change" hx-target="#main-content" hx-swap="innerHTML" hx-push-url="true" hx-include="[name='org']">
|
||||
<select name="state" hx-get="/issues" hx-trigger="change" hx-target="#main-content" hx-swap="innerHTML" hx-push-url="true" hx-include="[name='org'],[name='label']">
|
||||
<option value="open" {{if eq .SelectedState "open"}}selected{{end}}>Open</option>
|
||||
<option value="closed" {{if eq .SelectedState "closed"}}selected{{end}}>Closed</option>
|
||||
</select>
|
||||
<input type="text" name="label" placeholder="Filter by label..." value="{{.SelectedLabel}}"
|
||||
hx-get="/issues" hx-trigger="input changed delay:400ms" hx-target="#main-content"
|
||||
hx-swap="innerHTML" hx-push-url="true" hx-include="[name='org'],[name='state']">
|
||||
</div>
|
||||
|
||||
{{if .Error}}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
</div>
|
||||
{{end}}
|
||||
{{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}}&label={{.SelectedLabel}}" hx-trigger="revealed" hx-swap="outerHTML" hx-target="this">
|
||||
<div class="spinner htmx-indicator"></div>
|
||||
</div>
|
||||
{{end}}
|
||||
@@ -27,18 +27,25 @@
|
||||
<h1>Pull Requests</h1>
|
||||
|
||||
<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'],[name='label']">
|
||||
<option value="">All orgs</option>
|
||||
{{range .Orgs}}
|
||||
<option value="{{.}}" {{if eq . $.SelectedOrg}}selected{{end}}>{{.}}</option>
|
||||
{{end}}
|
||||
</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'],[name='label']">
|
||||
<option value="open" {{if eq .SelectedState "open"}}selected{{end}}>Open</option>
|
||||
<option value="closed" {{if eq .SelectedState "closed"}}selected{{end}}>Closed</option>
|
||||
</select>
|
||||
<input type="text" name="label" placeholder="Filter by label..." value="{{.SelectedLabel}}"
|
||||
hx-get="/pulls" hx-trigger="input changed delay:400ms" hx-target="#main-content"
|
||||
hx-swap="innerHTML" hx-push-url="true" hx-include="[name='org'],[name='state']">
|
||||
</div>
|
||||
|
||||
{{if .Error}}
|
||||
<p class="empty">{{.Error}}</p>
|
||||
{{else if not .Pulls}}
|
||||
<p class="empty">No open pull requests found.</p>
|
||||
<p class="empty">No {{.SelectedState}} pull requests found.</p>
|
||||
{{else}}
|
||||
<div id="pull-list">
|
||||
{{template "cards" .}}
|
||||
|
||||
Reference in New Issue
Block a user