Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 047e90cd76 | |||
| f1652bb77a | |||
| dbcfbe9138 | |||
| 732cedda3d | |||
| 937da1962b | |||
| 42a61b4428 | |||
| 96b9ef2f89 | |||
| 338b62c294 |
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
# Stage 1: Build
|
# Stage 1: Build
|
||||||
FROM golang:1.22-alpine AS builder
|
FROM golang:1.22-alpine AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY go.mod go.sum ./
|
COPY go.mod ./
|
||||||
RUN go mod download
|
RUN go mod download
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /gitea-mobile ./cmd/server
|
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /gitea-mobile ./cmd/server
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
|
|||||||
mux.HandleFunc("GET /pulls", h.ListPulls)
|
mux.HandleFunc("GET /pulls", h.ListPulls)
|
||||||
mux.HandleFunc("GET /pulls/{owner}/{repo}/{index}", h.PullDetail)
|
mux.HandleFunc("GET /pulls/{owner}/{repo}/{index}", h.PullDetail)
|
||||||
mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/review", h.SubmitReview)
|
mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/review", h.SubmitReview)
|
||||||
|
mux.HandleFunc("POST /pulls/{owner}/{repo}/{index}/state", h.SetPullState)
|
||||||
|
|
||||||
// Settings (handled separately for auth bypass).
|
// Settings (handled separately for auth bypass).
|
||||||
settingsHandler := &SettingsHandler{
|
settingsHandler := &SettingsHandler{
|
||||||
@@ -886,6 +887,53 @@ func (h *Handler) SetIssueState(w http.ResponseWriter, r *http.Request) {
|
|||||||
http.Redirect(w, r, fmt.Sprintf("/issues/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
|
http.Redirect(w, r, fmt.Sprintf("/issues/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetPullState handles POST /pulls/{owner}/{repo}/{index}/state.
|
||||||
|
func (h *Handler) SetPullState(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 pull request index", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.ParseForm(); err != nil {
|
||||||
|
http.Error(w, "bad request", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
state := r.FormValue("state")
|
||||||
|
if state != "open" && state != "closed" {
|
||||||
|
http.Error(w, "state must be 'open' or 'closed'", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := h.Client.SetIssueState(r.Context(), token, owner, repo, index, state); err != nil {
|
||||||
|
slog.Error("failed to set pull request state", "error", err, "owner", owner, "repo", repo, "index", index, "state", state)
|
||||||
|
http.Error(w, "failed to update pull request state", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if isHTMX(r) {
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
if state == "closed" {
|
||||||
|
fmt.Fprintf(w, `<span class="state-closed" id="pull-state">closed</span>
|
||||||
|
<button class="btn btn-secondary" hx-post="/pulls/%s/%s/%d/state" hx-vals='{"state":"open"}' hx-target="#state-section" hx-swap="innerHTML">Reopen PR</button>`,
|
||||||
|
template.HTMLEscapeString(owner), template.HTMLEscapeString(repo), index)
|
||||||
|
} else {
|
||||||
|
fmt.Fprintf(w, `<span class="state-open" id="pull-state">open</span>
|
||||||
|
<button class="btn btn-danger" hx-post="/pulls/%s/%s/%d/state" hx-vals='{"state":"closed"}' hx-target="#state-section" hx-swap="innerHTML">Close PR</button>`,
|
||||||
|
template.HTMLEscapeString(owner), template.HTMLEscapeString(repo), index)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
http.Redirect(w, r, fmt.Sprintf("/pulls/%s/%s/%d", owner, repo, index), http.StatusSeeOther)
|
||||||
|
}
|
||||||
|
|
||||||
// AddComment handles POST /issues/{owner}/{repo}/{index}/comment.
|
// AddComment handles POST /issues/{owner}/{repo}/{index}/comment.
|
||||||
func (h *Handler) AddComment(w http.ResponseWriter, r *http.Request) {
|
func (h *Handler) AddComment(w http.ResponseWriter, r *http.Request) {
|
||||||
token := getToken(r)
|
token := getToken(r)
|
||||||
|
|||||||
@@ -6,16 +6,15 @@
|
|||||||
<form id="create-issue-form" hx-post="/issues" hx-swap="innerHTML" hx-target="#main-content">
|
<form id="create-issue-form" hx-post="/issues" hx-swap="innerHTML" hx-target="#main-content">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="repo-select">Repository</label>
|
<label for="repo-select">Repository</label>
|
||||||
<select id="repo-select" name="owner_repo" required>
|
<input list="repo-options" id="repo-select" name="owner_repo"
|
||||||
<option value="">Select a repository...</option>
|
placeholder="Type to search repositories..." required autocomplete="off">
|
||||||
|
<datalist id="repo-options">
|
||||||
{{range $org, $repos := .Repos}}
|
{{range $org, $repos := .Repos}}
|
||||||
<optgroup label="{{$org}}">
|
|
||||||
{{range $repos}}
|
{{range $repos}}
|
||||||
<option value="{{.Owner.Login}}/{{.Name}}">{{.FullName}}</option>
|
<option value="{{.Owner.Login}}/{{.Name}}">{{.FullName}}</option>
|
||||||
{{end}}
|
{{end}}
|
||||||
</optgroup>
|
|
||||||
{{end}}
|
{{end}}
|
||||||
</select>
|
</datalist>
|
||||||
<input type="hidden" name="owner" id="owner-input">
|
<input type="hidden" name="owner" id="owner-input">
|
||||||
<input type="hidden" name="repo" id="repo-input">
|
<input type="hidden" name="repo" id="repo-input">
|
||||||
</div>
|
</div>
|
||||||
@@ -45,9 +44,16 @@
|
|||||||
var repoInput = document.getElementById('repo-input');
|
var repoInput = document.getElementById('repo-input');
|
||||||
var formError = document.getElementById('form-error');
|
var formError = document.getElementById('form-error');
|
||||||
|
|
||||||
|
// Build a set of valid repo values for validation.
|
||||||
|
var validRepos = {};
|
||||||
|
var options = document.getElementById('repo-options').options;
|
||||||
|
for (var i = 0; i < options.length; i++) {
|
||||||
|
validRepos[options[i].value] = true;
|
||||||
|
}
|
||||||
|
|
||||||
function splitOwnerRepo() {
|
function splitOwnerRepo() {
|
||||||
var val = repoSelect.value;
|
var val = repoSelect.value;
|
||||||
if (val) {
|
if (val && val.indexOf('/') !== -1) {
|
||||||
var parts = val.split('/');
|
var parts = val.split('/');
|
||||||
ownerInput.value = parts[0] || '';
|
ownerInput.value = parts[0] || '';
|
||||||
repoInput.value = parts[1] || '';
|
repoInput.value = parts[1] || '';
|
||||||
@@ -57,11 +63,31 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var debounceTimer = null;
|
||||||
|
repoSelect.addEventListener('input', function() {
|
||||||
|
clearTimeout(debounceTimer);
|
||||||
|
debounceTimer = setTimeout(function() {
|
||||||
|
splitOwnerRepo();
|
||||||
|
var labelSection = document.getElementById('label-section');
|
||||||
|
var labelList = document.getElementById('label-list');
|
||||||
|
if (ownerInput.value && repoInput.value && validRepos[repoSelect.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 = '';
|
||||||
|
}
|
||||||
|
}, 300);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Also handle the change event for when a datalist option is selected directly.
|
||||||
repoSelect.addEventListener('change', function() {
|
repoSelect.addEventListener('change', function() {
|
||||||
|
clearTimeout(debounceTimer);
|
||||||
splitOwnerRepo();
|
splitOwnerRepo();
|
||||||
var labelSection = document.getElementById('label-section');
|
var labelSection = document.getElementById('label-section');
|
||||||
var labelList = document.getElementById('label-list');
|
var labelList = document.getElementById('label-list');
|
||||||
if (ownerInput.value && repoInput.value) {
|
if (ownerInput.value && repoInput.value && validRepos[repoSelect.value]) {
|
||||||
labelList.innerHTML = '<span class="empty">Loading labels...</span>';
|
labelList.innerHTML = '<span class="empty">Loading labels...</span>';
|
||||||
labelSection.style.display = 'block';
|
labelSection.style.display = 'block';
|
||||||
htmx.ajax('GET', '/issues/new/labels?owner=' + encodeURIComponent(ownerInput.value) + '&repo=' + encodeURIComponent(repoInput.value), {target: '#label-list', swap: 'innerHTML'});
|
htmx.ajax('GET', '/issues/new/labels?owner=' + encodeURIComponent(ownerInput.value) + '&repo=' + encodeURIComponent(repoInput.value), {target: '#label-list', swap: 'innerHTML'});
|
||||||
@@ -80,6 +106,12 @@
|
|||||||
formError.style.display = 'block';
|
formError.style.display = 'block';
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!validRepos[repoSelect.value]) {
|
||||||
|
evt.preventDefault();
|
||||||
|
formError.textContent = 'Please select a valid repository from the list.';
|
||||||
|
formError.style.display = 'block';
|
||||||
|
return false;
|
||||||
|
}
|
||||||
formError.style.display = 'none';
|
formError.style.display = 'none';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<span class="label" style="color:#{{.Color}};border:1px solid #{{.Color}}">{{.Name}}</span>
|
<span class="label" style="color:#{{.Color}};border:1px solid #{{.Color}}">{{.Name}}</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if .Assignee}}
|
{{if .Assignee}}
|
||||||
<span>{{.Assignee.Login}}</span>
|
<img src="{{.Assignee.AvatarURL}}" alt="{{.Assignee.Login}}" class="avatar" title="Assigned to {{.Assignee.Login}}">
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-meta">
|
<div class="card-meta">
|
||||||
<span class="type-badge type-pull">PR</span>
|
<span class="type-badge type-pull">PR</span>
|
||||||
<span class="state-open">{{.Pull.State}}</span>
|
{{if eq .Pull.State "closed"}}<span class="state-closed">{{.Pull.State}}</span>{{else}}<span class="state-open">{{.Pull.State}}</span>{{end}}
|
||||||
<span>{{.Pull.RepoOwner}}/{{.Pull.RepoName}} #{{.Pull.Number}}</span>
|
<span>{{.Pull.RepoOwner}}/{{.Pull.RepoName}} #{{.Pull.Number}}</span>
|
||||||
{{range .Pull.Labels}}
|
{{range .Pull.Labels}}
|
||||||
<span class="label" style="color:#{{.Color}};border:1px solid #{{.Color}}">{{.Name}}</span>
|
<span class="label" style="color:#{{.Color}};border:1px solid #{{.Color}}">{{.Name}}</span>
|
||||||
@@ -15,6 +15,17 @@
|
|||||||
<span class="diff-del">-{{.Pull.Deletions}}</span>
|
<span class="diff-del">-{{.Pull.Deletions}}</span>
|
||||||
{{if .Pull.Mergeable}}<span style="color:var(--accent-green);">Mergeable</span>{{end}}
|
{{if .Pull.Mergeable}}<span style="color:var(--accent-green);">Mergeable</span>{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
<div class="card-meta" style="margin-top:0.5rem;">
|
||||||
|
<span id="state-section">
|
||||||
|
{{if eq .Pull.State "closed"}}
|
||||||
|
<span class="state-closed" id="pull-state">{{.Pull.State}}</span>
|
||||||
|
<button class="btn btn-secondary" hx-post="/pulls/{{.Pull.RepoOwner}}/{{.Pull.RepoName}}/{{.Pull.Number}}/state" hx-vals='{"state":"open"}' hx-target="#state-section" hx-swap="innerHTML">Reopen PR</button>
|
||||||
|
{{else}}
|
||||||
|
<span class="state-open" id="pull-state">{{.Pull.State}}</span>
|
||||||
|
<button class="btn btn-danger" hx-post="/pulls/{{.Pull.RepoOwner}}/{{.Pull.RepoName}}/{{.Pull.Number}}/state" hx-vals='{"state":"closed"}' hx-target="#state-section" hx-swap="innerHTML">Close PR</button>
|
||||||
|
{{end}}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
{{if .RenderedBody}}
|
{{if .RenderedBody}}
|
||||||
<div class="card-body markdown-body">{{.RenderedBody}}</div>
|
<div class="card-body markdown-body">{{.RenderedBody}}</div>
|
||||||
{{else if .Pull.Body}}
|
{{else if .Pull.Body}}
|
||||||
|
|||||||
Reference in New Issue
Block a user