From 3589fb6efd6781235a2292d079ec5fb14927e3c6 Mon Sep 17 00:00:00 2001 From: wychoong <67364036+wychoong@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:03:41 +0800 Subject: [PATCH] Update MakePageCommand.php --- packages/panels/src/Commands/MakePageCommand.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/panels/src/Commands/MakePageCommand.php b/packages/panels/src/Commands/MakePageCommand.php index eba4718fed..458b46e264 100644 --- a/packages/panels/src/Commands/MakePageCommand.php +++ b/packages/panels/src/Commands/MakePageCommand.php @@ -205,18 +205,24 @@ class MakePageCommand extends Command $pageDirectories[array_search($namespace, $pageNamespaces)] : (Arr::first($pageDirectories) ?? app_path('Filament/Pages/')); } else { - $resourceDirectories = $panel->getResourceDirectories(); - $resourceNamespaces = $panel->getResourceNamespaces(); + $resourceDirectories = [ + app_path('Filament/Resources/'), + ...$panel->getResourceDirectories(), + ]; + $resourceNamespaces = [ + 'App\\Filament\\Resources', + ...$panel->getResourceNamespaces(), + ]; $resourceNamespace = (count($resourceNamespaces) > 1) ? select( label: 'Which namespace would you like to create this in?', options: $resourceNamespaces ) : - (Arr::first($resourceNamespaces) ?? 'App\\Filament\\Resources'); + Arr::first($resourceNamespaces); $resourcePath = (count($resourceDirectories) > 1) ? $resourceDirectories[array_search($resourceNamespace, $resourceNamespaces)] : - (Arr::first($resourceDirectories) ?? app_path('Filament/Resources/')); + Arr::first($resourceDirectories); } $view = str($page)