diff --git a/app/Listeners/Menu/ShowInAdmin.php b/app/Listeners/Menu/ShowInAdmin.php index d2c94b1d..b1d0f791 100644 --- a/app/Listeners/Menu/ShowInAdmin.php +++ b/app/Listeners/Menu/ShowInAdmin.php @@ -20,7 +20,34 @@ class ShowInAdmin */ public function handle(Event $event): void { - $this->renderSections($event->menu, self::groupPayables(SidebarPermissions::navigationFor(user()))); + $this->renderSections($event->menu, self::groupBasicData(self::groupPayables(SidebarPermissions::navigationFor(user())))); + } + + public static function groupBasicData(array $navigation): array + { + $keys = ['order-data', 'refunds']; + $children = array_values(array_filter($navigation, static fn (array $section): bool => in_array($section['slug'], $keys, true))); + if ($children === []) { + return $navigation; + } + + $group = ['slug' => 'basic-data', 'title' => '基础数据', 'icon' => 'folder', 'sections' => $children]; + $hasDirectory = in_array('basic-data', array_column($navigation, 'slug'), true); + $result = []; + foreach ($navigation as $section) { + if ($section['slug'] === 'basic-data') { + $result[] = array_replace($section, ['sections' => $children]); + } elseif (in_array($section['slug'], $keys, true)) { + if (! $hasDirectory) { + $result[] = $group; + $hasDirectory = true; + } + } else { + $result[] = $section; + } + } + + return $result; } public static function groupPayables(array $navigation): array diff --git a/config/business_navigation.php b/config/business_navigation.php index 1855f019..680f167b 100644 --- a/config/business_navigation.php +++ b/config/business_navigation.php @@ -289,6 +289,12 @@ $navigation = [ ], ], ], + [ + 'slug' => 'basic-data', + 'title' => '基础数据', + 'icon' => 'folder', + 'pages' => [], + ], [ 'slug' => 'product-inventory', 'title' => '商品及库存管理', diff --git a/tests/Unit/View/BasicDataNavigationTest.php b/tests/Unit/View/BasicDataNavigationTest.php new file mode 100644 index 00000000..162b25db --- /dev/null +++ b/tests/Unit/View/BasicDataNavigationTest.php @@ -0,0 +1,46 @@ +assertSame(['order-data', 'refunds'], array_column($group['sections'], 'slug')); + $this->assertNotContains('order-data', $slugs); + $this->assertNotContains('refunds', $slugs); + foreach ($group['sections'] as $section) { + $this->assertSame($navigation[array_search($section['slug'], array_column($navigation, 'slug'), true)], $section); + } + } + + public function test_group_contains_only_authorized_sections_even_without_directory_permission(): void + { + $allowed = [['slug' => 'refunds', 'title' => '退款', 'pages' => [['slug' => 'non-jingxi-refund-data']]]]; + $grouped = ShowInAdmin::groupBasicData($allowed); + $this->assertSame($allowed, $grouped[0]['sections']); + $this->assertSame([], ShowInAdmin::groupBasicData([])); + } + + public function test_basic_data_is_an_empty_top_level_directory_before_invoice_management(): void + { + $navigation = require dirname(__DIR__, 3) . '/config/business_navigation.php'; + $slugs = array_column($navigation, 'slug'); + $index = array_search('basic-data', $slugs, true); + + $this->assertNotFalse($index); + $this->assertSame('基础数据', $navigation[$index]['title']); + $this->assertSame([], $navigation[$index]['pages']); + $this->assertSame('invoice-management', $slugs[$index + 1]); + $this->assertCount(1, array_keys($slugs, 'basic-data', true)); + } +}