From a02d904e6f75677c2a661c5c00a29c6abea8dc73 Mon Sep 17 00:00:00 2001
From: sillyguodong <gedong_1994@163.com>
Date: Thu, 29 Feb 2024 14:28:48 +0800
Subject: [PATCH 1/4] set pre-step status to cancelled if job is skipped

---
 modules/actions/task_state.go             | 3 +++
 web_src/js/components/ActionRunStatus.vue | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go
index cbbc0b357d21f..5b1bf8f95b7f8 100644
--- a/modules/actions/task_state.go
+++ b/modules/actions/task_state.go
@@ -35,6 +35,9 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep {
 	} else if task.Status.IsDone() {
 		preStep.Stopped = task.Stopped
 		preStep.Status = actions_model.StatusFailure
+		if task.Job.Status == actions_model.StatusSkipped {
+			preStep.Status = actions_model.StatusCancelled
+		}
 	}
 	logIndex += preStep.LogLength
 
diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index 51a7745431792..932f15117f89e 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -30,10 +30,10 @@ export default {
 <template>
   <span class="gt-df gt-ac" :data-tooltip-content="localeStatus" v-if="status">
     <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-skip" class="text grey" :size="size" :class-name="className" v-else-if="['skipped', 'cancelled'].includes(status)"/>
     <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-if="['failure', 'cancelled', 'unknown'].includes(status)"/>
+    <SvgIcon name="octicon-x-circle-fill" class="text red" :size="size" v-else-if="['failure', 'unknown'].includes(status)"/>
   </span>
 </template>

From 1a03e4b33c8abf23ca879800e0e4c5298deb2955 Mon Sep 17 00:00:00 2001
From: sillyguodong <gedong_1994@163.com>
Date: Thu, 29 Feb 2024 15:39:33 +0800
Subject: [PATCH 2/4] test

---
 modules/actions/task_state_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/actions/task_state_test.go b/modules/actions/task_state_test.go
index 3a599fbcbd2b0..46d7856b1f86f 100644
--- a/modules/actions/task_state_test.go
+++ b/modules/actions/task_state_test.go
@@ -82,6 +82,9 @@ func TestFullSteps(t *testing.T) {
 				Started:   10000,
 				Stopped:   10100,
 				LogLength: 100,
+				Job: &actions_model.ActionRunJob{
+					Status: actions_model.StatusFailure,
+				},
 			},
 			want: []*actions_model.ActionTaskStep{
 				{Name: preStepName, Status: actions_model.StatusFailure, LogIndex: 0, LogLength: 100, Started: 10000, Stopped: 10100},

From 0ec7ee9bc82872d223417b7813b7f6dcff7bdb35 Mon Sep 17 00:00:00 2001
From: sillyguodong <gedong_1994@163.com>
Date: Thu, 29 Feb 2024 19:00:03 +0800
Subject: [PATCH 3/4] fix

---
 modules/actions/task_state.go      | 4 ++--
 modules/actions/task_state_test.go | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/actions/task_state.go b/modules/actions/task_state.go
index 5b1bf8f95b7f8..fe925bbb5d987 100644
--- a/modules/actions/task_state.go
+++ b/modules/actions/task_state.go
@@ -35,8 +35,8 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep {
 	} else if task.Status.IsDone() {
 		preStep.Stopped = task.Stopped
 		preStep.Status = actions_model.StatusFailure
-		if task.Job.Status == actions_model.StatusSkipped {
-			preStep.Status = actions_model.StatusCancelled
+		if task.Status.IsSkipped() {
+			preStep.Status = actions_model.StatusSkipped
 		}
 	}
 	logIndex += preStep.LogLength
diff --git a/modules/actions/task_state_test.go b/modules/actions/task_state_test.go
index 46d7856b1f86f..3a599fbcbd2b0 100644
--- a/modules/actions/task_state_test.go
+++ b/modules/actions/task_state_test.go
@@ -82,9 +82,6 @@ func TestFullSteps(t *testing.T) {
 				Started:   10000,
 				Stopped:   10100,
 				LogLength: 100,
-				Job: &actions_model.ActionRunJob{
-					Status: actions_model.StatusFailure,
-				},
 			},
 			want: []*actions_model.ActionTaskStep{
 				{Name: preStepName, Status: actions_model.StatusFailure, LogIndex: 0, LogLength: 100, Started: 10000, Stopped: 10100},

From 205bd751168ba4eddc0a54b4e870e6064cd56509 Mon Sep 17 00:00:00 2001
From: sillyguodong <gedong_1994@163.com>
Date: Fri, 1 Mar 2024 11:04:58 +0800
Subject: [PATCH 4/4] revert

---
 web_src/js/components/ActionRunStatus.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index 932f15117f89e..51a7745431792 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -30,10 +30,10 @@ export default {
 <template>
   <span class="gt-df gt-ac" :data-tooltip-content="localeStatus" v-if="status">
     <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="['skipped', 'cancelled'].includes(status)"/>
+    <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-if="['failure', 'unknown'].includes(status)"/>
+    <SvgIcon name="octicon-x-circle-fill" class="text red" :size="size" v-else-if="['failure', 'cancelled', 'unknown'].includes(status)"/>
   </span>
 </template>