From 44df90d8dd4f853f38aea1d1617ab85e092436e2 Mon Sep 17 00:00:00 2001
From: Karthick R <kramachandran@roblox.com>
Date: Wed, 9 Mar 2022 11:32:13 -0800
Subject: [PATCH 1/3] make stopjob message clearer

---
 ui/app/templates/components/job-page/parts/title.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/templates/components/job-page/parts/title.hbs b/ui/app/templates/components/job-page/parts/title.hbs
index 068c0731f42b..58dabc508bf5 100644
--- a/ui/app/templates/components/job-page/parts/title.hbs
+++ b/ui/app/templates/components/job-page/parts/title.hbs
@@ -18,9 +18,9 @@
       <TwoStepButton
         data-test-stop
         @alignRight={{true}}
-        @idleText="Stop"
+        @idleText="Stop Job"
         @cancelText="Cancel"
-        @confirmText="Yes, Stop"
+        @confirmText="Yes, Stop the job"
         @confirmationMessage="Are you sure you want to stop this job?"
         @awaitingConfirmation={{this.stopJob.isRunning}}
         @onConfirm={{perform this.stopJob}} />

From 0784750b094066fae4ababe62c13f0aa1cb090e6 Mon Sep 17 00:00:00 2001
From: Luiz Aoqui <luiz@hashicorp.com>
Date: Thu, 24 Mar 2022 16:03:04 -0400
Subject: [PATCH 2/3] ui: apply descriptive action to all two-step buttons

---
 ui/app/templates/allocations/allocation/index.hbs    | 12 ++++++------
 .../templates/allocations/allocation/task/index.hbs  |  4 ++--
 ui/app/templates/clients/client/index.hbs            |  2 +-
 .../components/job-page/parts/latest-deployment.hbs  |  2 +-
 ui/app/templates/components/job-page/parts/title.hbs |  6 +++---
 ui/app/templates/components/job-version.hbs          |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ui/app/templates/allocations/allocation/index.hbs b/ui/app/templates/allocations/allocation/index.hbs
index 0069a9fba85a..e463ad9eba62 100644
--- a/ui/app/templates/allocations/allocation/index.hbs
+++ b/ui/app/templates/allocations/allocation/index.hbs
@@ -42,9 +42,9 @@
         <TwoStepButton
           data-test-stop
           @alignRight={{true}}
