Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update resource namespace option in commands #14377

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

fix: update resource namespace option in commands #14377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/panels/src/Commands/Aliases/MakeResourceCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}';
}
19 changes: 12 additions & 7 deletions packages/panels/src/Commands/MakeResourceCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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/'));
Expand Down
Loading