From 44f0027a8b5933ef8e4bac912e380df6abe00c91 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 9 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 workflow-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 ++ .../settings-add-site-modal.component.html | 63 ++++++++-------- .../settings-remove-site-modal.component.html | 74 +++++++++---------- .../workflow-case-delete.component.html | 5 +- 5 files changed, 80 insertions(+), 72 deletions(-) diff --git a/.github/workflows/dotnet-core-master.yml b/.github/workflows/dotnet-core-master.yml index c43c4662..825c6c7f 100644 --- a/.github/workflows/dotnet-core-master.yml +++ b/.github/workflows/dotnet-core-master.yml @@ -38,6 +38,11 @@ jobs: cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins cd eform-angular-frontend/eform-client && ../../eform-angular-workflow-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/workflow-pn - name: Get the version release id: get_release_version run: echo "VERSION=$(cd eform-angular-workflow-plugin && git describe --abbrev=0 --tags | cut -d "v" -f 2)" >> $GITHUB_OUTPUT diff --git a/.github/workflows/dotnet-core-pr.yml b/.github/workflows/dotnet-core-pr.yml index 4c26a780..5ffc4860 100644 --- a/.github/workflows/dotnet-core-pr.yml +++ b/.github/workflows/dotnet-core-pr.yml @@ -35,6 +35,11 @@ jobs: cp -av eform-angular-workflow-plugin/eform-client/wdio-plugin-step2.conf.ts eform-angular-frontend/eform-client/wdio-plugin-step2.conf.ts mkdir -p eform-angular-frontend/eFormAPI/eFormAPI.Web/Plugins cd eform-angular-frontend/eform-client && ../../eform-angular-workflow-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/workflow-pn - name: Get the version release id: get_release_version run: echo "VERSION=$(cd eform-angular-workflow-plugin && git describe --abbrev=0 --tags | cut -d "v" -f 2)" >> $GITHUB_OUTPUT 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 22157636..915ad616 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 @@ -1,32 +1,31 @@ -

{{'Assign site' | translate}}

-
- - {{'Select employee' | translate}} - - -
-
- - -
+

{{'Assign site' | translate}}

+
+ + {{'Select employee' | translate}} + + +
+
+ + +
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 5037985f..2d958cd4 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 @@ -1,37 +1,37 @@ - + 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 71082c7c..2a392f49 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 @@ -27,15 +27,14 @@

{{'Are you sure you want to delete' | translate}}?