Merge pull request #199 from RonasIT/fix-generate-nova-resource-sub-folder

fix: Correct NovaResource and NovaTest generation in subfolders

Author: DenTray

src/Generators/EntityGenerator.php

@@ -300,4 +300,9 @@ protected function prepareRelations(): array
 
         return $result;
     }
+
+    protected function pathToNamespace(string $name): string
+    {
+        return Str::replace('/', '\\', $name);
+    }
 }

src/Generators/ModelGenerator.php

@@ -193,7 +193,7 @@ protected function shouldImportRelation(string $relation): bool
     protected function generateClassNamespace(string $className, ?string $folder = null): string
     {
         $path = $this->getNamespace('models', $folder);
-        $psrPath = Str::replace('/', '\\', $className);
+        $psrPath = $this->pathToNamespace($className);
 
         return "{$path}\\{$psrPath}";
     }

src/Generators/NovaResourceGenerator.php

@@ -85,8 +85,8 @@ public function generate(): void
                 'model' => $this->model,
                 'fields' => $novaFields,
                 'types' => array_unique(data_get($novaFields, '*.type')),
-                'modelNamespace' => $this->getNamespace('models', $this->modelSubFolder),
-                'namespace' => $this->getNamespace('nova')
+                'imports' => $this->getImports(),
+                'namespace' => $this->getNamespace('nova', $this->modelSubFolder),
             ]);
 
             $this->saveClass('nova', "{$this->model}Resource", $fileContent, $this->modelSubFolder);
@@ -108,12 +108,12 @@ protected function prepareNovaFields(): array
             } else if (Arr::has($this->specialFieldNamesMap, $field->name)) {
                 $result[$field->name] = [
                     'type' => $this->specialFieldNamesMap[$field->name],
-                    'is_required' => $field->isRequired
+                    'is_required' => $field->isRequired,
                 ];
             } else {
                 $result[$field->name] = [
                     'type' => $fieldTypesMap[$field->type],
-                    'is_required' => $field->isRequired
+                    'is_required' => $field->isRequired,
                 ];
             }
         }
@@ -178,4 +178,17 @@ protected function getColumnList(string $table, ?string $connectionName = null):
             ->createSchemaManager()
             ->listTableColumns($table);
     }
+
+    protected function getImports(): array
+    {
+        $imports = [
+            "{$this->getNamespace('models', $this->modelSubFolder)}\\{$this->model}",
+        ];
+
+        if (!empty($this->modelSubFolder)) {
+            $imports[] = "{$this->getNamespace('nova')}\\Resource";
+        }
+
+        return $imports;
+    }
 }

src/Generators/NovaTestGenerator.php

@@ -120,7 +120,7 @@ protected function doesNovaResourceExists(): bool
 
         foreach ($possibleNovaModelNames as $modelName) {
             if ($this->classExists('nova', $modelName)) {
-                $this->novaModelName = $modelName;
+                $this->novaModelName = $this->pathToNamespace($modelName);
 
                 return true;
             }

stubs/nova_resource.blade.php

@@ -1,7 +1,9 @@
 namespace {{ $namespace }};
 
 @inject('str', 'Illuminate\Support\Str')
-use {{ $modelNamespace }}\{{ $model }};
+@foreach($imports as $import)
+use {{ $import }};
+@endforeach
 use Illuminate\Http\Request;
 @foreach($types as $fieldType)
 use Laravel\Nova\Fields\{{ $fieldType }};

tests/fixtures/CommandTest/subfolder/nova_resource.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Nova;
+namespace App\Nova\Forum;
 
 use RonasIT\Support\Tests\Support\Command\Models\Forum\Post;
+use App\Nova\Resource;
 use Illuminate\Http\Request;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\Text;