Merge pull request #14187 from wychoong/patch-2

fix creating resources in vendor when plugin uses cluster
This commit is contained in:
Dan Harrin
2024-09-17 11:20:32 +01:00
committed by GitHub
6 changed files with 67 additions and 1 deletions
@@ -65,6 +65,13 @@ class MakeClusterCommand extends Command
$clusterDirectories = $panel->getClusterDirectories();
$clusterNamespaces = $panel->getClusterNamespaces();
foreach ($clusterDirectories as $clusterIndex => $clusterDirectory) {
if (str($clusterDirectory)->startsWith(base_path('vendor'))) {
unset($clusterDirectories[$clusterIndex]);
unset($clusterNamespaces[$clusterIndex]);
}
}
$namespace = (count($clusterNamespaces) > 1) ?
select(
label: 'Which namespace would you like to create this in?',
@@ -70,10 +70,20 @@ class MakePageCommand extends Command
)] : Arr::first($panels);
}
$resourceDirectories = $panel->getResourceDirectories();
$resourceNamespaces = $panel->getResourceNamespaces();
foreach ($resourceDirectories as $resourceIndex => $resourceDirectory) {
if (str($resourceDirectory)->startsWith(base_path('vendor'))) {
unset($resourceDirectories[$resourceIndex]);
unset($resourceNamespaces[$resourceIndex]);
}
}
$resourceInput = $this->option('resource') ?? suggest(
label: 'Which resource would you like to create this in?',
options: collect($panel->getResources())
->filter(fn (string $namespace): bool => str($namespace)->contains('\\Resources\\'))
->filter(fn (string $namespace): bool => str($namespace)->contains('\\Resources\\') && str($namespace)->startsWith($resourceNamespaces))
->map(
fn (string $namespace): string => (string) str($namespace)
->afterLast('\\Resources\\')
@@ -195,6 +205,13 @@ class MakePageCommand extends Command
$pageDirectories = $panel->getPageDirectories();
$pageNamespaces = $panel->getPageNamespaces();
foreach ($pageDirectories as $pageIndex => $pageDirectory) {
if (str($pageDirectory)->startsWith(base_path('vendor'))) {
unset($pageDirectories[$pageIndex]);
unset($pageNamespaces[$pageIndex]);
}
}
$namespace = (count($pageNamespaces) > 1) ?
select(
label: 'Which namespace would you like to create this in?',
@@ -208,6 +225,13 @@ class MakePageCommand extends Command
$resourceDirectories = $panel->getResourceDirectories();
$resourceNamespaces = $panel->getResourceNamespaces();
foreach ($resourceDirectories as $resourceIndex => $resourceDirectory) {
if (str($resourceDirectory)->startsWith(base_path('vendor'))) {
unset($resourceDirectories[$resourceIndex]);
unset($resourceNamespaces[$resourceIndex]);
}
}
$resourceNamespace = (count($resourceNamespaces) > 1) ?
select(
label: 'Which namespace would you like to create this in?',
@@ -82,6 +82,13 @@ class MakeRelationManagerCommand extends Command
$resourceDirectories = $panel->getResourceDirectories();
$resourceNamespaces = $panel->getResourceNamespaces();
foreach ($resourceDirectories as $resourceIndex => $resourceDirectory) {
if (str($resourceDirectory)->startsWith(base_path('vendor'))) {
unset($resourceDirectories[$resourceIndex]);
unset($resourceNamespaces[$resourceIndex]);
}
}
$resourceNamespace = (count($resourceNamespaces) > 1) ?
select(
label: 'Which namespace would you like to create this in?',
@@ -105,6 +105,13 @@ class MakeResourceCommand extends Command
$resourceDirectories = $panel->getResourceDirectories();
$resourceNamespaces = $panel->getResourceNamespaces();
foreach ($resourceDirectories as $resourceIndex => $resourceDirectory) {
if (str($resourceDirectory)->startsWith(base_path('vendor'))) {
unset($resourceDirectories[$resourceIndex]);
unset($resourceNamespaces[$resourceIndex]);
}
}
$namespace = (count($resourceNamespaces) > 1) ?
select(
label: 'Which namespace would you like to create this in?',
@@ -70,6 +70,13 @@ class MakeSettingsPageCommand extends Command
$pageDirectories = $panel->getPageDirectories();
$pageNamespaces = $panel->getPageNamespaces();
foreach ($pageDirectories as $pageIndex => $pageDirectory) {
if (str($pageDirectory)->startsWith(base_path('vendor'))) {
unset($pageDirectories[$pageIndex]);
unset($pageNamespaces[$pageIndex]);
}
}
$namespace = (count($pageNamespaces) > 1) ?
select(
label: 'Which namespace would you like to create this in?',
@@ -114,6 +114,13 @@ class MakeWidgetCommand extends Command
$widgetDirectories = $panel->getWidgetDirectories();
$widgetNamespaces = $panel->getWidgetNamespaces();
foreach ($widgetDirectories as $widgetIndex => $widgetDirectory) {
if (str($widgetDirectory)->startsWith(base_path('vendor'))) {
unset($widgetDirectories[$widgetIndex]);
unset($widgetNamespaces[$widgetIndex]);
}
}
$namespace = (count($widgetNamespaces) > 1) ?
select(
label: 'Which namespace would you like to create this in?',
@@ -127,6 +134,13 @@ class MakeWidgetCommand extends Command
$resourceDirectories = $panel->getResourceDirectories();
$resourceNamespaces = $panel->getResourceNamespaces();
foreach ($resourceDirectories as $resourceIndex => $resourceDirectory) {
if (str($resourceDirectory)->startsWith(base_path('vendor'))) {
unset($resourceDirectories[$resourceIndex]);
unset($resourceNamespaces[$resourceIndex]);
}
}
$resourceNamespace = (count($resourceNamespaces) > 1) ?
select(
label: 'Which namespace would you like to create this in?',