Skip to content

Fix actions frontend bugs (pagination, long name alignment) and small simplify #23370

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

Merged
merged 17 commits into from
Mar 13, 2023
Merged

Fix actions frontend bugs (pagination, long name alignment) and small simplify #23370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b7d9974
save changes
HesterG Mar 8, 2023
4e97208
save css
HesterG Mar 8, 2023
5f40459
fix pagination for actions
HesterG Mar 8, 2023
a870709
add margin to action item main
HesterG Mar 8, 2023
235ed84
put back
HesterG Mar 8, 2023
2aa8b27
remove print
HesterG Mar 8, 2023
d05fb67
uncommit change
HesterG Mar 8, 2023
d7bde25
Merge branch 'go-gitea:main' into improve-action-fe
HesterG Mar 8, 2023
9c48b31
change branch tag position
HesterG Mar 8, 2023
bd72a3b
remove unnecessary change
HesterG Mar 8, 2023
7c4a57a
Update templates/repo/actions/runs_list.tmpl
HesterG Mar 8, 2023
839651e
change classname and tune selector
HesterG Mar 8, 2023
038e4b5
remove ' '
HesterG Mar 8, 2023
15297ad
remove escape
HesterG Mar 8, 2023
632e5e1
Merge branch 'main' into improve-action-fe
HesterG Mar 9, 2023
14655d8
Merge branch 'main' into improve-action-fe
HesterG Mar 10, 2023
60c0b06
Merge branch 'main' into improve-action-fe
lunny Mar 13, 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/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ func List(ctx *context.Context) {

pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5)
pager.SetDefaultParams(ctx)
pager.AddParamString("workflow", workflow)
pager.AddParamString("state", ctx.FormString("state"))
ctx.Data["Page"] = pager

ctx.HTML(http.StatusOK, tplListActions)
Expand Down
14 changes: 7 additions & 7 deletions templates/repo/actions/runs_list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<div class="issue list">
{{range .Runs}}
<li class="item gt-df gt-py-3">
<li class="item gt-df gt-py-3 gt-ab">
<div class="issue-item-left gt-df">
{{template "repo/actions/status" .Status}}
</div>
<div class="issue-item-main gt-f1 gt-fc gt-df">
<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
<div class="issue-item-top-row">
<a class="index gt-ml-0 gt-mr-2" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
<a class="index gt-ml-0 gt-mr-2" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
{{- .Title -}}
</a>
</div>
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>: {{$.locale.Tr "actions.runs.commit"}}
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>{{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}}
<span class="ui label">
{{if .RefLink}}
<a href="{{.RefLink}}">{{.PrettyRef}}</a>
Expand All @@ -17,10 +21,6 @@
{{end}}
</span>
</div>
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>: {{$.locale.Tr "actions.runs.commit"}}
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>&nbsp; {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName | Escape}}
</div>
</div>
<div class="issue-item-right">
<div>{{TimeSinceUnix .Updated $.locale}}</div>
Expand Down
3 changes: 1 addition & 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 @@ -43,8 +43,7 @@
<div class="job-step-container">
<div class="job-step-section" v-for="(jobStep, i) in currentJob.steps" :key="i">
<div class="job-step-summary" @click.stop="toggleStepLogs(i)">
<SvgIcon name="octicon-chevron-down" class="gt-mr-3" v-show="currentJobStepsStates[i].expanded"/>
<SvgIcon name="octicon-chevron-right" class="gt-mr-3" v-show="!currentJobStepsStates[i].expanded"/>
<SvgIcon :name="currentJobStepsStates[i].expanded ? 'octicon-chevron-down': 'octicon-chevron-right'" class="gt-mr-3"/>

<ActionRunStatus :status="jobStep.status" class="gt-mr-3"/>

Expand Down
1 change: 1 addition & 0 deletions web_src/less/helpers.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.gt-dif { display: inline-flex !important; }
.gt-dib { display: inline-block !important; }
.gt-ac { align-items: center !important; }
.gt-ab { align-items: baseline !important; }
.gt-tc { text-align: center !important; }
.gt-tl { text-align: left !important; }
.gt-tdn { text-decoration: none !important; }
Expand Down
16 changes: 16 additions & 0 deletions web_src/less/shared/issuelist.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,29 @@
.issue-item-main {
width: 100%;
}

.action-item-main {
width: 80%;
}

.issue-item-right {
width: 15%;
}

.issue-item-top-row {
max-width: 100%;
color: var(--color-text);
font-size: 16px;
min-width: 0;
font-weight: 600;
a.index {
max-width: fit-content;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
word-break:break-all;
}
}

.labels-list {
Expand Down