Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.x] CP nav reordering fixes #11054

Draft
wants to merge 12 commits into
base: 5.x
Choose a base branch
from
Draft

[5.x] CP nav reordering fixes #11054

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1998c41
Technically this is always submitted by vue.
jesseleite Oct 24, 2024
2dcd26a
Revisit tests that should be failing.
jesseleite Oct 24, 2024
35bab0a
Test that new items at end of the list get omitted from `reorder`.
jesseleite Oct 24, 2024
dc39566
Merge branch '5.x' of https://github.com/statamic/cms into fix/cp-nav…
jesseleite Nov 5, 2024
09ef268
Skip this test for now.
jesseleite Nov 5, 2024
9629f15
Pass nav transformer tests again.
jesseleite Nov 5, 2024
4e2cf98
Add test coverage for new normalizer behavior and bugfixes.
jesseleite Nov 22, 2024
d7ddd93
Pass new normalizer tests.
jesseleite Nov 22, 2024
ad7ff8a
Fix and add test coverage for reported reordering issues with new sec…
jesseleite Nov 22, 2024
6d36835
Pass new nav builder tests.
jesseleite Nov 22, 2024
e065976
Add test coverage for some more transformer bugfixes.
jesseleite Nov 22, 2024
d4b3cc3
Pass new nav transformer tests.
jesseleite Nov 22, 2024
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
Prev Previous commit
Next Next commit
Test that new items at end of the list get omitted from reorder.
  • Loading branch information
@jesseleite
jesseleite committed Oct 24, 2024
commit 35bab0ac87ad8b9367a4abc20cbe9f9e96423d24
83 changes: 78 additions & 5 deletions tests/CP/Navigation/NavTransformerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,13 +848,20 @@ public function it_can_reorder_custom_and_modified_items()
],
],
['id' => 'content::assets'],
[
'id' => 'content::custom_item_one',
'manipulations' => [
'action' => '@create',
'display' => 'Custom Item One',
],
],
['id' => 'content::collections'],
['id' => 'content::globals'],
[
'id' => 'content::custom_item',
'id' => 'content::custom_item_two',
'manipulations' => [
'action' => '@create',
'display' => 'Custom Item',
'display' => 'Custom Item Two',
],
],
],
Expand All @@ -867,17 +874,23 @@ public function it_can_reorder_custom_and_modified_items()
'content::navigation',
'content::taxonomies',
'content::assets',
'content::custom_item_one',
// `Collections` and `Taxnomies` are omitted because they are left over items in the same order they originally were, therefore redundant
// Our new `Custom Item` is omitted because it's a new item at the end of the list, so it doesn't need to be in the order
// Our new `Custom Item Two` is omitted because it's a new item at the end of the list, so it doesn't need to be in the order
// But `Custom Item One` still needs to be in the order, because it's not just appended to the end of the list
],
'items' => [
'content::taxonomies' => [
'action' => '@modify',
'display' => 'Favourite Taxonomies',
],
'content::custom_item' => [
'content::custom_item_one' => [
'action' => '@create',
'display' => 'Custom Item One',
],
'content::custom_item_two' => [
'action' => '@create',
'display' => 'Custom Item',
'display' => 'Custom Item Two',
],
],
],
Expand Down Expand Up @@ -1053,6 +1066,66 @@ public function it_can_reorder_sections()

#[Test]
public function it_can_reorder_custom_and_modified_sections()
{
$transformed = $this->transform([
['display_original' => 'Top Level'],
[
'display_original' => 'Fields',
'items' => [
[
'id' => 'content::collections',
'manipulations' => [
'action' => '@alias',
],
],
],
],
['display_original' => 'Tools'],
['display_original' => 'Content'],
['display_original' => 'Users'],
[
'display' => 'Custom Section',
'action' => '@create',
'items' => [
[
'id' => 'content::collections::pages',
'manipulations' => [
'action' => '@alias',
],
],
],
],
['display_original' => 'Settings'],
]);

$expected = [
'reorder' => [
'fields',
'tools',
'content',
'users',
'custom_section',
// `Settings` is omitted because it's the only one left over at the end of the list, therefore redundant
],
'sections' => [
'fields' => [
'content::collections' => '@alias',
],
'custom_section' => [
'display' => 'Custom Section',
'action' => '@create',
'items' => [
'content::collections::pages' => '@alias',
],
],
],
];

$this->assertEquals($expected, $transformed);
}

#[Test]
public function it_can_reorder_sections_but_ignores_custom_sections_left_at_the_end()
{
$transformed = $this->transform([
['display_original' => 'Top Level'],
Expand Down