Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
17 changes: 9 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions docs/UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**:
Expand Down
5 changes: 5 additions & 0 deletions tests/Integration/Contract/PageContractGermanTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
16 changes: 16 additions & 0 deletions tests/Integration/Contract/PageContractTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down