From 328482524675ba34617b8ce30c40eaccbdfb91d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schultz=20Madsen?= Date: Mon, 24 Aug 2026 12:03:09 +0200 Subject: [PATCH] Adopt the one button system, and gate it in this repo's CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Converts 16 dialog buttons to the four roles the frontend defines — .btn-primary, .btn-cancel, .btn-delete, .btn-quiet. Every id, binding, label and button order preserved; only the Material directive and its inert `color` input are removed. Role follows the label and intent, not the old colour. Also adds the gate to both workflows, which is the part that keeps this fixed. The checker lives in the frontend repo, but a frontend CI run cannot see these templates — src/app/plugins/ is gitignored there — so without this step nothing checks time-planning-pn's buttons and they drift straight back. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_015sXLtgzZU8QL9m84GqMkoJ --- .github/workflows/dotnet-core-master.yml | 5 +++++ .github/workflows/dotnet-core-pr.yml | 5 +++++ .../absence-requests-approve-modal.component.html | 5 ++--- .../absence-requests-reject-modal.component.html | 5 ++--- .../break-policies-create-modal.component.html | 5 ++--- .../break-policies-delete-modal.component.html | 5 ++--- .../break-policy-rule-dialog.component.html | 5 ++--- ...ime-flexes-comment-office-all-update-modal.component.html | 5 ++--- .../registration-devices-otp-code.component.html | 5 ++--- ...king-hours-comment-office-all-update-modal.component.html | 5 ++--- 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.github/workflows/dotnet-core-master.yml b/.github/workflows/dotnet-core-master.yml index a76ff6677..f5f510e5e 100644 --- a/.github/workflows/dotnet-core-master.yml +++ b/.github/workflows/dotnet-core-master.yml @@ -28,6 +28,11 @@ jobs: run: | cp -av eform-angular-timeplanning-plugin/eform-client/src/app/plugins/modules/time-planning-pn eform-angular-frontend/eform-client/src/app/plugins/modules/time-planning-pn cd eform-angular-frontend/eform-client && ../../eform-angular-timeplanning-plugin/testinginstallpn.sh + - name: Button conventions + # The checker lives in the frontend repo (checked out above); these + # templates are ours. A frontend CI run cannot see them because + # src/app/plugins/ is gitignored there, so this plugin has to run it. + run: cd eform-angular-frontend/eform-client && node scripts/check-button-conventions.js src/app/plugins/modules/time-planning-pn - name: Copy Dockerfile run: cp eform-angular-timeplanning-plugin/Dockerfile . - name: Build the tagged Docker image diff --git a/.github/workflows/dotnet-core-pr.yml b/.github/workflows/dotnet-core-pr.yml index 4efef1d73..4ee1d5c95 100644 --- a/.github/workflows/dotnet-core-pr.yml +++ b/.github/workflows/dotnet-core-pr.yml @@ -24,6 +24,11 @@ jobs: run: | cp -av eform-angular-timeplanning-plugin/eform-client/src/app/plugins/modules/time-planning-pn eform-angular-frontend/eform-client/src/app/plugins/modules/time-planning-pn cd eform-angular-frontend/eform-client && ../../eform-angular-timeplanning-plugin/testinginstallpn.sh + - name: Button conventions + # The checker lives in the frontend repo (checked out above); these + # templates are ours. A frontend CI run cannot see them because + # src/app/plugins/ is gitignored there, so this plugin has to run it. + run: cd eform-angular-frontend/eform-client && node scripts/check-button-conventions.js src/app/plugins/modules/time-planning-pn - name: Copy Dockerfile run: cp eform-angular-timeplanning-plugin/Dockerfile . - name: Build the tagged Docker image diff --git a/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 b/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 index 4375390a1..b99be5a24 100644 --- a/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 +++ b/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 @@ -42,15 +42,14 @@

{{ 'Approve Absence Request' | translate }}

-