From 175c2cba19ca09262e6a59d0dd8fafb0893853e8 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 8 May 2023 17:25:37 +0000
Subject: [PATCH 1/4] Attach a tooltip to the action control button

The first time I saw the big red X button I thought something failed but apparently, it was just a "Cancel" button

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
---
 options/locale/locale_en-US.ini          |  1 +
 templates/repo/actions/view.tmpl         | 10 +++++++++-
 web_src/js/components/RepoActionView.vue | 12 +++++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 573ddcf6f045c..b9d6e283a29c9 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3389,6 +3389,7 @@ management = Secrets Management
 
 [actions]
 actions = Actions
+rerun = Rerun
 
 unit.desc = Manage actions
 
diff --git a/templates/repo/actions/view.tmpl b/templates/repo/actions/view.tmpl
index 0c046711539c6..62681fd2df26c 100644
--- a/templates/repo/actions/view.tmpl
+++ b/templates/repo/actions/view.tmpl
@@ -2,7 +2,15 @@
 
 <div class="page-content repository">
 	{{template "repo/header" .}}
-	<div id="repo-action-view" data-run-index="{{.RunIndex}}" data-job-index="{{.JobIndex}}" data-actions-url="{{.ActionsURL}}"></div>
+	<div id="repo-action-view"
+		data-run-index="{{.RunIndex}}"
+		data-job-index="{{.JobIndex}}"
+		data-actions-url="{{.ActionsURL}}"
+		data-locale-approve="{{.locale.Tr "repo.diff.review.approve"}}"
+		data-locale-cancel="{{.locale.Tr "cancel"}}"
+		data-locale-rerun="{{.locale.Tr "actions.rerun"}}"
+		>
+	</div>
 </div>
 
 {{template "base/footer" .}}
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 00411654a3f96..9849fe66c49ed 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -6,13 +6,13 @@
         <div class="action-title">
           {{ run.title }}
         </div>
-        <button class="action-control-button text green" @click="approveRun()" v-if="run.canApprove">
+        <button :data-tooltip-content="locale.approve" class="action-control-button text green" @click="approveRun()" v-if="run.canApprove">
           <SvgIcon name="octicon-play" :size="20"/>
         </button>
-        <button class="action-control-button text red" @click="cancelRun()" v-else-if="run.canCancel">
+        <button :data-tooltip-content="locale.cancel" class="action-control-button text red" @click="cancelRun()" v-else-if="run.canCancel">
           <SvgIcon name="octicon-x-circle-fill" :size="20"/>
         </button>
-        <button class="action-control-button text green" @click="rerun()" v-else-if="run.canRerun">
+        <button :data-tooltip-content="locale.rerun" class="action-control-button text green" @click="rerun()" v-else-if="run.canRerun">
           <SvgIcon name="octicon-sync" :size="20"/>
         </button>
       </div>
@@ -93,6 +93,7 @@ const sfc = {
     runIndex: String,
     jobIndex: String,
     actionsURL: String,
+    locale: Object,
   },
 
   data() {
@@ -314,6 +315,11 @@ export function initRepositoryActionView() {
     runIndex: el.getAttribute('data-run-index'),
     jobIndex: el.getAttribute('data-job-index'),
     actionsURL: el.getAttribute('data-actions-url'),
+    locale: {
+      approve: el.getAttribute('data-locale-approve'),
+      cancel: el.getAttribute('data-locale-cancel'),
+      rerun: el.getAttribute('data-locale-rerun'),
+    }
   });
   view.mount(el);
 }

From 593207ada60d65bdd822d0a50cdf5bcf092c1903 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 8 May 2023 18:26:23 +0000
Subject: [PATCH 2/4] Move "rerun" to top level

---
 options/locale/locale_en-US.ini  | 2 +-
 templates/repo/actions/view.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b9d6e283a29c9..5a9527dadf2bc 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -79,6 +79,7 @@ milestones = Milestones
 
 ok = OK
 cancel = Cancel
+rerun = Rerun
 save = Save
 add = Add
 add_all = Add All
@@ -3389,7 +3390,6 @@ management = Secrets Management
 
 [actions]
 actions = Actions
-rerun = Rerun
 
 unit.desc = Manage actions
 
diff --git a/templates/repo/actions/view.tmpl b/templates/repo/actions/view.tmpl
index 62681fd2df26c..c950bf4ea0649 100644
--- a/templates/repo/actions/view.tmpl
+++ b/templates/repo/actions/view.tmpl
@@ -8,7 +8,7 @@
 		data-actions-url="{{.ActionsURL}}"
 		data-locale-approve="{{.locale.Tr "repo.diff.review.approve"}}"
 		data-locale-cancel="{{.locale.Tr "cancel"}}"
-		data-locale-rerun="{{.locale.Tr "actions.rerun"}}"
+		data-locale-rerun="{{.locale.Tr "rerun"}}"
 		>
 	</div>
 </div>

From 40e075463dd2ef098db48353db96d50dc90280ef Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 8 May 2023 18:28:59 +0000
Subject: [PATCH 3/4] Rerun -> Re-run

---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 5a9527dadf2bc..9bfc0033b481c 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -79,7 +79,7 @@ milestones = Milestones
 
 ok = OK
 cancel = Cancel
-rerun = Rerun
+rerun = Re-run
 save = Save
 add = Add
 add_all = Add All

From f5e24b78db73a1785047d821a2af846b7a5d0819 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 9 May 2023 01:33:18 +0200
Subject: [PATCH 4/4] Update templates/repo/actions/view.tmpl

---
 templates/repo/actions/view.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/actions/view.tmpl b/templates/repo/actions/view.tmpl
index c950bf4ea0649..85e6f736d880d 100644
--- a/templates/repo/actions/view.tmpl
+++ b/templates/repo/actions/view.tmpl
@@ -9,7 +9,7 @@
 		data-locale-approve="{{.locale.Tr "repo.diff.review.approve"}}"
 		data-locale-cancel="{{.locale.Tr "cancel"}}"
 		data-locale-rerun="{{.locale.Tr "rerun"}}"
-		>
+	>
 	</div>
 </div>