Cancel first in this plugin's dialogs - #1688
Merged
Merged
Conversation
Reorders 13 action rows so the dismissing button leads, matching the decision now enforced by the shared gate. Cancel-first was the minority across the platform — 42 core dialogs and 48 plugin dialogs put the confirm first — and ordering is the one button inconsistency users actually feel, because it moves the button under their cursor between one dialog and the next. A pure move: whole <button> elements swapped position, nothing retyped. Verified per repo by diffing removed against added lines — the multisets are identical, so no id, binding, tooltip, icon or translate pipe changed in transit. No touched row carried cdkFocusInitial, so no autofocus target moved. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015sXLtgzZU8QL9m84GqMkoJ
There was a problem hiding this comment.
Pull request overview
This PR standardizes dialog action ordering within the time-planning plugin by moving the dismissing action (Cancel/Close) to appear before the primary/destructive action across the affected modals, aligning with the “cancel first” convention referenced in the PR description.
Changes:
- Reordered action buttons in 13 Angular Material dialog templates so the dismissing action leads.
- Kept button contents/handlers/ids intact while swapping whole
<button>elements to avoid selector regressions. - Applied the same ordering across Working Hours, Registration Devices, Flexes, Break Policies, and Absence Requests dialogs.
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-actions/working-hours-upload-modal/working-hours-upload-modal.component.html | Moves “Close” before “Upload” in the upload modal actions. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-actions/working-hours-comment-office-update-modal/working-hours-comment-office-update-modal.component.html | Moves “Cancel” before “OK” in the comment office update modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/working-hours/components/working-hours-actions/working-hours-comment-office-all-update-modal/working-hours-comment-office-all-update-modal.component.html | Moves “Cancel” before “Save” in the comment office-all update modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-otp-code/registration-devices-otp-code.component.html | Moves “Cancel” before “OK” in the OTP warning modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-edit-modal/registration-devices-edit-modal.component.html | Moves “Cancel” before “Update” in the edit modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-create-modal/registration-devices-create-modal.component.html | Moves “Cancel” before “Create” in the create modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/flexes/components/time-flexes-actions/comment-office-update-modal/time-flexes-comment-office-update-modal.component.html | Moves “Cancel” before “OK” in the flex comment office update modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/flexes/components/time-flexes-actions/comment-office-all-update-modal/time-flexes-comment-office-all-update-modal.component.html | Moves “Cancel” before “Save” in the flex comment office-all update modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-edit-modal/break-policies-edit-modal.component.html | Moves “Cancel” before “Save” in the break policy edit modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-delete-modal/break-policies-delete-modal.component.html | Moves “Cancel” before “Delete” in the break policy delete modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/break-policies/components/break-policies-create-modal/break-policies-create-modal.component.html | Moves “Cancel” before “Create” in the break policy create modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-reject-modal/absence-requests-reject-modal.component.html | Moves “Cancel” before “Reject” in the absence reject modal. |
| eform-client/src/app/plugins/modules/time-planning-pn/modules/absence-requests/components/absence-requests-actions/absence-requests-approve-modal/absence-requests-approve-modal.component.html | Moves “Cancel” before “Approve” in the absence approve modal. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ordering half of the button work. Depends on microting/eform-angular-frontend#8017, which decides the convention and teaches the shared gate to enforce it.
Reorders 13 dialog action rows so the dismissing button leads.
Why this was a separate decision
The audit deliberately left ordering open: 42 core dialogs and 48 plugin dialogs rendered
[Save][Cancel]against 12 the other way, so cancel-first was the minority. It is also the one button inconsistency users actually feel — it moves the button under their cursor between one dialog and the next — so it warranted a decision rather than whichever way a sweep happened to run.It is a pure move
Whole
<button>elements swap position; nothing is retyped. Verified by diffing removed against added lines in this repo — the line multisets are identical, so noid, binding, tooltip, icon or translate pipe changed in transit. That check is the point: a re-typed button is how anidsilently disappears and takes an e2e selector with it.No touched row carries
cdkFocusInitial, so no autofocus target moves.🤖 Generated with Claude Code
https://claude.ai/code/session_015sXLtgzZU8QL9m84GqMkoJ