MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-07 02:39:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use same action status svg icons on actions list as on action page (#24178)

Browse source 
Close #24020 

After:

These icons are the same now:

<img width="1287" alt="截屏2023-04-18 13 52 11"
src="https://user-images.githubusercontent.com/17645053/232684252-05ddc101-dc5b-41b5-b374-132c3d853a41.png">

<img width="1141" alt="截屏2023-04-18 13 54 48"
src="https://user-images.githubusercontent.com/17645053/232684261-6ebd864a-a9aa-4982-af32-2cea91c35be8.png">


In this PR, didn't use `ActionRunStatus.vue` because the mounting of the
component will cause flash of the icons like below:

https://user-images.githubusercontent.com/17645053/232682646-713202dc-9023-4b9c-a849-c3a1ae6dd155.mov

Instead, modified and used `status.tmpl` to make it the same as
`ActionRunStatus.vue` to avoid the ui flash (Welcomed to show how to use
`ActionRunStatus.vue` without flashing if there is a way).
Added comments to both of them for reminding synchronization of these
two files.

---------

Co-authored-by: Jason Song <i@wolfogre.com>
This commit is contained in:
Hester Gong 2023-04-19 13:42:53 +08:00 committed by GitHub
parent 5fcf328a8d
commit 5e7543fcf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/repo/actions/runs_list.tmpl
View file

@ -1,8 +1,8 @@
<div class="issue list"> <div class="issue list">
{{range .Runs}} {{range .Runs}}
<li class="item gt-df gt-py-3 gt-ab"> <li class="item gt-df gt-py-3 gt-ab">
<div class="issue-item-left gt-df"> <div class="issue-item-left gt-df gt-mr-2">
{{template "repo/actions/status" .Status}} {{template "repo/actions/status" (dict "status" .Status.String)}}
</div> </div>
<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3"> <div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
<div class="issue-item-top-row"> <div class="issue-item-top-row">

36
templates/repo/actions/status.tmpl
View file

@ -1,12 +1,26 @@
{{if .IsWaiting}} <!-- This template should be kept the same as web_src/js/components/ActionRunStatus.vue
<i class="commit-status circle icon gray"></i> Please also update the vue file above if this template is modified.
{{end}} -->
{{if .IsRunning}} {{- $size := 16 -}}
<i class="commit-status circle icon yellow"></i> {{- if .size -}}
{{end}} {{- $size = .size -}}
{{if .IsSuccess}} {{- end -}}
<i class="commit-status check icon green"></i>
{{end}} {{- $className := "" -}}
{{if .IsFailure}} {{- if .className -}}
<i class="commit-status warning icon red"></i> {{- $className = .className -}}
{{- end -}}
{{if eq .status "success"}}
{{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}}
{{else if eq .status "skipped"}}
{{svg "octicon-skip" $size (printf "text grey %s" $className)}}
{{else if eq .status "waiting"}}
{{svg "octicon-clock" $size (printf "text yellow %s" $className)}}
{{else if eq .status "blocked"}}
{{svg "octicon-blocked" $size (printf "text yellow %s" $className)}}
{{else if eq .status "running"}}
{{svg "octicon-meter" $size (printf "text yellow job-status-rotate %s" $className)}}
{{else}}
{{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}}
{{end}} {{end}}

15
web_src/js/components/ActionRunStatus.vue
View file

@ -1,10 +1,13 @@
<!-- This vue should be kept the same as templates/repo/actions/status.tmpl
Please also update the template file above if this vue is modified.
-->
<template> <template>
<SvgIcon name="octicon-check-circle-fill" class="ui text green" :size="size" :class-name="className" v-if="status === 'success'"/> <SvgIcon name="octicon-check-circle-fill" class="text green" :size="size" :class-name="className" v-if="status === 'success'"/>
<SvgIcon name="octicon-skip" class="ui text grey" :size="size" :class-name="className" v-else-if="status === 'skipped'"/> <SvgIcon name="octicon-skip" class="text grey" :size="size" :class-name="className" v-else-if="status === 'skipped'"/>
<SvgIcon name="octicon-clock" class="ui text yellow" :size="size" :class-name="className" v-else-if="status === 'waiting'"/> <SvgIcon name="octicon-clock" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'waiting'"/>
<SvgIcon name="octicon-blocked" class="ui text yellow" :size="size" :class-name="className" v-else-if="status === 'blocked'"/> <SvgIcon name="octicon-blocked" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'blocked'"/>
<SvgIcon name="octicon-meter" class="ui text yellow" :size="size" :class-name="'job-status-rotate ' + className" v-else-if="status === 'running'"/> <SvgIcon name="octicon-meter" class="text yellow" :size="size" :class-name="'job-status-rotate ' + className" v-else-if="status === 'running'"/>
<SvgIcon name="octicon-x-circle-fill" class="ui text red" :size="size" v-else/> <SvgIcon name="octicon-x-circle-fill" class="text red" :size="size" v-else/>
</template> </template>
<script> <script>