From 4317435d96781f8bb64ea2b99eb71d0fc357df59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Schultz=20Madsen?= <rm@microting.com>
Date: Mon, 24 Aug 2026 13:13:25 +0200
Subject: [PATCH 1/2] Cancel first in this plugin's dialogs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reorders 2 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
---
 .../settings-add-site-modal.component.html         | 14 +++++++-------
 .../workflow-case-delete.component.html            | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.html b/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.html
index 915ad61..a5fcf55 100644
--- a/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.html
+++ b/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.html
@@ -13,6 +13,13 @@ <h3 mat-dialog-title>{{'Assign site' | translate}}</h3>
   </mat-form-field>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
+  <button
+    class="btn-cancel"
+    id="siteAssignBtnSaveCancel"
+    (click)="hide()"
+  >
+    {{'Cancel' | translate}}
+  </button>
   <button
     class="btn-primary"
     id="siteAssignBtnSave"
@@ -21,11 +28,4 @@ <h3 mat-dialog-title>{{'Assign site' | translate}}</h3>
   >
     {{'Assign' | translate}}
   </button>
-  <button
-    class="btn-cancel"
-    id="siteAssignBtnSaveCancel"
-    (click)="hide()"
-  >
-    {{'Cancel' | translate}}
-  </button>
 </div>
diff --git a/eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.html b/eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.html
index 2a392f4..f64fe60 100644
--- a/eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.html
+++ b/eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.html
@@ -26,13 +26,6 @@ <h3 mat-dialog-title>{{'Are you sure you want to delete' | translate}}?</h3>
     </div>
   </div>
   <div mat-dialog-actions class="d-flex flex-row justify-content-end">
-    <button
-      class="btn-delete"
-      id="workflowCaseDeleteDeleteBtn"
-      (click)="deleteWorkflowCase()"
-    >
-      {{'Delete' | translate}}
-    </button>
     <button
       class="btn-cancel"
       id="workflowCaseDeleteCancelBtn"
@@ -40,4 +33,11 @@ <h3 mat-dialog-title>{{'Are you sure you want to delete' | translate}}?</h3>
     >
       {{'Cancel' | translate}}
     </button>
+    <button
+      class="btn-delete"
+      id="workflowCaseDeleteDeleteBtn"
+      (click)="deleteWorkflowCase()"
+    >
+      {{'Delete' | translate}}
+    </button>
   </div>

From 5947541869d1006f6cd6f4729e000000e98884e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Schultz=20Madsen?= <rm@microting.com>
Date: Mon, 24 Aug 2026 13:25:37 +0200
Subject: [PATCH 2/2] Cancel first in the Remove-site modal too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Review caught that this dialog was left cancel-last while its sibling
Assign-site, opened from the same Workflow Settings screen, moved to
cancel-first. Clicking one then the other would have shown Cancel jumping
sides — the exact inconsistency the reorder set out to remove.

It was missed because the row is a hand-rolled `.modal-footer` from the old
MDBootstrap dialog rather than a `mat-dialog-actions`, so the gate could not
see it. The shared checker now treats `.modal-footer` as an action row as well,
so this cannot recur silently.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015sXLtgzZU8QL9m84GqMkoJ
---
 .../settings-remove-site-modal.component.html               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.html b/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.html
index 2d958cd..6227666 100644
--- a/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.html
+++ b/eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.html
@@ -25,12 +25,12 @@ <h6>{{'Site Uid' | translate}}</h6>
         </div>
       </div>
       <div class="modal-footer">
-        <button class="btn-delete" (click)="removeSite()" id="removeSiteSaveBtn">
-          {{ 'Remove' | translate }}
-        </button>
         <button class="btn-cancel" (click)="frame.hide()" id="removeSiteSaveCancelBtn">
           {{ 'Cancel' | translate }}
         </button>
+        <button class="btn-delete" (click)="removeSite()" id="removeSiteSaveBtn">
+          {{ 'Remove' | translate }}
+        </button>
       </div>
     </div>
   </div>