From 089a1b3c22c34aec2776dca8877bd4581deb2635 Mon Sep 17 00:00:00 2001
From: Fady Mondy <info@3x1.io>
Date: Thu, 18 Jul 2024 14:56:31 +0300
Subject: [PATCH] fix menu() helper

---
 src/Resources/MenuResource/Relations/MenuItems.php | 12 +++++++++---
 src/helpers.php                                    |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Resources/MenuResource/Relations/MenuItems.php b/src/Resources/MenuResource/Relations/MenuItems.php
index 062cec9..f717610 100644
--- a/src/Resources/MenuResource/Relations/MenuItems.php
+++ b/src/Resources/MenuResource/Relations/MenuItems.php
@@ -50,9 +50,15 @@ public function form(Form $form): Form
         $routeCollection = Route::getRoutes();
         foreach ($routeCollection as $key => $route) {
             if (isset($route->action['as'])) {
-                $routeList[$route->action['as']] = $route->uri;
+                $routeList[] = [
+                    "name" =>$route->action['as'],
+                    "url" => $route->uri
+                ];
             } else {
-                array_push($routeList, $route->uri);
+                $routeList[] = [
+                    "name" => $route->uri,
+                    "url" => $route->uri
+                ];
             }
         }
 
@@ -99,7 +105,7 @@ public function form(Form $form): Form
                     ->hidden(fn(Forms\Get $get) => $get('is_route') === false)
                     ->required(fn(Forms\Get $get) => $get('is_route') === true)
                     ->searchable()
-                    ->options($routeList),
+                    ->options(collect($routeList)->pluck('url', 'name')->toArray()),
                 Forms\Components\Toggle::make('has_badge')
                     ->default(false)
                     ->label(trans('filament-menus::messages.cols.item.has_badge'))
diff --git a/src/helpers.php b/src/helpers.php
index dbb9658..578b9e7 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -5,7 +5,7 @@ function menu($key){
         $menu = \TomatoPHP\FilamentMenus\Models\Menu::where('key', $key)->first();
 
         if($menu){
-            return collect($menu->items);
+            return collect($menu->menuItems);
 
         }
         else {