Refactor to solution-forest/filament-tree: fix eager loading

Author: sten

src/Components/Menu.php

@@ -70,7 +70,7 @@ protected function getMenuItems($menu, ?string $locale = null): array
 
         $items = $menu->menuItems()
             ->with('linkable')
-            ->orderBy('_lft')
+            ->orderBy('order')
             ->get();
 
         return $this->buildMenuTree($items->toArray(), $locale);

src/Models/Menu.php

@@ -30,13 +30,13 @@ public function menuItems(): HasMany
     {
         return $this->hasMany(FilamentFlexibleContentBlockPages::config()->getMenuItemModel()::class)
             ->whereNull('parent_id')
-            ->orderBy('_lft');
+            ->orderBy('order');
     }
 
     public function allMenuItems(): HasMany
     {
         return $this->hasMany(FilamentFlexibleContentBlockPages::config()->getMenuItemModel()::class)
-            ->orderBy('_lft');
+            ->orderBy('order');
     }
 
     public function getMorphClass()

src/Resources/MenuResource/Pages/ManageMenuItems.php

@@ -28,7 +28,10 @@ public function mount(): void
     {
         $menuModelClass = MenuResource::getModel();
         $recordId = request()->route('record');
-        $this->record = app($menuModelClass)->findOrFail($recordId);
+        $this->record = app($menuModelClass)
+            ->query()
+            ->with('menuItems.linkable')
+            ->findOrFail($recordId);
     }
 
     public function getModel(): string