From 57418673bbe3a1e3b462b80e614d276ba2261987 Mon Sep 17 00:00:00 2001
From: NorthRealm <155140859+NorthRealm@users.noreply.github.com>
Date: Tue, 29 Apr 2025 20:19:40 +0800
Subject: [PATCH 1/8] GREY OUT EXPIRED ARTIFACT
---
web_src/js/components/RepoActionView.vue | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 447347890b7f4..cb7e7224207ed 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -495,14 +495,21 @@ export default defineComponent({
{{ locale.artifactsTitle }}
From 8d9d092323e6706c5f5bb5d8cf4da9d4344bcd5c Mon Sep 17 00:00:00 2001
From: NorthRealm <155140859+NorthRealm@users.noreply.github.com>
Date: Tue, 29 Apr 2025 22:04:00 +0800
Subject: [PATCH 2/8] GREY OUT EXPIRED ARTIFACT
---
web_src/js/components/RepoActionView.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index cb7e7224207ed..efe48b518abc7 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -504,7 +504,7 @@ export default defineComponent({
-
+
{{ artifact.name }}
From 59113a6bc895358177bc0ce33d2225a19f7a7171 Mon Sep 17 00:00:00 2001
From: NorthRealm <155140859+NorthRealm@users.noreply.github.com>
Date: Wed, 30 Apr 2025 01:28:36 +0800
Subject: [PATCH 3/8] CSS
---
web_src/js/components/RepoActionView.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index efe48b518abc7..52a6000f0d6af 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -505,8 +505,8 @@ export default defineComponent({
-
- {{ artifact.name }}
+
+ {{ artifact.name }}
From 929a84b421336f3868e80fa5ebba96aa81ec2d13 Mon Sep 17 00:00:00 2001
From: NorthRealm <155140859+NorthRealm@users.noreply.github.com>
Date: Wed, 30 Apr 2025 02:23:40 +0800
Subject: [PATCH 4/8] LABEL
---
web_src/js/components/RepoActionView.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 52a6000f0d6af..18e0fbcebc06d 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -507,6 +507,8 @@ export default defineComponent({
{{ artifact.name }}
+
+ Expired
From 22972aed188730c065043d9a5cbe0fa3261387de Mon Sep 17 00:00:00 2001
From: NorthRealm <155140859+NorthRealm@users.noreply.github.com>
Date: Wed, 30 Apr 2025 12:32:54 +0800
Subject: [PATCH 5/8] Locale
---
options/locale/locale_en-US.ini | 1 +
templates/repo/actions/view_component.tmpl | 1 +
web_src/js/components/RepoActionView.vue | 3 +--
web_src/js/features/repo-actions.ts | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a8fabc9ca1014..0ec1e1e4f4ff3 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -130,6 +130,7 @@ pin = Pin
unpin = Unpin
artifacts = Artifacts
+expired = Expired
confirm_delete_artifact = Are you sure you want to delete the artifact '%s' ?
archived = Archived
diff --git a/templates/repo/actions/view_component.tmpl b/templates/repo/actions/view_component.tmpl
index 8d1de41f701d7..d0741cdc0bff9 100644
--- a/templates/repo/actions/view_component.tmpl
+++ b/templates/repo/actions/view_component.tmpl
@@ -19,6 +19,7 @@
data-locale-status-skipped="{{ctx.Locale.Tr "actions.status.skipped"}}"
data-locale-status-blocked="{{ctx.Locale.Tr "actions.status.blocked"}}"
data-locale-artifacts-title="{{ctx.Locale.Tr "artifacts"}}"
+ data-locale-artifact-expired="{{ctx.Locale.Tr "expired"}}"
data-locale-confirm-delete-artifact="{{ctx.Locale.Tr "confirm_delete_artifact"}}"
data-locale-show-timestamps="{{ctx.Locale.Tr "show_timestamps"}}"
data-locale-show-log-seconds="{{ctx.Locale.Tr "show_log_seconds"}}"
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 18e0fbcebc06d..37f3b95b7f764 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -507,8 +507,7 @@ export default defineComponent({
{{ artifact.name }}
-
- Expired
+ {{ locale.artifactExpired }}
diff --git a/web_src/js/features/repo-actions.ts b/web_src/js/features/repo-actions.ts
index cbd0429c04b34..8d93fce53f417 100644
--- a/web_src/js/features/repo-actions.ts
+++ b/web_src/js/features/repo-actions.ts
@@ -24,6 +24,7 @@ export function initRepositoryActionView() {
pushedBy: el.getAttribute('data-locale-runs-pushed-by'),
artifactsTitle: el.getAttribute('data-locale-artifacts-title'),
areYouSure: el.getAttribute('data-locale-are-you-sure'),
+ artifactExpired: el.getAttribute('data-locale-artifact-expired'),
confirmDeleteArtifact: el.getAttribute('data-locale-confirm-delete-artifact'),
showTimeStamps: el.getAttribute('data-locale-show-timestamps'),
showLogSeconds: el.getAttribute('data-locale-show-log-seconds'),
From 4426dad06686ec0ff2735f65697dfcef9f8d591d Mon Sep 17 00:00:00 2001
From: wxiaoguang
Date: Tue, 6 May 2025 10:16:52 +0800
Subject: [PATCH 6/8] fine tune
---
web_src/js/components/RepoActionView.vue | 30 +++++++++++-------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 37f3b95b7f764..e50aa6fc86598 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -496,18 +496,20 @@ export default defineComponent({
- -
-
- {{ artifact.name }}
-
-
-
-
-
- -
-
- {{ artifact.name }}
- {{ locale.artifactExpired }}
+
-
+
+
+
+ {{ artifact.name }}
+
+
+
+
+
+
+
+ {{ artifact.name }}
+ {{ locale.artifactExpired }}
@@ -679,10 +681,6 @@ export default defineComponent({
list-style: none;
}
-.job-artifacts-icon {
- padding-right: 3px;
-}
-
.job-brief-list {
display: flex;
flex-direction: column;
From 91885980c8d1d9b2d8d6aad47768fb5198970f11 Mon Sep 17 00:00:00 2001
From: wxiaoguang
Date: Tue, 6 May 2025 10:22:05 +0800
Subject: [PATCH 7/8] fix alignment and overflow
---
routers/web/devtest/mock_actions.go | 10 ++++++++++
web_src/js/components/RepoActionView.vue | 9 +++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/routers/web/devtest/mock_actions.go b/routers/web/devtest/mock_actions.go
index 023909aceb31b..bc741ecd114de 100644
--- a/routers/web/devtest/mock_actions.go
+++ b/routers/web/devtest/mock_actions.go
@@ -94,6 +94,16 @@ func MockActionsRunsJobs(ctx *context.Context) {
Size: 1024 * 1024,
Status: "completed",
})
+ resp.Artifacts = append(resp.Artifacts, &actions.ArtifactsViewItem{
+ Name: "artifact-very-loooooooooooooooooooooooooooooooooooooooooooooooooooooooong",
+ Size: 100 * 1024,
+ Status: "expired",
+ })
+ resp.Artifacts = append(resp.Artifacts, &actions.ArtifactsViewItem{
+ Name: "artifact-really-loooooooooooooooooooooooooooooooooooooooooooooooooooooooong",
+ Size: 1024 * 1024,
+ Status: "completed",
+ })
resp.State.Run.Jobs = append(resp.State.Run.Jobs, &actions.ViewJob{
ID: runID * 10,
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index e50aa6fc86598..e3b4356ae68c7 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -498,9 +498,9 @@ export default defineComponent({
-
-
+
- {{ artifact.name }}
+ {{ artifact.name }}
@@ -508,8 +508,8 @@ export default defineComponent({
- {{ artifact.name }}
- {{ locale.artifactExpired }}
+ {{ artifact.name }}
+ {{ locale.artifactExpired }}
@@ -674,6 +674,7 @@ export default defineComponent({
padding: 6px;
display: flex;
justify-content: space-between;
+ align-items: center;
}
.job-artifacts-list {
From 9c9c865d07cc23eedf9a3f68575f36124a1d99fc Mon Sep 17 00:00:00 2001
From: wxiaoguang
Date: Tue, 6 May 2025 10:25:58 +0800
Subject: [PATCH 8/8] fine tune
---
web_src/js/components/RepoActionView.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index e3b4356ae68c7..af300622b46e8 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -498,7 +498,7 @@ export default defineComponent({
-
-
+
{{ artifact.name }}