From 452b57563b72326a35aa5e1f72d5d92369110b63 Mon Sep 17 00:00:00 2001
From: Jason Song <i@wolfogre.com>
Date: Tue, 11 Apr 2023 18:49:12 +0800
Subject: [PATCH 1/7] feat: share icons

---
 templates/repo/actions/runs_list.tmpl     |  2 +-
 templates/repo/actions/status.tmpl        | 12 ------------
 web_src/js/components/ActionRunStatus.vue | 18 +++++++++++++++++-
 web_src/js/index.js                       |  2 ++
 4 files changed, 20 insertions(+), 14 deletions(-)
 delete mode 100644 templates/repo/actions/status.tmpl

diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index a28b9d71378b5..5d4f66c4f0299 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -2,7 +2,7 @@
 	{{range .Runs}}
 		<li class="item gt-df gt-py-3 gt-ab">
 			<div class="issue-item-left gt-df">
-				{{template "repo/actions/status" .Status}}
+				<div class="action-run-status" data-status="{{.Status.String}}" data-size="20"></div>
 			</div>
 			<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
 				<div class="issue-item-top-row">
diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl
deleted file mode 100644
index fd8a683bda0f4..0000000000000
--- a/templates/repo/actions/status.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{if .IsWaiting}}
-	<i class="commit-status circle icon gray"></i>
-{{end}}
-{{if .IsRunning}}
-	<i class="commit-status circle icon yellow"></i>
-{{end}}
-{{if .IsSuccess}}
-	<i class="commit-status check icon green"></i>
-{{end}}
-{{if .IsFailure}}
-	<i class="commit-status warning icon red"></i>
-{{end}}
diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index b72dfb1aa699e..3a41911c3413f 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -9,8 +9,9 @@
 
 <script>
 import {SvgIcon} from '../svg.js';
+import {createApp} from 'vue';
 
