git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

Add job.duration in web ui (#23963)

Browse source 
![image](https://user-images.githubusercontent.com/18380374/230532947-271ac389-8134-4c5e-8f2f-ced4a4fd0ebe.png)

![image](https://user-images.githubusercontent.com/18380374/230532963-e76532c5-7ca1-4b01-ae77-cc1223350fe7.png)

Maybe we can change the location of it.
This commit is contained in:
yp05327 2023-04-08 07:20:50 +09:00 • committed by GitHub
commit 68aac691c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
routers/web/repo/actions/view.go
View file

@ -75,6 +75,7 @@ type ViewJob struct {
Name string `json:"name"` Name string `json:"name"`
Status string `json:"status"` Status string `json:"status"`
CanRerun bool `json:"canRerun"` CanRerun bool `json:"canRerun"`
Duration string `json:"duration"`
} }
type ViewCommit struct { type ViewCommit struct {
@ -144,6 +145,7 @@ func ViewPost(ctx *context_module.Context) {
Name: v.Name, Name: v.Name,
Status: v.Status.String(), Status: v.Status.String(),
CanRerun: v.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions), CanRerun: v.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions),
Duration: v.Duration().String(),
}) })
} }

6
web_src/js/components/RepoActionView.vue
View file

@ -32,6 +32,7 @@
<ActionRunStatus :status="job.status"/> <ActionRunStatus :status="job.status"/>
<span class="ui text gt-mx-3">{{ job.name }}</span> <span class="ui text gt-mx-3">{{ job.name }}</span>
</a> </a>
<span class="step-summary-duration">{{ job.duration }}</span>
<button class="job-brief-rerun" @click="rerunJob(index)" v-if="job.canRerun"> <button class="job-brief-rerun" @click="rerunJob(index)" v-if="job.canRerun">
<SvgIcon name="octicon-sync" class="ui text black"/> <SvgIcon name="octicon-sync" class="ui text black"/>
</button> </button>
@ -57,7 +58,7 @@
<ActionRunStatus :status="jobStep.status" class="gt-mr-3"/> <ActionRunStatus :status="jobStep.status" class="gt-mr-3"/>
<span class="step-summary-msg">{{ jobStep.summary }}</span> <span class="step-summary-msg">{{ jobStep.summary }}</span>
<span class="step-summary-dur">{{ jobStep.duration }}</span> <span class="step-summary-duration">{{ jobStep.duration }}</span>
</div> </div>
<!-- the log elements could be a lot, do not use v-if to destroy/reconstruct the DOM --> <!-- the log elements could be a lot, do not use v-if to destroy/reconstruct the DOM -->
@ -112,6 +113,7 @@ const sfc = {
// name: '', // name: '',
// status: '', // status: '',
// canRerun: false, // canRerun: false,
// duration: '',
// }, // },
], ],
commit: { commit: {
@ -492,7 +494,7 @@ export function ansiLogToHTML(line) {
flex: 1; flex: 1;
} }
.job-step-container .job-step-summary .step-summary-dur { .job-step-container .job-step-summary .step-summary-duration {
margin-left: 16px; margin-left: 16px;
} }