-          @idleText="Stop"
-          @cancelText="Cancel"
-          @confirmText="Yes, Stop"
+          @idleText="Stop Alloc"
+          @cancelText="Cancel Stop"
+          @confirmText="Yes, Stop Alloc"
           @confirmationMessage="Are you sure? This will reschedule the allocation on a different client."
           @awaitingConfirmation={{this.stopAllocation.isRunning}}
           @disabled={{or
@@ -56,9 +56,9 @@
         <TwoStepButton
           data-test-restart
           @alignRight={{true}}
-          @idleText="Restart"
-          @cancelText="Cancel"
-          @confirmText="Yes, Restart"
+          @idleText="Restart Alloc"
+          @cancelText="Cancel Restart"
+          @confirmText="Yes, Restart Alloc"
           @confirmationMessage="Are you sure? This will restart the allocation in-place."
           @awaitingConfirmation={{this.restartAllocation.isRunning}}
           @disabled={{or
diff --git a/ui/app/templates/allocations/allocation/task/index.hbs b/ui/app/templates/allocations/allocation/task/index.hbs
index 49e90ec3cacf..e6d62dc20953 100644
--- a/ui/app/templates/allocations/allocation/task/index.hbs
+++ b/ui/app/templates/allocations/allocation/task/index.hbs
@@ -53,9 +53,9 @@
         <TwoStepButton
           data-test-restart
           @alignRight={{true}}
-          @idleText="Restart"
+          @idleText="Restart Task"
           @cancelText="Cancel"
-          @confirmText="Yes, Restart"
+          @confirmText="Yes, Restart Task"
           @confirmationMessage="Are you sure? This will restart the task in-place."
           @awaitingConfirmation={{this.restartTask.isRunning}}
           @disabled={{this.restartTask.isRunning}}
diff --git a/ui/app/templates/clients/client/index.hbs b/ui/app/templates/clients/client/index.hbs
index 6cb4fa0253c3..c347b6d2e2d6 100644
--- a/ui/app/templates/clients/client/index.hbs
+++ b/ui/app/templates/clients/client/index.hbs
@@ -197,7 +197,7 @@
           data-test-drain-stop
           @idleText="Stop Drain"
           @cancelText="Cancel"
-          @confirmText="Yes, Stop"
+          @confirmText="Yes, Stop Drain"
           @confirmationMessage="Are you sure you want to stop this drain?"
           @awaitingConfirmation={{this.stopDrain.isRunning}}
           @onConfirm={{perform this.stopDrain}}
diff --git a/ui/app/templates/components/job-page/parts/latest-deployment.hbs b/ui/app/templates/components/job-page/parts/latest-deployment.hbs
index f11111a34eeb..17b85ab73956 100644
--- a/ui/app/templates/components/job-page/parts/latest-deployment.hbs
+++ b/ui/app/templates/components/job-page/parts/latest-deployment.hbs
@@ -24,7 +24,7 @@
                 confirmButton="is-danger"}}
               @idleText="Fail Deployment"
               @cancelText="Cancel"
-              @confirmText="Yes, Fail"
+              @confirmText="Yes, Fail Deployment"
               @confirmationMessage="Are you sure?"
               @inlineText={{true}}
               @awaitingConfirmation={{this.fail.isRunning}}
diff --git a/ui/app/templates/components/job-page/parts/title.hbs b/ui/app/templates/components/job-page/parts/title.hbs
index 58dabc508bf5..a4fc8ed27584 100644
--- a/ui/app/templates/components/job-page/parts/title.hbs
+++ b/ui/app/templates/components/job-page/parts/title.hbs
@@ -20,7 +20,7 @@
         @alignRight={{true}}
         @idleText="Stop Job"
         @cancelText="Cancel"
-        @confirmText="Yes, Stop the job"
+        @confirmText="Yes, Stop Job"
         @confirmationMessage="Are you sure you want to stop this job?"
         @awaitingConfirmation={{this.stopJob.isRunning}}
         @onConfirm={{perform this.stopJob}} />
@@ -28,9 +28,9 @@
       <TwoStepButton
         data-test-start
         @alignRight={{true}}
-        @idleText="Start"
+        @idleText="Start Job"
         @cancelText="Cancel"
-        @confirmText="Yes, Start"
+        @confirmText="Yes, Start Job"
         @confirmationMessage="Are you sure you want to start this job?"
         @awaitingConfirmation={{this.startJob.isRunning}}
         @onConfirm={{perform this.startJob}} />
diff --git a/ui/app/templates/components/job-version.hbs b/ui/app/templates/components/job-version.hbs
index a7076d75f905..74d4308b90be 100644
--- a/ui/app/templates/components/job-version.hbs
+++ b/ui/app/templates/components/job-version.hbs
@@ -17,9 +17,9 @@
             idleButton="is-warning is-outlined"
             confirmButton="is-warning"}}
           @alignRight={{true}}
-          @idleText="Revert"
+          @idleText="Revert Version"
           @cancelText="Cancel"
-          @confirmText="Yes, Revert"
+          @confirmText="Yes, Revert Version"
           @confirmationMessage="Are you sure you want to revert to this version?"
           @inlineText={{true}}
           @fadingBackground={{true}}

From 9445a92c19620ce11d9fd84c7402471bce7b3195 Mon Sep 17 00:00:00 2001
From: Luiz Aoqui <luiz@hashicorp.com>
Date: Thu, 24 Mar 2022 16:05:46 -0400
Subject: [PATCH 3/3] changelog: add entry for #12252

---
 .changelog/12252.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/12252.txt

diff --git a/.changelog/12252.txt b/.changelog/12252.txt
new file mode 100644
index 000000000000..408f0fca6a0c
--- /dev/null
+++ b/.changelog/12252.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: make buttons with confirmation more descriptive of their actions
+```