diff --git a/composer.json b/composer.json index 7a4445e..a2af9d8 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "php": ">=8.2 <8.6", "nowo-tech/form-kit-bundle": "^2.16", "nowo-tech/transaction-contract": "^1.0", - "nowo-tech/ui-kit-bundle": "^2.2", + "nowo-tech/ui-kit-bundle": "^2.66", "psr/clock": "^1.0", "symfony/config": "^7.4 || ^8.0", "symfony/dependency-injection": "^7.4 || ^8.0", diff --git a/composer.lock b/composer.lock index d40c870..0721d56 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a2f0e4c522a832713a5394089e19ce62", + "content-hash": "19e9f5874fd0fe2280bd9777fa6b3ec9", "packages": [ { "name": "doctrine/collections", @@ -329,16 +329,16 @@ }, { "name": "nowo-tech/ui-kit-bundle", - "version": "v2.51.0", + "version": "v2.66.0", "source": { "type": "git", "url": "https://github.com/nowo-tech/UiKitBundle.git", - "reference": "bd14774abdb7fb3bb755bf8fb2bf4aaee0258d15" + "reference": "3329edba6da30d5ef5a1ad3c3add578dc081ebe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nowo-tech/UiKitBundle/zipball/bd14774abdb7fb3bb755bf8fb2bf4aaee0258d15", - "reference": "bd14774abdb7fb3bb755bf8fb2bf4aaee0258d15", + "url": "https://api.github.com/repos/nowo-tech/UiKitBundle/zipball/3329edba6da30d5ef5a1ad3c3add578dc081ebe1", + "reference": "3329edba6da30d5ef5a1ad3c3add578dc081ebe1", "shasum": "" }, "require": { @@ -385,7 +385,8 @@ "symfony/validator": "Colour validation in the optional appearance forms" }, "bin": [ - "bin/nowo-ui-token-lint" + "bin/nowo-ui-token-lint", + "bin/nowo-ui-demo-style-lint" ], "type": "symfony-bundle", "autoload": { @@ -427,8 +428,8 @@ "issues": "https://github.com/nowo-tech/UiKitBundle/issues", "source": "https://github.com/nowo-tech/UiKitBundle" }, - "time": "2026-11-13T16:47:40+00:00", - "published-time": "2026-11-13T16:53:34+00:00" + "time": "2026-11-22T14:50:44+00:00", + "published-time": "2026-11-22T14:52:58+00:00" }, { "name": "psr/cache", diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 36a9a9e..a578d60 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -63,6 +63,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- **Form actions order (Beacon UX-017):** the path and redirect forms (new / edit) put Cancel first, then the primary + on the right, like the UiKit dialogs (the import dialog already did): the order comes from the UiKit form scaffold. + Requires `nowo-tech/ui-kit-bundle` **^2.66** (was ^2.2). The page contract tests check the order + (`formActionsOrderChecked()`). + ## [1.19.0] - 2026-11-22 ### Added diff --git a/docs/UPGRADING.md b/docs/UPGRADING.md index c06e021..41f4ca1 100644 --- a/docs/UPGRADING.md +++ b/docs/UPGRADING.md @@ -106,6 +106,9 @@ ## Unreleased +- Requires `nowo-tech/ui-kit-bundle` **^2.66** (form actions order, Beacon UX-017): the path and redirect forms put + Cancel first, then the primary. UiKit's `theme.form_actions_order: primary_first` restores the old order host-wide. + ## To 1.19.0 From **1.18.0**: diff --git a/tests/Integration/Contract/PageContractGermanTest.php b/tests/Integration/Contract/PageContractGermanTest.php index c2f4cdd..e9dafc1 100644 --- a/tests/Integration/Contract/PageContractGermanTest.php +++ b/tests/Integration/Contract/PageContractGermanTest.php @@ -29,6 +29,11 @@ public function testPagesRenderTheGermanCatalogue(): void self::assertStringContainsString('Noch keine Pfaddefinitionen.', $html); } + protected static function formActionsOrderChecked(): bool + { + return true; + } + protected static function locale(): string { return 'de'; diff --git a/tests/Integration/Contract/PageContractTest.php b/tests/Integration/Contract/PageContractTest.php index 17e3c16..c553183 100644 --- a/tests/Integration/Contract/PageContractTest.php +++ b/tests/Integration/Contract/PageContractTest.php @@ -290,6 +290,22 @@ protected static function translationDirs(): array return [dirname(__DIR__, 3) . '/src/Resources/translations']; } + /** UiKit 2.66 (Beacon UX-017): every form actions row puts Cancel first, then the primary. */ + protected static function formActionsOrderChecked(): bool + { + return true; + } + + public function testPathAndRedirectFormsPutCancelFirst(): void + { + foreach ([ + ['@NowoRoutingKitBundle/panel/form.html.twig', PanelPageFixtures::form(null)], + ['@NowoRoutingKitBundle/panel/redirects/form.html.twig', PanelPageFixtures::redirectsForm(null)], + ] as [$template, $context]) { + self::assertSame([['cancel', 'primary']], $this->renderPage(new PageFixture($template, $context))->formActionsRows(), $template); + } + } + protected static function templatesDocument(): string { return dirname(__DIR__, 3) . '/docs/TEMPLATES.md';