Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use relative url in actions view #22675

Merged
merged 3 commits into from Jan 31, 2023
Merged

Use relative url in actions view #22675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa2679b
fix: use relative url in actions view
wolfogre Jan 31, 2023
03fbe8c
Merge branch 'main' into bugfix/use_relative_in_actions
wolfogre Jan 31, 2023
4ab0601
Merge branch 'main' into bugfix/use_relative_in_actions
lunny Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions routers/web/repo/actions/view.go
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ type ViewRequest struct {
type ViewResponse struct {
State struct {
Run struct {
HTMLURL string `json:"htmlurl"`
Link string `json:"link"`
Title string `json:"title"`
CanCancel bool `json:"canCancel"`
Done bool `json:"done"`
Expand Down Expand Up @@ -105,7 +105,7 @@ func ViewPost(ctx *context_module.Context) {
resp := &ViewResponse{}

resp.State.Run.Title = run.Title
resp.State.Run.HTMLURL = run.HTMLURL()
resp.State.Run.Link = run.Link()
resp.State.Run.CanCancel = !run.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions)
resp.State.Run.Done = run.Status.IsDone()
resp.State.Run.Jobs = make([]*ViewJob, 0, len(jobs)) // marshal to '[]' instead fo 'null' in json
Expand Down
8 changes: 4 additions & 4 deletions web_src/js/components/RepoActionView.vue
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<div class="action-view-left">
<div class="job-group-section">
<div class="job-brief-list">
<a class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id" :href="run.htmlurl+'/jobs/'+index">
<a class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id" :href="run.link+'/jobs/'+index">
<SvgIcon name="octicon-check-circle-fill" class="green" v-if="job.status === 'success'"/>
<SvgIcon name="octicon-skip" class="ui text grey" v-else-if="job.status === 'skipped'"/>
<SvgIcon name="octicon-clock" class="ui text yellow" v-else-if="job.status === 'waiting'"/>
Expand Down Expand Up @@ -92,7 +92,7 @@ const sfc = {

// provided by backend
run: {
htmlurl: '',
link: '',
title: '',
canCancel: false,
done: false,
Expand Down Expand Up @@ -163,11 +163,11 @@ const sfc = {
},
// rerun a job
rerunJob(idx) {
this.fetch(`${this.run.htmlurl}/jobs/${idx}/rerun`);
this.fetch(`${this.run.link}/jobs/${idx}/rerun`);
},
// cancel a run
cancelRun() {
this.fetch(`${this.run.htmlurl}/cancel`);
this.fetch(`${this.run.link}/cancel`);
},

createLogLine(line) {
Expand Down