Skip to content

Commit b116249

Browse files
GiteaBotHesterGwxiaoguanglunny
authored
Fix actions frontend bugs (pagination, long name alignment) and small simplify (#23370) (#23436)
Backport #23370 by @HesterG 1 Right now on actions page, the action list will not be aligned if commit message is long. In this PR, the changes are: - The branch tag is moved to bottom row - Width percentage is given to make them aligned - Show "..." if commit is longer than two lines. - Align the status icon with the commit message with baseline Before: <img width="1068" alt="截屏2023-03-08 12 23 22" src="https://user-images.githubusercontent.com/17645053/223628534-6b9472cb-29f5-40a3-9714-c5152553049e.png"> After: <img width="756" alt="截屏2023-03-08 13 34 28" src="https://user-images.githubusercontent.com/17645053/223628571-da94698b-0e0a-43e3-ae82-34d8c780e5ba.png"> 2 Right now the actions list's pagination is not working properly because Param is not passed to pagination template, in this PR Param Strings are passed to the pager Before: <img width="1176" alt="截屏2023-03-08 12 23 50" src="https://user-images.githubusercontent.com/17645053/223629207-8b67ce74-2342-4259-bc81-036e37752716.png"> After: <img width="1343" alt="截屏2023-03-08 13 11 54" src="https://user-images.githubusercontent.com/17645053/223629321-4f538f8a-45dc-4d6f-ae60-2c82680ae3e7.png"> 3 A small simplify in `RepoActionView.vue` . Co-authored-by: Hester Gong <[email protected]> Co-authored-by: wxiaoguang <[email protected]> Co-authored-by: Lunny Xiao <[email protected]>
1 parent 41655ee commit b116249

File tree

5 files changed

+27
-9
lines changed

5 files changed

+27
-9
lines changed

routers/web/repo/actions/actions.go

+2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ func List(ctx *context.Context) {
133133

134134
pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5)
135135
pager.SetDefaultParams(ctx)
136+
pager.AddParamString("workflow", workflow)
137+
pager.AddParamString("state", ctx.FormString("state"))
136138
ctx.Data["Page"] = pager
137139

138140
ctx.HTML(http.StatusOK, tplListActions)

templates/repo/actions/runs_list.tmpl

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<div class="issue list">
22
{{range .Runs}}
3-
<li class="item gt-df gt-py-3">
3+
<li class="item gt-df gt-py-3 gt-ab">
44
<div class="issue-item-left gt-df">
55
{{template "repo/actions/status" .Status}}
66
</div>
7-
<div class="issue-item-main gt-f1 gt-fc gt-df">
7+
<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
88
<div class="issue-item-top-row">
9-
<a class="index gt-ml-0 gt-mr-2" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
9+
<a class="index gt-ml-0 gt-mr-2" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
1010
{{- .Title -}}
1111
</a>
12+
</div>
13+
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
14+
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>: {{$.locale.Tr "actions.runs.commit"}}
15+
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>{{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}}
1216
<span class="ui label">
1317
{{if .RefLink}}
1418
<a href="{{.RefLink}}">{{.PrettyRef}}</a>
@@ -17,10 +21,6 @@
1721
{{end}}
1822
</span>
1923
</div>
20-
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
21-
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>: {{$.locale.Tr "actions.runs.commit"}}
22-
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>&nbsp; {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName | Escape}}
23-
</div>
2424
</div>
2525
<div class="issue-item-right">
2626
<div>{{TimeSinceUnix .Updated $.locale}}</div>

web_src/js/components/RepoActionView.vue

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
<div class="job-step-container">
4343
<div class="job-step-section" v-for="(jobStep, i) in currentJob.steps" :key="i">
4444
<div class="job-step-summary" @click.stop="toggleStepLogs(i)">
45-
<SvgIcon name="octicon-chevron-down" class="gt-mr-3" v-show="currentJobStepsStates[i].expanded"/>
46-
<SvgIcon name="octicon-chevron-right" class="gt-mr-3" v-show="!currentJobStepsStates[i].expanded"/>
45+
<SvgIcon :name="currentJobStepsStates[i].expanded ? 'octicon-chevron-down': 'octicon-chevron-right'" class="gt-mr-3"/>
4746

4847
<SvgIcon name="octicon-check-circle-fill" class="green gt-mr-3" v-if="jobStep.status === 'success'"/>
4948
<SvgIcon name="octicon-skip" class="ui text grey gt-mr-3" v-else-if="jobStep.status === 'skipped'"/>

web_src/less/helpers.less

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
.gt-dif { display: inline-flex !important; }
44
.gt-dib { display: inline-block !important; }
55
.gt-ac { align-items: center !important; }
6+
.gt-ab { align-items: baseline !important; }
67
.gt-tc { text-align: center !important; }
78
.gt-tl { text-align: left !important; }
89
.gt-tdn { text-decoration: none !important; }

web_src/less/shared/issuelist.less

+16
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,29 @@
2323
.issue-item-main {
2424
width: 100%;
2525
}
26+
27+
.action-item-main {
28+
width: 80%;
29+
}
30+
31+
.issue-item-right {
32+
width: 15%;
33+
}
2634

2735
.issue-item-top-row {
2836
max-width: 100%;
2937
color: var(--color-text);
3038
font-size: 16px;
3139
min-width: 0;
3240
font-weight: 600;
41+
a.index {
42+
max-width: fit-content;
43+
display: -webkit-box;
44+
-webkit-box-orient: vertical;
45+
-webkit-line-clamp: 2;
46+
overflow: hidden;
47+
word-break:break-all;
48+
}
3349
}
3450

3551
.labels-list {

0 commit comments

Comments
 (0)