-export default {
+const sfc = {
   components: {SvgIcon},
   props: {
     status: {
@@ -27,4 +28,19 @@ export default {
     }
   },
 };
+
+export default sfc;
+
+export function initActionRunStatus() {
+  const els = document.getElementsByClassName('action-run-status');
+  if (!els) return;
+  for (const el of els) {
+    const view = createApp(sfc, {
+      status: el.getAttribute('data-status'),
+      size: el.getAttribute('data-size'),
+      className: el.getAttribute('data-class-name'),
+    });
+    view.mount(el);
+  }
+}
 </script>
diff --git a/web_src/js/index.js b/web_src/js/index.js
index f7cbb24e8562e..5b76b23c59fd5 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -77,6 +77,7 @@ import {initRepoCommentForm, initRepository} from './features/repo-legacy.js';
 import {initCopyContent} from './features/copycontent.js';
 import {initCaptcha} from './features/captcha.js';
 import {initRepositoryActionView} from './components/RepoActionView.vue';
+import {initActionRunStatus} from './components/ActionRunStatus.vue';
 import {initGlobalTooltips} from './modules/tippy.js';
 import {initGiteaFomantic} from './modules/fomantic.js';
 import {onDomReady} from './utils/dom.js';
@@ -165,6 +166,7 @@ onDomReady(() => {
   initRepoWikiForm();
   initRepository();
   initRepositoryActionView();
+  initActionRunStatus();
 
   initCommitStatuses();
   initCaptcha();

From 8eb63c869eee53dd9280999a147221383d667bdf Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 18 Apr 2023 11:49:40 +0800
Subject: [PATCH 2/7] use template

---
 templates/repo/actions/runs_list.tmpl     |  4 ++--
 templates/repo/actions/status.tmpl        | 13 +++++++++++++
 web_src/css/shared/issuelist.css          |  5 +++++
 web_src/js/components/ActionRunStatus.vue | 18 +-----------------
 web_src/js/index.js                       |  2 --
 5 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 templates/repo/actions/status.tmpl

diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index 5d4f66c4f0299..709bfaaced2c4 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -1,8 +1,8 @@
 <div class="issue list">
 	{{range .Runs}}
 		<li class="item gt-df gt-py-3 gt-ab">
-			<div class="issue-item-left gt-df">
-				<div class="action-run-status" data-status="{{.Status.String}}" data-size="20"></div>
+			<div class="issue-item-left gt-df gt-mr-2">
+				{{template "repo/actions/status" (dict "status" .Status.String)}}
 			</div>
 			<div class="issue-item-main action-item-main gt-f1 gt-fc gt-df gt-mr-3">
 				<div class="issue-item-top-row">
diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl
new file mode 100644
index 0000000000000..9a24ef1b052a3
--- /dev/null
+++ b/templates/repo/actions/status.tmpl
@@ -0,0 +1,13 @@
+{{if eq .status "success"}}
+    {{svg "octicon-check-circle-fill" 16 "ui text green"}}
+{{else if eq .status "skipped"}}
+    {{svg "octicon-skip" 16 "ui text grey"}}
+{{else if eq .status "waiting"}}
+    {{svg "octicon-clock" 16 "ui text yellow"}}
+{{else if eq .status "blocked"}}
+    {{svg "octicon-blocked" 16 "ui text yellow"}}
+{{else if eq .status "running"}}
+    {{svg "octicon-meter" 16 "ui text yellow job-status-rotate"}}
+{{else}}
+    {{svg "octicon-x-circle-fill" 16 "ui text red"}}
+{{end}}
\ No newline at end of file
diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css
index 26affd98a093d..5681f35d0411d 100644
--- a/web_src/css/shared/issuelist.css
+++ b/web_src/css/shared/issuelist.css
@@ -161,3 +161,8 @@
 .issue.list > .item + .item {
   border-top: 1px solid var(--color-secondary);
 }
+
+.action-run-status {
+  height: 16px;
+  width: 16px;
+}
\ No newline at end of file
diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index 3a41911c3413f..7808419a4576f 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -9,9 +9,8 @@
 
 <script>
 import {SvgIcon} from '../svg.js';
-import {createApp} from 'vue';
 
-const sfc = {
+export default sfc = {
   components: {SvgIcon},
   props: {
     status: {
@@ -28,19 +27,4 @@ const sfc = {
     }
   },
 };
-
-export default sfc;
-
-export function initActionRunStatus() {
-  const els = document.getElementsByClassName('action-run-status');
-  if (!els) return;
-  for (const el of els) {
-    const view = createApp(sfc, {
-      status: el.getAttribute('data-status'),
-      size: el.getAttribute('data-size'),
-      className: el.getAttribute('data-class-name'),
-    });
-    view.mount(el);
-  }
-}
 </script>
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 5b76b23c59fd5..f7cbb24e8562e 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -77,7 +77,6 @@ import {initRepoCommentForm, initRepository} from './features/repo-legacy.js';
 import {initCopyContent} from './features/copycontent.js';
 import {initCaptcha} from './features/captcha.js';
 import {initRepositoryActionView} from './components/RepoActionView.vue';
-import {initActionRunStatus} from './components/ActionRunStatus.vue';
 import {initGlobalTooltips} from './modules/tippy.js';
 import {initGiteaFomantic} from './modules/fomantic.js';
 import {onDomReady} from './utils/dom.js';
@@ -166,7 +165,6 @@ onDomReady(() => {
   initRepoWikiForm();
   initRepository();
   initRepositoryActionView();
-  initActionRunStatus();
 
   initCommitStatuses();
   initCaptcha();

From d92d586b819a2fb930b36c07a758a8b8ae00cb12 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 18 Apr 2023 11:52:00 +0800
Subject: [PATCH 3/7] remove unnecessary change

---
 web_src/js/components/ActionRunStatus.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index 7808419a4576f..b72dfb1aa699e 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -10,7 +10,7 @@
 <script>
 import {SvgIcon} from '../svg.js';
 
-export default sfc = {
+export default {
   components: {SvgIcon},
   props: {
     status: {

From 2773e9248af96d40bba98782d0a8d7b2d6dac6c1 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 18 Apr 2023 13:25:04 +0800
Subject: [PATCH 4/7] update template

---
 templates/repo/actions/status.tmpl        | 27 +++++++++++++++++------
 web_src/css/shared/issuelist.css          |  5 -----
 web_src/js/components/ActionRunStatus.vue |  3 +++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl
index 9a24ef1b052a3..1cff5a546f8f8 100644
--- a/templates/repo/actions/status.tmpl
+++ b/templates/repo/actions/status.tmpl
@@ -1,13 +1,26 @@
+<!-- This template should be kept the same as web_src/js/components/ActionRunStatus.vue 
+    Please also update the vue file above if this template is modified.
+-->
+{{- $size := 16 -}}
+{{- if .size -}}
+{{- $size = .size -}}
+{{- end -}}
+
+{{- $className := "" -}}
+{{- if .className -}}
+{{- $className = .className -}}
+{{- end -}}
+
 {{if eq .status "success"}}
-    {{svg "octicon-check-circle-fill" 16 "ui text green"}}
+    {{svg "octicon-check-circle-fill" $size (printf "ui text green %s" $className)}}
 {{else if eq .status "skipped"}}
-    {{svg "octicon-skip" 16 "ui text grey"}}
+    {{svg "octicon-skip" $size (printf "ui text grey %s" $className)}}
 {{else if eq .status "waiting"}}
-    {{svg "octicon-clock" 16 "ui text yellow"}}
+    {{svg "octicon-clock" $size (printf "ui text yellow %s" $className)}}
 {{else if eq .status "blocked"}}
-    {{svg "octicon-blocked" 16 "ui text yellow"}}
+    {{svg "octicon-blocked" $size (printf "ui text yellow %s" $className)}}
 {{else if eq .status "running"}}
-    {{svg "octicon-meter" 16 "ui text yellow job-status-rotate"}}
+    {{svg "octicon-meter" $size (printf "ui text yellow job-status-rotate %s" $className)}}
 {{else}}
-    {{svg "octicon-x-circle-fill" 16 "ui text red"}}
-{{end}}
\ No newline at end of file
+    {{svg "octicon-x-circle-fill" $size (printf "ui text red %s" $className)}}
+{{end}}
diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css
index 5681f35d0411d..26affd98a093d 100644
--- a/web_src/css/shared/issuelist.css
+++ b/web_src/css/shared/issuelist.css
@@ -161,8 +161,3 @@
 .issue.list > .item + .item {
   border-top: 1px solid var(--color-secondary);
 }
-
-.action-run-status {
-  height: 16px;
-  width: 16px;
-}
\ No newline at end of file
diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index b72dfb1aa699e..08b1a2864b8fd 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -1,3 +1,6 @@
+<!-- This vue should be kept the same as templates/repo/actions/status.tmpl
+    Please also update the template file above if this template is modified.
+-->
 <template>
   <SvgIcon name="octicon-check-circle-fill" class="ui 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'"/>

From b76a4c6388bf8d0190c594fbc93117c8569be098 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 18 Apr 2023 14:43:29 +0800
Subject: [PATCH 5/7] fix typo

---
 web_src/js/components/ActionRunStatus.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index 08b1a2864b8fd..9cc48c939937f 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -1,5 +1,5 @@
 <!-- This vue should be kept the same as templates/repo/actions/status.tmpl
-    Please also update the template file above if this template is modified.
+    Please also update the template file above if this vue is modified.
 -->
 <template>
   <SvgIcon name="octicon-check-circle-fill" class="ui text green" :size="size" :class-name="className" v-if="status === 'success'"/>

From 203c7659d24207b995e381519706f8fe0780391d Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 18 Apr 2023 14:46:09 +0800
Subject: [PATCH 6/7] fix lint

---
 templates/repo/actions/status.tmpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl
index 1cff5a546f8f8..9ee92d4a4ff48 100644
--- a/templates/repo/actions/status.tmpl
+++ b/templates/repo/actions/status.tmpl
@@ -1,5 +1,5 @@
-<!-- This template should be kept the same as web_src/js/components/ActionRunStatus.vue 
-    Please also update the vue file above if this template is modified.
+<!-- This template should be kept the same as web_src/js/components/ActionRunStatus.vue
+	Please also update the vue file above if this template is modified.
 -->
 {{- $size := 16 -}}
 {{- if .size -}}
@@ -12,15 +12,15 @@
 {{- end -}}
 
 {{if eq .status "success"}}
-    {{svg "octicon-check-circle-fill" $size (printf "ui text green %s" $className)}}
+	{{svg "octicon-check-circle-fill" $size (printf "ui text green %s" $className)}}
 {{else if eq .status "skipped"}}
-    {{svg "octicon-skip" $size (printf "ui text grey %s" $className)}}
+	{{svg "octicon-skip" $size (printf "ui text grey %s" $className)}}
 {{else if eq .status "waiting"}}
-    {{svg "octicon-clock" $size (printf "ui text yellow %s" $className)}}
+	{{svg "octicon-clock" $size (printf "ui text yellow %s" $className)}}
 {{else if eq .status "blocked"}}
-    {{svg "octicon-blocked" $size (printf "ui text yellow %s" $className)}}
+	{{svg "octicon-blocked" $size (printf "ui text yellow %s" $className)}}
 {{else if eq .status "running"}}
-    {{svg "octicon-meter" $size (printf "ui text yellow job-status-rotate %s" $className)}}
+	{{svg "octicon-meter" $size (printf "ui text yellow job-status-rotate %s" $className)}}
 {{else}}
-    {{svg "octicon-x-circle-fill" $size (printf "ui text red %s" $className)}}
+	{{svg "octicon-x-circle-fill" $size (printf "ui text red %s" $className)}}
 {{end}}

From 28a20ba40d82b55d506dc0f2ba9fbc288d7744e3 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Wed, 19 Apr 2023 09:02:51 +0800
Subject: [PATCH 7/7] remove ui

---
 templates/repo/actions/status.tmpl        | 12 ++++++------
 web_src/js/components/ActionRunStatus.vue | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl
index 9ee92d4a4ff48..794f7811eef2b 100644
--- a/templates/repo/actions/status.tmpl
+++ b/templates/repo/actions/status.tmpl
@@ -12,15 +12,15 @@
 {{- end -}}
 
 {{if eq .status "success"}}
-	{{svg "octicon-check-circle-fill" $size (printf "ui text green %s" $className)}}
+	{{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}}
 {{else if eq .status "skipped"}}
-	{{svg "octicon-skip" $size (printf "ui text grey %s" $className)}}
+	{{svg "octicon-skip" $size (printf "text grey %s" $className)}}
 {{else if eq .status "waiting"}}
-	{{svg "octicon-clock" $size (printf "ui text yellow %s" $className)}}
+	{{svg "octicon-clock" $size (printf "text yellow %s" $className)}}
 {{else if eq .status "blocked"}}
-	{{svg "octicon-blocked" $size (printf "ui text yellow %s" $className)}}
+	{{svg "octicon-blocked" $size (printf "text yellow %s" $className)}}
 {{else if eq .status "running"}}
-	{{svg "octicon-meter" $size (printf "ui text yellow job-status-rotate %s" $className)}}
+	{{svg "octicon-meter" $size (printf "text yellow job-status-rotate %s" $className)}}
 {{else}}
-	{{svg "octicon-x-circle-fill" $size (printf "ui text red %s" $className)}}
+	{{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}}
 {{end}}
diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index 9cc48c939937f..8a96eb5f01d2f 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -2,12 +2,12 @@
     Please also update the template file above if this vue is modified.
 -->
 <template>
-  <SvgIcon name="octicon-check-circle-fill" class="ui 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-clock" class="ui 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-meter" class="ui 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-check-circle-fill" class="text green" :size="size" :class-name="className" v-if="status === 'success'"/>
+  <SvgIcon name="octicon-skip" class="text grey" :size="size" :class-name="className" v-else-if="status === 'skipped'"/>
+  <SvgIcon name="octicon-clock" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'waiting'"/>
+  <SvgIcon name="octicon-blocked" class="text yellow" :size="size" :class-name="className" v-else-if="status === 'blocked'"/>
+  <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="text red" :size="size" v-else/>
 </template>
 
 <script>