Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make stop job message clearer #12252

Merged
merged 3 commits into from
Mar 24, 2022
Merged

make stop job message clearer #12252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44df90d
make stopjob message clearer
rkarthick Mar 9, 2022
0784750
ui: apply descriptive action to all two-step buttons
lgfa29 Mar 24, 2022
9445a92
changelog: add entry for #12252
lgfa29 Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/12252.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
ui: make buttons with confirmation more descriptive of their actions
```
12 changes: 6 additions & 6 deletions ui/app/templates/allocations/allocation/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ui/app/templates/allocations/allocation/task/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/clients/client/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/components/job-page/parts/latest-deployment.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
8 changes: 4 additions & 4 deletions ui/app/templates/components/job-page/parts/title.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
<TwoStepButton
data-test-stop
@alignRight={{true}}
@idleText="Stop"
@idleText="Stop Job"
@cancelText="Cancel"
@confirmText="Yes, Stop"
@confirmText="Yes, Stop Job"
@confirmationMessage="Are you sure you want to stop this job?"
@awaitingConfirmation={{this.stopJob.isRunning}}
@onConfirm={{perform this.stopJob}} />
{{else}}
<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}} />
Expand Down
4 changes: 2 additions & 2 deletions ui/app/templates/components/job-version.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down