From 3041b3ba7902f8db77d2e8ae8fd39d7dee88ea1e Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 11 May 2023 08:36:23 +0800 Subject: [PATCH 01/16] save --- web_src/js/components/RepoActionView.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 28adfbc6eca71..fefc564c080d6 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -30,15 +30,15 @@
-
+
{{ job.name }} - {{ job.duration }} - + {{ job.duration }}
@@ -115,6 +115,7 @@ const sfc = { intervalID: null, currentJobStepsStates: [], artifacts: [], + rerunIndex: -1, // provided by backend run: { @@ -490,11 +491,10 @@ export function ansiLogToHTML(line) { background-color: transparent; outline: none; cursor: pointer; - transition: transform 0.2s; } .job-group-section .job-brief-list .job-brief-item .job-brief-rerun:hover { - transform: scale(130%); + } .job-group-section .job-brief-list .job-brief-item .job-brief-link { @@ -507,6 +507,10 @@ export function ansiLogToHTML(line) { align-items: center; } +.job-group-section .job-brief-list .job-brief-item .job-brief-link:hover { + text-decoration: none; +} + .job-group-section .job-brief-list .job-brief-item:hover { background-color: var(--color-secondary); } From ee60a4df2baf99d2ead49a330b5faf43f9839050 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 11 May 2023 18:08:11 +0800 Subject: [PATCH 02/16] save changes --- options/locale/locale_en-US.ini | 1 + templates/repo/actions/status.tmpl | 3 +- templates/repo/actions/view.tmpl | 1 + web_src/js/components/ActionRunStatus.vue | 3 +- web_src/js/components/RepoActionView.vue | 152 +++++++++++++++------- 5 files changed, 113 insertions(+), 47 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 6305a3907b7be..250186510155d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -80,6 +80,7 @@ milestones = Milestones ok = OK cancel = Cancel rerun = Re-run +rerun_all = Re-run All Jobs save = Save add = Add add_all = Add All diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl index ab2ee8482cf0e..41a5c6475fb3f 100644 --- a/templates/repo/actions/status.tmpl +++ b/templates/repo/actions/status.tmpl @@ -1,5 +1,6 @@ {{- $size := 16 -}} {{- if .size -}} @@ -22,7 +23,7 @@ {{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}} +{{else if or (eq .status "failure") or (eq .status "cancelled") or (eq .status "unknown")}} {{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}} {{end}} diff --git a/templates/repo/actions/view.tmpl b/templates/repo/actions/view.tmpl index 8d6559ee98007..3a3a069cbc8a7 100644 --- a/templates/repo/actions/view.tmpl +++ b/templates/repo/actions/view.tmpl @@ -9,6 +9,7 @@ data-locale-approve="{{.locale.Tr "repo.diff.review.approve"}}" data-locale-cancel="{{.locale.Tr "cancel"}}" data-locale-rerun="{{.locale.Tr "rerun"}}" + data-locale-rerun-all="{{.locale.Tr "rerun_all"}}" data-locale-status-unknown="{{.locale.Tr "actions.status.unknown"}}" data-locale-status-waiting="{{.locale.Tr "actions.status.waiting"}}" data-locale-status-running="{{.locale.Tr "actions.status.running"}}" diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue index 0786cb60a9a48..a620c9c946bf8 100644 --- a/web_src/js/components/ActionRunStatus.vue +++ b/web_src/js/components/ActionRunStatus.vue @@ -1,5 +1,6 @@ diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index fefc564c080d6..d0a4925602a47 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -1,19 +1,19 @@