From 23540c2cc4c7ee1b3e77aa8acf5effb334a48674 Mon Sep 17 00:00:00 2001 From: Wouter van Marrum Date: Sat, 28 Sep 2024 16:25:55 +0200 Subject: [PATCH] fix: update resource namespace option in commands --- .../Commands/Aliases/MakeResourceCommand.php | 2 +- .../src/Commands/MakeResourceCommand.php | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/panels/src/Commands/Aliases/MakeResourceCommand.php b/packages/panels/src/Commands/Aliases/MakeResourceCommand.php index 8d2b85c308..795e6040a2 100644 --- a/packages/panels/src/Commands/Aliases/MakeResourceCommand.php +++ b/packages/panels/src/Commands/Aliases/MakeResourceCommand.php @@ -10,5 +10,5 @@ class MakeResourceCommand extends Commands\MakeResourceCommand { protected $hidden = true; - protected $signature = 'filament:resource {name?} {--model-namespace=} {--soft-deletes} {--view} {--G|generate} {--S|simple} {--panel=} {--model} {--migration} {--factory} {--F|force}'; + protected $signature = 'filament:resource {name?} {--model-namespace=} {--resource-namespace} {--soft-deletes} {--view} {--G|generate} {--S|simple} {--panel=} {--model} {--migration} {--factory} {--F|force}'; } diff --git a/packages/panels/src/Commands/MakeResourceCommand.php b/packages/panels/src/Commands/MakeResourceCommand.php index 76bafcc837..8e50358613 100644 --- a/packages/panels/src/Commands/MakeResourceCommand.php +++ b/packages/panels/src/Commands/MakeResourceCommand.php @@ -28,7 +28,7 @@ class MakeResourceCommand extends Command protected $description = 'Create a new Filament resource class and default page classes'; - protected $signature = 'make:filament-resource {name?} {--model-namespace=} {--soft-deletes} {--view} {--G|generate} {--S|simple} {--panel=} {--model} {--migration} {--factory} {--F|force}'; + protected $signature = 'make:filament-resource {name?} {--model-namespace=} {--resource-namespace} {--soft-deletes} {--view} {--G|generate} {--S|simple} {--panel=} {--model} {--migration} {--factory} {--F|force}'; public function handle(): int { @@ -112,12 +112,17 @@ public function handle(): int } } - $namespace = (count($resourceNamespaces) > 1) ? - select( - label: 'Which namespace would you like to create this in?', - options: $resourceNamespaces - ) : - (Arr::first($resourceNamespaces) ?? 'App\\Filament\\Resources'); + if ($this->option('resource-namespace')) { + $namespace = (Arr::first($resourceNamespaces) ?? 'App\\Filament\\Resources'); + } else { + $namespace = (count($resourceNamespaces) > 1) ? + select( + label: 'Which namespace would you like to create this in?', + options: $resourceNamespaces, + ) : + (Arr::first($resourceNamespaces) ?? 'App\\Filament\\Resources'); + } + $path = (count($resourceDirectories) > 1) ? $resourceDirectories[array_search($namespace, $resourceNamespaces)] : (Arr::first($resourceDirectories) ?? app_path('Filament/Resources/'));