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

Add run status in action view page #23212

Merged
merged 4 commits into from
Mar 4, 2023
Merged

Add run status in action view page #23212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8727f1
add run status
yp05327 Mar 1, 2023
70c85bb
add vertical-align
yp05327 Mar 2, 2023
0aff1d3
change action status size
yp05327 Mar 2, 2023
3cf58ce
Merge branch 'main' into add-run-status-in-action-viwe-page
techknowlogick Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions routers/web/repo/actions/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type ViewResponse struct {
Run struct {
Link string `json:"link"`
Title string `json:"title"`
Status string `json:"status"`
CanCancel bool `json:"canCancel"`
CanApprove bool `json:"canApprove"` // the run needs an approval and the doer has permission to approve
Done bool `json:"done"`
Expand Down Expand Up @@ -111,6 +112,7 @@ func ViewPost(ctx *context_module.Context) {
resp.State.Run.CanApprove = run.NeedApproval && 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
resp.State.Run.Status = run.Status.String()
for _, v := range jobs {
resp.State.Run.Jobs = append(resp.State.Run.Jobs, &ViewJob{
ID: v.ID,
Expand Down
15 changes: 13 additions & 2 deletions web_src/js/components/RepoActionView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
<div class="action-view-container">
<div class="action-view-header">
<div class="action-info-summary">
{{ run.title }}
<SvgIcon name="octicon-check-circle-fill" size="20" class="green" v-if="run.status === 'success'"/>
<SvgIcon name="octicon-clock" size="20" class="ui text yellow" v-else-if="run.status === 'waiting'"/>
<SvgIcon name="octicon-meter" size="20" class="ui text yellow" class-name="job-status-rotate" v-else-if="run.status === 'running'"/>
<SvgIcon name="octicon-x-circle-fill" size="20" class="red" v-else/>
Comment on lines +5 to +8
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about separating a RunStatus component that takes as parameter the status (and perhaps others like size and extraClasses if we really need these differences)?
Then we automatically keep this one and the one below in sync…

Copy link
Contributor Author

@yp05327 yp05327 Mar 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good idea. How about merge this PR first, and I will try to do this in another PR.

PS: It seems that SvgIcon are not used in:
image
image
Are these codes removable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@delvh
#23259
I created a new PR to do this. I can merge it to this PR, if it looks good.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both OK from me to keep that PR standalone or merge it into this one.

<div class="action-title">
{{ run.title }}
</div>
<button class="run_approve" @click="approveRun()" v-if="run.canApprove">
<i class="play circle outline icon"/>
</button>
Expand Down Expand Up @@ -99,6 +105,7 @@ const sfc = {
run: {
link: '',
title: '',
status: '',
canCancel: false,
canApprove: false,
done: false,
Expand Down Expand Up @@ -327,7 +334,11 @@ export function initRepositoryActionView() {
.action-info-summary {
font-size: 150%;
height: 20px;
padding: 0 10px;
display: flex;

.action-title {
padding: 0 5px;
}
}

// ================
Expand Down